成本分配以及出运明细导出格式，托书预托书小po调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationFabricMapper.xml

@@ -41,16 +41,21 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		select vim.cInvCode, max(vim.goodsName) as goodsName,sum(vim.unitConsumption) as unitConsumption,sum(vim.planQuantity) as planQuantity,
 		sum(vim.usageQuantity) as usageQuantity from UFDATA_103_2021.dbo.cost_allocation_fabric_view vif
 		join(
-		select oti.cInvCode,max(oti.cInvName) as goodsName,sum(ot.iQuantity)/sum(od.iQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
+		select om.cCode as cCode,oti.cInvCode,max(oti.cInvName) as goodsName,sum(ot.iQuantity)/sum(od.iQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		sum(ot.iSendQTY) as usageQuantity
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-		and om.cCode like CONCAT(#{code},'%') 	and omi.cInvCcode like '19%' and om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-		GROUP BY oti.cInvCode
+		join (
+		select cPOID as comcode from UFDATA_101_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_101_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
+		WHERE om.iVerifyStateNew = 2
+		and om.cCode like CONCAT(#{code},'%') 	and omi.cInvCcode like '19%'
+		GROUP BY om.cCode,oti.cInvCode
 		) vim on vim.cInvCode = vif.cInvCode
 		where trim(vif.cCode) like CONCAT(#{code},'%')
 		GROUP BY vim.cInvCode
@@ -65,11 +70,11 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.poid=od.poid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser!='asuser')
 		and om.cPOID like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
-			union all
+		union all
 		select i.cInvCode as cInvCode,max(i.cInvName) as cInvName,sum(rs.iQuantity) as purchaseQuantity,max(rs.cBatch) as cBatch from UFDATA_101_2021.dbo.rdrecords01 rs
 		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where cPOID in (
@@ -77,7 +82,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
@@ -91,7 +96,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.iVerifyStateNew = 2
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
@@ -118,17 +123,22 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		select vim.cInvCode, max(vim.goodsName) as goodsName,sum(vim.unitConsumption) as unitConsumption,sum(vim.planQuantity) as planQuantity,
 		sum(vim.usageQuantity) as usageQuantity from UFDATA_103_2021.dbo.cost_allocation_fabric_view vif
 		join(
-		select oti.cInvCode as cInvCode,max(oti.cInvName) as goodsName,sum(ot.iQuantity)/sum(od.iQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
+		select om.cCode as cCode,oti.cInvCode as cInvCode,max(oti.cInvName) as goodsName,sum(ot.iQuantity)/sum(od.iQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		sum(ot.iSendQTY) as usageQuantity
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 		join UFDATA_103_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-		and om.cCode like CONCAT(#{code},'%') and om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
+		WHERE om.iVerifyStateNew = 2
+		and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%'
-		GROUP BY oti.cInvCode
+		GROUP BY om.cCode,oti.cInvCode
 		) vim on vim.cInvCode = vif.cInvCode
 		where trim(vif.cCode) like CONCAT(#{code},'%')
 		GROUP BY vim.cInvCode
@@ -143,7 +153,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_103_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.poid=od.poid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser!='asuser')
 		and om.cPOID like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
@@ -155,7 +165,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
@@ -169,14 +179,14 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.iVerifyStateNew = 2
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
 		)tab2 on tab2.cInvCode=tab1.cInvCode
 		GROUP BY tab2.cInvCode
 		) tab3 on tab3.cInvCode=tab.cInvCode
-		
+
 	</select>
 
 
@@ -196,7 +206,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.poid=od.poid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+		WHERE om.cVerifier is not null  and omi.cInvCcode like '19%'
 		and om.cPOID like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
@@ -208,7 +218,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+		WHERE om.cVerifier is not null  and omi.cInvCcode like '19%'
 		and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
@@ -222,7 +232,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.iVerifyStateNew = 2
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
@@ -245,7 +255,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_103_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.poid=od.poid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser!='asuser') and omi.cInvCcode like '19%'
 		and om.cPOID like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
@@ -257,7 +267,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+		WHERE om.cVerifier is not null  and omi.cInvCcode like '19%'
 		and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
@@ -271,7 +281,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.iVerifyStateNew = 2
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
@@ -289,7 +299,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 	join UFDATA_101_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 	join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 	join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-	WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%') and oti.cInvName = #{goodName}
+	WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%') and oti.cInvName = #{goodName}
 	and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 	GROUP BY oti.cInvName,ot.cFree1
 
@@ -301,7 +311,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 	join UFDATA_103_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 	join UFDATA_103_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 	join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-	WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%') and oti.cInvName = #{goodName}
+	WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%') and oti.cInvName = #{goodName}
 	and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 	GROUP BY oti.cInvName,ot.cFree1
 	</select>
@@ -320,7 +330,7 @@ select
 		join UFDATA_101_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%') and oti.cInvName = #{goodName}
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%') and oti.cInvName = #{goodName}
 		GROUP BY ot.cFree1
 		) tab
 		left join
@@ -332,7 +342,7 @@ select
 			from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.poid=od.poid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		 and om.cPOID like CONCAT(#{code},'%')
 		)  and i.cInvName = #{goodName}
 		 and rs.cBatch like CONCAT(#{code},'%')
@@ -354,7 +364,7 @@ select
 		join UFDATA_103_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
 		join UFDATA_103_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%') and oti.cInvName = #{goodName}
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%') and oti.cInvName = #{goodName}
 		GROUP BY ot.cFree1
 		) tab
 		left join
@@ -366,7 +376,7 @@ select
 			from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.poid=od.poid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		 and om.cPOID like CONCAT(#{code},'%')
 		)  and i.cInvName = #{goodName}
 		 and rs.cBatch like CONCAT(#{code},'%')

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationIngredientMapper.xml

@@ -31,12 +31,12 @@
 		(
 
 		select t4.cInvCode,t4.goodsName,max(t4.dosage) as dosage,max(t4.usageQuantity) as usageQuantity,STRING_AGG(t4.supper,',') as supper,sum(t4.rmbAmount) as rmbAmount,sum(t4.usdAmount) as usdAmount,sum(t4.priceExcludingtax) as priceExcludingtax,sum(t4.cost) as cost from(
-		SELECT t3.cInvCode,t3.goodsName,t3.cVenAbbName AS supper,max( t3.dosage ) AS dosage,SUM ( t3.usageQuantity ) AS usageQuantity,
+		SELECT t3.ccode,t3.cInvCode,t3.goodsName,t3.cVenAbbName AS supper,max( t3.dosage ) AS dosage,SUM ( t3.usageQuantity ) AS usageQuantity,
 
 		SUM ( t3.rmbAmount ) AS rmbAmount,SUM ( t3.usdAmount ) AS usdAmount,SUM ( t3.priceExcludingtax ) AS priceExcludingtax,
 		SUM ( t3.totalCost )/sum(totalSum) AS cost
 		FROM(
-		SELECT t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.totalCost,t2.totalSum
+		SELECT t1.ccode as ccode,t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.totalCost,t2.totalSum
 		FROM
 		(
 		SELECT ot.cInvCode,od.isosid,om.ccode,oti.cInvName AS goodsName,SUM (ot.iUnitQuantity) AS dosage,SUM (ot.iSendQTY) AS usageQuantity
@@ -47,13 +47,18 @@
 		JOIN UFDATA_103_2021.dbo.Vendor v ON om.cVenCode= v.cVenCode
 		JOIN UFDATA_103_2021.dbo.Inventory oti ON oti.cInvCode= ot.cInvCode
 		JOIN UFDATA_103_2021.dbo.Inventory omi ON omi.cInvCode= od.cInvCode
+		join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
 		WHERE
 		om.iVerifyStateNew = 2
-		AND ( om.cCloser IS NULL OR om.cCloser='asuser' )
+
 		AND omi.cInvCcode LIKE '19%'
 		AND om.cCode LIKE CONCAT(#{code},'%')
 
-		GROUP BY ot.cInvCode,od.isosid,om.ccode,oti.cInvName ) AS t1
+		GROUP BY om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName ) AS t1
 
 		left join (SELECT ven.cVenAbbName AS cVenAbbName,bi.cInvCode,pod.isosid,SUM ( bi.iSum ) AS rmbAmount,SUM ( bi.iOriSum ) AS usdAmount,
 		SUM ( bi.iMoney ) AS priceExcludingtax,sum ( bi.iCost*bi.iPBVQuantity) AS totalCost ,sum ( bi.iPBVQuantity) AS totalSum
@@ -71,17 +76,17 @@
 		AND t2.isosid= t1.isosid
 		) t3
 		GROUP BY
-		t3.cInvCode,t3.goodsName,t3.cVenAbbName
+		t3.ccode,t3.cInvCode,t3.goodsName,t3.cVenAbbName
 
 		union all
 
 
-		SELECT t3.cInvCode,t3.goodsName,t3.cVenAbbName AS supper,max( t3.dosage ) AS dosage,SUM ( t3.usageQuantity ) AS usageQuantity,
+		SELECT t3.ccode as ccode,t3.cInvCode,t3.goodsName,t3.cVenAbbName AS supper,max( t3.dosage ) AS dosage,SUM ( t3.usageQuantity ) AS usageQuantity,
 
 		SUM ( t3.rmbAmount ) AS rmbAmount,SUM ( t3.usdAmount ) AS usdAmount,SUM ( t3.priceExcludingtax ) AS priceExcludingtax,
 		SUM ( t3.totalCost )/sum(totalSum) AS cost
 		FROM(
-		SELECT t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.totalCost,t2.totalSum
+		SELECT t1.ccode,t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.totalCost,t2.totalSum
 		FROM
 		(
 		SELECT ot.cInvCode,om.ccode,oti.cInvName AS goodsName,max (ot.iUnitQuantity) AS dosage,SUM (ot.iSendQTY) AS usageQuantity
@@ -92,13 +97,18 @@
 		JOIN UFDATA_103_2021.dbo.Vendor v ON om.cVenCode= v.cVenCode
 		JOIN UFDATA_103_2021.dbo.Inventory oti ON oti.cInvCode= ot.cInvCode
 		JOIN UFDATA_103_2021.dbo.Inventory omi ON omi.cInvCode= od.cInvCode
+		join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
 		WHERE
 		om.iVerifyStateNew = 2
-		AND ( om.cCloser IS NULL OR om.cCloser='asuser' )
+
 		AND omi.cInvCcode LIKE '19%'
 		AND om.cCode LIKE CONCAT(#{code},'%')
 
-		GROUP BY ot.cInvCode,om.ccode,oti.cInvName ) AS t1
+		GROUP BY om.ccode,ot.cInvCode,om.ccode,oti.cInvName ) AS t1
 
 		left join (
 		SELECT oti.cinvName,ven.cVenAbbName AS cVenAbbName,bi.cInvCode,SUM ( bi.iSum ) AS rmbAmount,SUM ( bi.iOriSum ) AS usdAmount,
@@ -118,11 +128,14 @@
 		on t1.cInvCode= t2.cInvCode
 		) t3
 		GROUP BY
-		t3.cInvCode,t3.goodsName,t3.cVenAbbName
+		t3.ccode,t3.cInvCode,t3.goodsName,t3.cVenAbbName
 		) t4
 		where t4.cInvCode not in(
 		select cInvCode from UFDATA_103_2021.dbo.cost_allocation_fabric_view vif
 		where trim(vif.cCode) like CONCAT(#{code},'%')
+		) and t4.ccode in (
+		select ccode from UFDATA_103_2021.dbo.cost_allocation_fabric_view vif
+		where trim(vif.cCode) like CONCAT(#{code},'%') group by ccode
 		)
 		GROUP BY t4.cInvCode,t4.goodsName
 
@@ -136,7 +149,7 @@
 		from UFDATA_103_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cPOID LIKE CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName
@@ -148,7 +161,7 @@
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.MOID=od.MOID
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName
@@ -162,7 +175,7 @@
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.iVerifyStateNew = 2
 		and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName--,rs.cBatch
@@ -185,9 +198,9 @@
 		(
 
 		select t4.cInvCode,max(t4.goodsName) as goodsName,max(t4.dosage) as dosage,max(t4.usageQuantity) as usageQuantity,STRING_AGG(t4.supper,',') as supper,sum(t4.rmbAmount) as rmbAmount,sum(t4.usdAmount) as usdAmount,sum(t4.priceExcludingtax) as priceExcludingtax,sum(t4.cost) as cost from (
-		select t3.cInvCode,t3.goodsName,max(t3.dosage) as dosage,sum(t3.usageQuantity) as usageQuantity,max(t3.cVenAbbName) as supper,sum(t3.rmbAmount) as rmbAmount,sum(t3.usdAmount) as usdAmount,sum(t3.priceExcludingtax) as priceExcludingtax,sum(t3.iCost) as cost from (
+		select t3.ccode as ccode,t3.cInvCode,t3.goodsName,max(t3.dosage) as dosage,sum(t3.usageQuantity) as usageQuantity,max(t3.cVenAbbName) as supper,sum(t3.rmbAmount) as rmbAmount,sum(t3.usdAmount) as usdAmount,sum(t3.priceExcludingtax) as priceExcludingtax,sum(t3.iCost) as cost from (
 
-		select t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.iCost from (select  ot.cInvCode,od.isosid,om.ccode,oti.cInvName as goodsName,sum(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity
+		select t1.ccode as ccode,t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.iCost from (select ot.cInvCode,od.isosid,om.ccode,oti.cInvName as goodsName,sum(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity
 
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
@@ -195,10 +208,14 @@
 		JOIN UFDATA_101_2021.dbo.Vendor v ON om.cVenCode= v.cVenCode
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%')
-		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
+		group by om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1,
 		(
 		select max(ven.cVenAbbName) as cVenAbbName,
@@ -212,13 +229,13 @@
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=pod.cInvCode
 		where pom.cVenCode != 'T010001' and pom.cVenCode != 'T020001'
 		GROUP BY bi.cInvCode,pod.iorderdid) as t2 where t1.cInvCode=t2.cInvCode and t1.isosid = t2.iorderdid
-		) t3  GROUP BY t3.cInvCode,t3.goodsName
+		) t3  GROUP BY t3.ccode,t3.cInvCode,t3.goodsName
 
 		union all
 
-		select t3.cInvCode,t3.goodsName,max(t3.dosage) as dosage,sum(t3.usageQuantity) as usageQuantity,max(t3.cVenAbbName) as supper,sum(t3.rmbAmount) as rmbAmount,sum(t3.usdAmount) as usdAmount,sum(t3.priceExcludingtax) as priceExcludingtax,sum(t3.iCost) as cost from (
+		select t3.ccode,t3.cInvCode,t3.goodsName,max(t3.dosage) as dosage,sum(t3.usageQuantity) as usageQuantity,max(t3.cVenAbbName) as supper,sum(t3.rmbAmount) as rmbAmount,sum(t3.usdAmount) as usdAmount,sum(t3.priceExcludingtax) as priceExcludingtax,sum(t3.iCost) as cost from (
 
-		select t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.iCost from (select  ot.cInvCode,od.isosid,om.ccode,oti.cInvName as goodsName,sum(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity
+		select t1.ccode,t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.iCost from (select ot.cInvCode,od.isosid,om.ccode,oti.cInvName as goodsName,sum(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity
 
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
@@ -226,10 +243,14 @@
 		JOIN UFDATA_101_2021.dbo.Vendor v ON om.cVenCode= v.cVenCode
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%')
-		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
+		group by  om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1
 		left join (
 		select max(ven.cVenAbbName) as cVenAbbName,
@@ -247,12 +268,12 @@
 		join UFDATA_102_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
 		where pm.cVenCode != 'T020001' and pom.cpoid LIKE CONCAT(#{code},'%')
 		GROUP BY bi.cInvCode,pod.iorderdid) as t2 on t1.cInvCode=t2.cInvCode and t2.iorderdid=t1.isosid
-		) t3  GROUP BY t3.cInvCode,t3.goodsName
+		) t3  GROUP BY t3.ccode,t3.cInvCode,t3.goodsName
 
 		union all
-		select t3.cInvCode,t3.goodsName,max(t3.dosage) as dosage,sum(t3.usageQuantity) as usageQuantity,max(t3.cVenAbbName) as supper,sum(t3.rmbAmount) as rmbAmount,sum(t3.usdAmount) as usdAmount,sum(t3.priceExcludingtax) as priceExcludingtax,sum(t3.iCost) as cost from (
+		select t3.ccode,t3.cInvCode,t3.goodsName,max(t3.dosage) as dosage,sum(t3.usageQuantity) as usageQuantity,max(t3.cVenAbbName) as supper,sum(t3.rmbAmount) as rmbAmount,sum(t3.usdAmount) as usdAmount,sum(t3.priceExcludingtax) as priceExcludingtax,sum(t3.iCost) as cost from (
 
-		select t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.iCost from (select  ot.cInvCode,od.isosid,om.ccode,oti.cInvName as goodsName,sum(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity
+		select t1.ccode,t1.cInvCode,t1.goodsName,t1.dosage,t1.usageQuantity,t2.cVenAbbName,t2.rmbAmount,t2.usdAmount,t2.priceExcludingtax,t2.iCost from (select  ot.cInvCode,od.isosid,om.ccode,oti.cInvName as goodsName,sum(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity
 
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
@@ -260,10 +281,14 @@
 		JOIN UFDATA_101_2021.dbo.Vendor v ON om.cVenCode= v.cVenCode
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%')
-		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
+		group by om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1,
 		(
 		select max(ven.cVenAbbName) as cVenAbbName,
@@ -281,11 +306,14 @@
 		join UFDATA_103_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
 		where pom.cpoid LIKE CONCAT(#{code},'%')
 		GROUP BY bi.cInvCode,pod.iorderdid) as t2 where t1.cInvCode=t2.cInvCode and t2.iorderdid=t1.isosid
-		) t3  GROUP BY t3.cInvCode,t3.goodsName
+		) t3  GROUP BY t3.ccode,t3.cInvCode,t3.goodsName
 		) t4
 		where t4.cInvCode not in(
 		select cInvCode from UFDATA_103_2021.dbo.cost_allocation_fabric_view vif
 		where trim(vif.cCode) like CONCAT(#{code},'%')
+		) and t4.ccode in (
+		select ccode from UFDATA_103_2021.dbo.cost_allocation_fabric_view vif
+		where trim(vif.cCode) like CONCAT(#{code},'%') group by ccode
 		)
 		GROUP BY t4.cInvCode,t4.goodsName
 
@@ -299,7 +327,7 @@
 		from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cPOID LIKE CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName
@@ -311,7 +339,7 @@
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.MOID=od.MOID
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName
@@ -325,11 +353,12 @@
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.iVerifyStateNew = 2
 		and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName
 		)tab2 on tab2.cInvName=tab.goodsName and tab2.cInvCode=tab.cInvCode
+		
 	</select>
 
 
@@ -369,7 +398,7 @@
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 GROUP BY pod.cInvCode,pod.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
-				WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+				WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 							and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
 							or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
 							and oti.cInvName = #{goodName}
@@ -384,7 +413,7 @@
 		from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cPOID like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName,rs.cBatch
@@ -398,7 +427,7 @@
 						from UFDATA_101_2021.dbo.om_momain om
 						join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 						join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+						WHERE om.iVerifyStateNew = 2
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
 						or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
@@ -425,7 +454,7 @@
 						join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 						GROUP BY p.cInvCode,p.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
-				WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+				WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 							and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
 							or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
 							and oti.cInvName = #{goodName}
@@ -440,7 +469,7 @@
 		from UFDATA_103_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		WHERE om.cVerifier is not null
 		and om.cPOID like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode,i.cInvName,rs.cBatch
@@ -454,7 +483,7 @@
 						from UFDATA_103_2021.dbo.om_momain om
 						join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 						join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
-						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+						WHERE om.iVerifyStateNew = 2
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
 						or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
@@ -493,7 +522,7 @@
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 GROUP BY pod.cInvCode,pod.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 					and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
 					or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
 					and oti.cInvName = #{goodName}
@@ -514,7 +543,7 @@
 				join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 				GROUP BY p.cInvCode,p.iorderdid
 		 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
-		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
+		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 					and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
 					or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0499')
 					and oti.cInvName = #{goodName}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationMapper.xml

@@ -18,7 +18,7 @@
     </select>
 
     <select id="queryByCostHead" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
-        SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'101' as pkOrg,
+         SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'101' as pkOrg,
             max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
             max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department, 
             max(cc.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,min(sa.dDate) as outdata,
@@ -38,9 +38,14 @@
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      FROM     
                      UFDATA_101_2021.dbo.OM_MOMain om     
-                     inner JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
+                     inner JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID   
+												join (
+					select cPOID as comcode from UFDATA_101_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+					union
+					select comcode as comcode from UFDATA_101_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+					) rr on om.cCode = rr.comcode	 
                      WHERE     
-                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
+                     om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%')
                      ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode     
         inner JOIN UFDATA_101_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode     
         inner JOIN UFDATA_101_2021.dbo.Inventory c on c.cInvCode=s.cInvCode     
@@ -66,9 +71,14 @@
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      FROM     
                      UFDATA_103_2021.dbo.OM_MOMain om     
-                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID     
+										join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode 
                      WHERE     
-                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
+                     om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%')
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
         inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode     
         inner JOIN UFDATA_103_2021.dbo.Inventory c on c.cInvCode=a.cInvCode     
@@ -106,9 +116,14 @@
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      FROM     
                      UFDATA_103_2021.dbo.OM_MOMain om     
-                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID    
+									join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode	 
                      WHERE     
-                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
+                     om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%')
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
         inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode     
         inner JOIN UFDATA_103_2021.dbo.Inventory c on c.cInvCode=a.cInvCode     
@@ -145,8 +160,13 @@
                      FROM
                      UFDATA_103_2021.dbo.OM_MOMain om
                      inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+										 join (
+		select cPOID as comcode from UFDATA_103_2021.dbo.rdrecords01 where cPOID like CONCAT(#{code},'%')
+		union
+		select comcode as comcode from UFDATA_103_2021.dbo.rdrecords11 where comcode like CONCAT(#{code},'%')
+		) rr on om.cCode = rr.comcode
                      WHERE
-                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
+                     om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%')
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
         inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
         inner JOIN UFDATA_103_2021.dbo.Inventory c on c.cInvCode=a.cInvCode

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationShipdetailMapper.xml

@@ -86,7 +86,7 @@ GROUP BY sbv.cDefine10,sbv.iExchRate,sbv.cSOCode
 									 left join UFDATA_103_2021.dbo.PurBillVouch pb  on bi.PBVID =pb.PBVID 
 									 	left join UFDATA_103_2021.dbo.Inventory inv on bi.cInvCode = inv.cInvCode
 									 WHERE
-									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') and inv.cInvCCode like '19%'
+									 om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%') and inv.cInvCCode like '19%'
 									 GROUP BY od.csoordercode
 									 ) o ON a.csocode = o.csoordercode 
 						inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
@@ -145,7 +145,7 @@ GROUP BY sbv.cDefine10,sbv.iExchRate,sbv.cSOCode
 									  left join UFDATA_103_2021.dbo.PurBillVouch pb  on bi.PBVID =pb.PBVID 
 										left join UFDATA_103_2021.dbo.Inventory inv on bi.cInvCode = inv.cInvCode
 									 WHERE
-									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') and inv.cInvCCode like '19%'
+									 om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%') and inv.cInvCCode like '19%'
 									 GROUP BY od.csoordercode
 									 ) o ON a.csocode = o.csoordercode 
 						inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
@@ -205,7 +205,7 @@ UNION ALL
 									  left join UFDATA_103_2021.dbo.PurBillVouch pb  on bi.PBVID =pb.PBVID 
 										left join UFDATA_103_2021.dbo.Inventory inv on bi.cInvCode = inv.cInvCode
 									 WHERE
-									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') and inv.cInvCCode like '19%'
+									 om.iVerifyStateNew = 2  and om.cCode like CONCAT(#{code},'%') and inv.cInvCCode like '19%'
 									 GROUP BY od.csoordercode
 									 ) o ON a.csocode = o.csoordercode 
 						inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -116,7 +116,11 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			}
 			//小PO
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getSmallPo())){
-				queryWrapper.like("t.smallPo",syLetterDeposit.getSmallPo().trim());
+
+				QueryWrapper<SyLetterDepositItem> queryWrapper1 = new QueryWrapper<SyLetterDepositItem>();
+				queryWrapper1.eq("small_po",syLetterDeposit.getSmallPo().trim()).eq("del_flag",0);;
+				List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper1);
+				queryWrapper.eq("t.id",list.get(0).getSyLetterDepositId());
 			}
 			//预托书号
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getDepositaryReceiptNo())){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -86,7 +86,7 @@ a.create_time as createTime,b.unit_price as unitPrice,sum(b.total_price) as tota
          from sy_letter_deposit_item b
 				 left join sy_letter_deposit a
 				 on a.id = b.sy_letter_deposit_id
-         where a.del_flag = 0 and  b.del_flag = 0 group by groupid) t
+         where a.del_flag = 0 and  b.del_flag = 0 group by b.groupid) t
 
   ${ew.customSqlSegment}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -857,7 +857,15 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellFormula("SUM("+params2[8]+"2:"+params2[size]+"2)/"+pcspack+"2*SUM(F2-E2+1)");
 					  }
+                     //配码规格设置文本
+					  if(x == params.length-13){
+						  Cell cell1 = row2.createCell(x);
+						  CellStyle textStyle = workbook.createCellStyle();
+						  DataFormat dataFormat = workbook.createDataFormat();
+						  textStyle.setDataFormat(dataFormat.getFormat("@")); // 设置为文本格式
+						  cell1.setCellStyle(textStyle);
 
+					  }
 
 				  }
 				  index++;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -283,52 +283,45 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
     @Override
     public int syShippingDetailsDelete(String id,List<String> itemIds) {
 
-        int i = 0;
-        SyShippingDetails syShippingDetails = getById(id);
 
         //根据itemIds查询子表信息
         QueryWrapper<SyShippingDetailsItem> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id",itemIds).eq("del_flag",0);
+        queryWrapper.in("id", itemIds).eq("del_flag", 0);
         List<SyShippingDetailsItem> list = syShippingDetailsItemService.list(queryWrapper);
 
-//        //查询子表条数
-//        QueryWrapper<SyShippingDetailsItem> queryWrapperItem = new QueryWrapper<>();
-//        queryWrapperItem.in("shipping_details_id",id).eq("del_flag",0);
-//        List<SyShippingDetailsItem> listCount = syShippingDetailsItemService.list(queryWrapperItem);
-
-
-        if(list.size()!=0){
-            //回写销售订单剩余数量
-            for (SyShippingDetailsItem li:list) {
+        if (!list.isEmpty()) {
+            // 回写销售订单剩余数量和删除子表
+            List<SyOrderDataItem> orderDataItemList = new ArrayList<>();
+            for (SyShippingDetailsItem li : list) {
                 SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
-                if (oConvertUtils.isNotEmpty(orderDataItem)) {
-                    BigDecimal suerBox = orderDataItem.getSurplusNum().add(li.getShipmentQuantity());
-                    orderDataItem.setSurplusNum(suerBox);
-                    syOrderDataItemService.updateById(orderDataItem);
+                if (orderDataItem != null) {
+                    BigDecimal surplusNum = orderDataItem.getSurplusNum().add(li.getShipmentQuantity());
+                    orderDataItem.setSurplusNum(surplusNum);
+                    orderDataItemList.add(orderDataItem);
                 }
-                //删除子表
-                syShippingDetailsMapper.syshippingDetailsItemUpdate(li.getId());
-                i = 1;
             }
+            if (!orderDataItemList.isEmpty()) {
+                syOrderDataItemService.updateBatchById(orderDataItemList);
+            }
+            syShippingDetailsItemService.removeByIds(itemIds);
         }
 
-
         //查询子表条数
         QueryWrapper<SyShippingDetailsItem> queryWrapperItem1 = new QueryWrapper<>();
-        queryWrapperItem1.in("shipping_details_id",id).eq("del_flag",0);
-        List<SyShippingDetailsItem> listCount1= syShippingDetailsItemService.list(queryWrapperItem1);
+        queryWrapperItem1.in("shipping_details_id", id).eq("del_flag", 0);
+        int count = syShippingDetailsItemService.count(queryWrapperItem1);
 
-        //如果条数一样，整单删除
-        if(listCount1.size()==0){
+        if (count == 0) {
+            SyShippingDetails syShippingDetails = getById(id);
             //删除主表
             syShippingDetails.setDelFlag("1");
-            boolean boo = updateById(syShippingDetails);
-            if(boo){
-                i = 1;
+            boolean updated = updateById(syShippingDetails);
+            if (updated) {
+                return 1;
             }
         }
 
-        return i;
+        return 0;
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -129,7 +129,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			queryWrapper.eq("b.client_abbreviation",syShippingOrder.getClientAbbreviation());
 		}
 		if(oConvertUtils.isNotEmpty(smailPo)){
-			queryWrapper.eq("b.smail_po",smailPo);
+			QueryWrapper<SyShippingOrderItem> queryWrapper1 = new QueryWrapper<>();
+			queryWrapper1.eq("smail_po",smailPo).eq("del_flag",0);
+			List<SyShippingOrderItem> list = syShippingOrderItemService.list(queryWrapper1);
+			queryWrapper.eq("a.id",list.get(0).getSyShippingOrderItemId());
 		}
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getShippingOrderNumber())){
 			queryWrapper.like("a.shipping_order_number",syShippingOrder.getShippingOrderNumber().trim());