Browse Source

成本报表 正式服账套号配置

liuchaohui 2 years ago
parent
commit
2cf20b3eca

+ 12 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationAccidentMapper.xml

@@ -18,10 +18,10 @@
 
 
 	<select id="queryByCostAccident" resultType="org.jeecg.modules.cost.entity.SyCostAllocationAccident">
 	<select id="queryByCostAccident" resultType="org.jeecg.modules.cost.entity.SyCostAllocationAccident">
 		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
-					from UFDATA_901_2021.dbo.PurBillVouchs a
-					left join UFDATA_901_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
-					left join UFDATA_901_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
-					left join UFDATA_901_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
+					from UFDATA_101_2021.dbo.PurBillVouchs a
+					left join UFDATA_101_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
+					left join UFDATA_101_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
+					left join UFDATA_101_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
 					where cPBVBillType='03'
 					where cPBVBillType='03'
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2
@@ -29,10 +29,10 @@
 		union all
 		union all
 
 
 		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
-					from UFDATA_902_2021.dbo.PurBillVouchs a
-					left join UFDATA_902_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
-					left join UFDATA_902_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
-					left join UFDATA_902_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
+					from UFDATA_102_2021.dbo.PurBillVouchs a
+					left join UFDATA_102_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
+					left join UFDATA_102_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
+					left join UFDATA_102_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
 					where cPBVBillType='03'
 					where cPBVBillType='03'
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2
@@ -40,10 +40,10 @@
 		union all
 		union all
 
 
 		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
-					from UFDATA_903_2021.dbo.PurBillVouchs a
-					left join UFDATA_903_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
-					left join UFDATA_903_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
-					left join UFDATA_903_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
+					from UFDATA_103_2021.dbo.PurBillVouchs a
+					left join UFDATA_103_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
+					left join UFDATA_103_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
+					left join UFDATA_103_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
 					where cPBVBillType='03'
 					where cPBVBillType='03'
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2;
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2;

+ 16 - 16
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationCostpayMapper.xml

@@ -26,15 +26,15 @@
 		v.cVenName as processUnit,
 		v.cVenName as processUnit,
 		sps.iMoney as disbursedOriginalmoney
 		sps.iMoney as disbursedOriginalmoney
 		FROM
 		FROM
-		UFDATA_901_2021.dbo.SalePayVouch sp
-		INNER JOIN UFDATA_901_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
-		LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
+		UFDATA_101_2021.dbo.SalePayVouch sp
+		INNER JOIN UFDATA_101_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
+		LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
 		where sp.cSOCode
 		where sp.cSOCode
 		in (
 		in (
-		SELECT s.cSOCode FROM UFDATA_901_2021.dbo.SO_SODetails s
+		SELECT s.cSOCode FROM UFDATA_101_2021.dbo.SO_SODetails s
 			JOIN (
 			JOIN (
-			SELECT od.cInvCode,od.isosid FROM UFDATA_901_2021.dbo.OM_MOMain om
-			LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+			SELECT od.cInvCode,od.isosid FROM UFDATA_101_2021.dbo.OM_MOMain om
+			LEFT JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
 			WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 			WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 			) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 			) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 			GROUP BY s.cSOCode
 			GROUP BY s.cSOCode
@@ -49,15 +49,15 @@
 				 v.cVenName as processUnit,
 				 v.cVenName as processUnit,
 				 sps.iMoney as disbursedOriginalmoney
 				 sps.iMoney as disbursedOriginalmoney
 			 FROM
 			 FROM
-				 UFDATA_902_2021.dbo.SalePayVouch sp
-				 INNER JOIN UFDATA_902_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
-				 LEFT JOIN UFDATA_902_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
+				 UFDATA_102_2021.dbo.SalePayVouch sp
+				 INNER JOIN UFDATA_102_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
+				 LEFT JOIN UFDATA_102_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
 				 where sp.cSOCode
 				 where sp.cSOCode
 			 in (
 			 in (
 				 SELECT s.cSOCode FROM SO_SODetails s
 				 SELECT s.cSOCode FROM SO_SODetails s
 					 JOIN (
 					 JOIN (
-					 SELECT od.cInvCode,od.isosid FROM UFDATA_902_2021.dbo.OM_MOMain om
-					 LEFT JOIN UFDATA_902_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+					 SELECT od.cInvCode,od.isosid FROM UFDATA_102_2021.dbo.OM_MOMain om
+					 LEFT JOIN UFDATA_102_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
 					 WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 					 WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 					 ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 					 ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 					 GROUP BY s.cSOCode
 					 GROUP BY s.cSOCode
@@ -72,15 +72,15 @@
 				 v.cVenName as processUnit,
 				 v.cVenName as processUnit,
 				 sps.iMoney as disbursedOriginalmoney
 				 sps.iMoney as disbursedOriginalmoney
 			 FROM
 			 FROM
-				 UFDATA_903_2021.dbo.SalePayVouch sp
-				 INNER JOIN UFDATA_903_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
-				 LEFT JOIN UFDATA_903_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
+				 UFDATA_103_2021.dbo.SalePayVouch sp
+				 INNER JOIN UFDATA_103_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
+				 LEFT JOIN UFDATA_103_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
 				 where sp.cSOCode
 				 where sp.cSOCode
 			 in (
 			 in (
 				 SELECT s.cSOCode FROM SO_SODetails s
 				 SELECT s.cSOCode FROM SO_SODetails s
 					 JOIN (
 					 JOIN (
-					 SELECT od.cInvCode,od.isosid FROM UFDATA_903_2021.dbo.OM_MOMain om
-					 LEFT JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+					 SELECT od.cInvCode,od.isosid FROM UFDATA_103_2021.dbo.OM_MOMain om
+					 LEFT JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
 					 WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 					 WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 					 ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 					 ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 					 GROUP BY s.cSOCode
 					 GROUP BY s.cSOCode

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

@@ -33,11 +33,11 @@
 		(
 		(
 		select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		sum(ot.iSendQTY) as usageQuantity
 		sum(ot.iSendQTY) as usageQuantity
-		from UFDATA_901_2021.dbo.om_momain om
-		join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_901_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-		join UFDATA_901_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-		join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		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.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 		GROUP BY oti.cInvName
 		GROUP BY oti.cInvName
@@ -45,13 +45,13 @@
 		left join
 		left join
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch from UFDATA_901_2021.dbo.rdrecords01 rs
-		join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch from UFDATA_101_2021.dbo.rdrecords01 rs
+		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_901_2021.dbo.om_momain om
-		join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -59,13 +59,13 @@
 		)tab1
 		)tab1
 		right join
 		right join
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_901_2021.dbo.rdrecords11 rs
-		join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_101_2021.dbo.rdrecords11 rs
+		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_901_2021.dbo.om_momain om
-		join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -92,11 +92,11 @@
 		(
 		(
 		select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		sum(ot.iSendQTY) as usageQuantity
 		sum(ot.iSendQTY) as usageQuantity
-		from UFDATA_903_2021.dbo.om_momain om
-		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-		join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		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.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 		GROUP BY oti.cInvName
 		GROUP BY oti.cInvName
@@ -104,13 +104,13 @@
 		left join
 		left join
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch from UFDATA_903_2021.dbo.rdrecords01 rs
-		join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch from UFDATA_103_2021.dbo.rdrecords01 rs
+		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_903_2021.dbo.om_momain om
-		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -118,13 +118,13 @@
 		)tab1
 		)tab1
 		right join
 		right join
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_903_2021.dbo.rdrecords11 rs
-		join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_103_2021.dbo.rdrecords11 rs
+		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_903_2021.dbo.om_momain om
-		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -141,13 +141,13 @@
 		else tab2.jian-isnull(tab1.purchaseQuantity,0) end as number
 		else tab2.jian-isnull(tab1.purchaseQuantity,0) end as number
 		from
 		from
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,rs.cFree1 from UFDATA_901_2021.dbo.rdrecords01 rs
-		join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,rs.cFree1 from UFDATA_101_2021.dbo.rdrecords01 rs
+		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_901_2021.dbo.om_momain om
-		join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -155,13 +155,13 @@
 		)tab1
 		)tab1
 		right join
 		right join
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch,rs.cFree1 from UFDATA_901_2021.dbo.rdrecords11 rs
-		join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch,rs.cFree1 from UFDATA_101_2021.dbo.rdrecords11 rs
+		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_901_2021.dbo.om_momain om
-		join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -177,13 +177,13 @@
 		else tab2.jian-isnull(tab1.purchaseQuantity,0) end as number
 		else tab2.jian-isnull(tab1.purchaseQuantity,0) end as number
 		from
 		from
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,rs.cFree1 from UFDATA_903_2021.dbo.rdrecords01 rs
-		join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,rs.cFree1 from UFDATA_103_2021.dbo.rdrecords01 rs
+		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_903_2021.dbo.om_momain om
-		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -191,13 +191,13 @@
 		)tab1
 		)tab1
 		right join
 		right join
 		(
 		(
-		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch,rs.cFree1 from UFDATA_903_2021.dbo.rdrecords11 rs
-		join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch,rs.cFree1 from UFDATA_103_2021.dbo.rdrecords11 rs
+		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 		where iordercode in (
 		where iordercode in (
 		select distinct od.csocode
 		select distinct od.csocode
-		from UFDATA_903_2021.dbo.om_momain om
-		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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 (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
 		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499'
@@ -208,11 +208,11 @@
 
 
 	<select id="queryRemainingByFabric" resultType="org.jeecg.modules.cost.entity.SyRemaining">
 	<select id="queryRemainingByFabric" resultType="org.jeecg.modules.cost.entity.SyRemaining">
 		select oti.cInvName as goodsName,ot.cFree1 as color,max(om.ccode) as planCode,sum(ot.iQuantity) as number
 		select oti.cInvName as goodsName,ot.cFree1 as color,max(om.ccode) as planCode,sum(ot.iQuantity) as number
-	from UFDATA_901_2021.dbo.om_momain om
-	join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-	join UFDATA_901_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-	join UFDATA_901_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-	join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+	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 omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%') and oti.cInvName = #{goodName}
 	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}
 	and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 	and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 	GROUP BY oti.cInvName,ot.cFree1
 	GROUP BY oti.cInvName,ot.cFree1
@@ -220,11 +220,11 @@
 	union all
 	union all
 
 
 	select oti.cInvName as goodsName,ot.cFree1 as color,max(om.ccode) as planCode,sum(ot.iQuantity) as number
 	select oti.cInvName as goodsName,ot.cFree1 as color,max(om.ccode) as planCode,sum(ot.iQuantity) as number
-	from UFDATA_903_2021.dbo.om_momain om
-	join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-	join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-	join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-	join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+	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 omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%') and oti.cInvName = #{goodName}
 	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}
 	and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 	and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
 	GROUP BY oti.cInvName,ot.cFree1
 	GROUP BY oti.cInvName,ot.cFree1

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

@@ -31,16 +31,16 @@
 		(
 		(
 				select oti.cInvName as goodsName,max(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity 
 				select oti.cInvName as goodsName,max(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity 
 				 ,max(pb.rmbAmount) as rmbAmount,max(pb.usdAmount) as usdAmount,max(pb.priceExcludingtax) as priceExcludingtax,max(pb.iCost) as cost
 				 ,max(pb.rmbAmount) as rmbAmount,max(pb.usdAmount) as usdAmount,max(pb.priceExcludingtax) as priceExcludingtax,max(pb.iCost) as cost
-				from UFDATA_903_2021.dbo.om_momain om
-				join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-				join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-				join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-				join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+				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
 				left join (
 				left join (
 						SELECT p.cInvCode,p.iorderdid,max(bi.iMoney) as rmbAmount,max(bi.iOriMoney) as usdAmount
 						SELECT p.cInvCode,p.iorderdid,max(bi.iMoney) as rmbAmount,max(bi.iOriMoney) as usdAmount
 									,max(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,max(bi.iCost) as iCost
 									,max(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,max(bi.iCost) as iCost
-						from UFDATA_903_2021.dbo.PO_Podetails p      
-						join UFDATA_903_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID 
+						from UFDATA_103_2021.dbo.PO_Podetails p      
+						join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID 
 						GROUP BY p.cInvCode,p.iorderdid 
 						GROUP BY p.cInvCode,p.iorderdid 
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
 				 ) 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 (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' 
@@ -50,13 +50,13 @@
 		) tab
 		) tab
 		left join 
 		left join 
 		(
 		(
-				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_903_2021.dbo.rdrecords01 rs
-				join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_103_2021.dbo.rdrecords01 rs
+				join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
 				where iordercode in (
 						select distinct od.csocode
 						select distinct od.csocode
-						from UFDATA_903_2021.dbo.om_momain om  
-						join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+						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 (om.cCloser is null or om.cCloser='asuser') 
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 									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%'
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
@@ -65,13 +65,13 @@
 		)tab1 on tab1.cInvName=tab.goodsName
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join 
 		left join 
 		(
 		(
-				select i.cInvName,sum(rs.iQuantity) as jian from UFDATA_903_2021.dbo.rdrecords11 rs
-				join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				select i.cInvName,sum(rs.iQuantity) as jian from UFDATA_103_2021.dbo.rdrecords11 rs
+				join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
 				where iordercode in (
 						select distinct od.csocode
 						select distinct od.csocode
-						from UFDATA_903_2021.dbo.om_momain om  
-						join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+						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 (om.cCloser is null or om.cCloser='asuser') 
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 									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%' 
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%' 
@@ -94,17 +94,17 @@
 		(
 		(
 				select oti.cInvName as goodsName,max(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity 
 				select oti.cInvName as goodsName,max(ot.iUnitQuantity) as dosage,sum(ot.iSendQTY) as usageQuantity 
 				 ,max(pb.rmbAmount) as rmbAmount,max(pb.usdAmount) as usdAmount,max(pb.priceExcludingtax) as priceExcludingtax,max(pb.iCost) as cost
 				 ,max(pb.rmbAmount) as rmbAmount,max(pb.usdAmount) as usdAmount,max(pb.priceExcludingtax) as priceExcludingtax,max(pb.iCost) as cost
-				from UFDATA_901_2021.dbo.om_momain om
-				join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-				join UFDATA_901_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-				join UFDATA_901_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-				join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+				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
 				left join (
 				left join (
 						SELECT p.cInvCode,p.iorderdid,max(bi.iMoney) as rmbAmount,max(bi.iOriMoney) as usdAmount
 						SELECT p.cInvCode,p.iorderdid,max(bi.iMoney) as rmbAmount,max(bi.iOriMoney) as usdAmount
 									,max(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,max(bi.iCost) as iCost
 									,max(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,max(bi.iCost) as iCost
-						from UFDATA_901_2021.dbo.PO_Podetails p
-						join UFDATA_901_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
-						join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+						from UFDATA_101_2021.dbo.PO_Podetails p
+						join UFDATA_101_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
+						join UFDATA_101_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 					  	where pm.cVenCode != 'T010001'
 					  	where pm.cVenCode != 'T010001'
 						GROUP BY p.cInvCode,p.iorderdid
 						GROUP BY p.cInvCode,p.iorderdid
 
 
@@ -113,13 +113,13 @@
 						 select
 						 select
 						pod.cInvCode,pod.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 						pod.cInvCode,pod.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 						,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
 						,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
-						 from UFDATA_901_2021.dbo.PO_Pomain pom
-						 join UFDATA_901_2021.dbo.PO_Podetails pod on pod.POID  = pom.POID
-						 join UFDATA_902_2021.dbo.SO_SODetails sd on sd.cSOCode=pom.cpoid and sd.irowno=pod.ivouchrowno
-						 join UFDATA_902_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
-						 join UFDATA_902_2021.dbo.PO_Pomain pm on pd.POID  = pm.POID
-						 join UFDATA_902_2021.dbo.PurBillVouchs bi  on bi.iPOsID=pd.ID
-						 join UFDATA_902_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
+						 from UFDATA_101_2021.dbo.PO_Pomain pom
+						 join UFDATA_101_2021.dbo.PO_Podetails pod on pod.POID  = pom.POID
+						 join UFDATA_102_2021.dbo.SO_SODetails sd on sd.cSOCode=pom.cpoid and sd.irowno=pod.ivouchrowno
+						 join UFDATA_102_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
+						 join UFDATA_102_2021.dbo.PO_Pomain pm on pd.POID  = pm.POID
+						 join UFDATA_102_2021.dbo.PurBillVouchs bi  on bi.iPOsID=pd.ID
+						 join UFDATA_102_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 GROUP BY pod.cInvCode,pod.iorderdid
 						 GROUP BY pod.cInvCode,pod.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
@@ -130,13 +130,13 @@
 		) tab
 		) tab
 		left join
 		left join
 		(
 		(
-				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_901_2021.dbo.rdrecords01 rs
-				join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_101_2021.dbo.rdrecords01 rs
+				join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
 				where iordercode in (
 						select distinct od.csocode
 						select distinct od.csocode
-						from UFDATA_901_2021.dbo.om_momain om
-						join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+						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 (om.cCloser is null or om.cCloser='asuser')
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 									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%'
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
@@ -145,13 +145,13 @@
 		)tab1 on tab1.cInvName=tab.goodsName
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join
 		left join
 		(
 		(
-				select i.cInvName,sum(rs.iQuantity) as jian from UFDATA_901_2021.dbo.rdrecords11 rs
-				join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				select i.cInvName,sum(rs.iQuantity) as jian from UFDATA_101_2021.dbo.rdrecords11 rs
+				join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
 				where iordercode in (
 						select distinct od.csocode
 						select distinct od.csocode
-						from UFDATA_901_2021.dbo.om_momain om
-						join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+						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 (om.cCloser is null or om.cCloser='asuser')
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 									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%'
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
@@ -166,17 +166,17 @@
 		from
 		from
 		(
 		(
 				select oti.cInvName as goodsName,sum(pb.iCost) as cost
 				select oti.cInvName as goodsName,sum(pb.iCost) as cost
-				from UFDATA_901_2021.dbo.om_momain om
-				join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-				join UFDATA_901_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-				join UFDATA_901_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-				join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+				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
 				left join (
 				left join (
 						SELECT p.cInvCode,p.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 						SELECT p.cInvCode,p.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 									,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
 									,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
-						from UFDATA_901_2021.dbo.PO_Podetails p
-						join UFDATA_901_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
-						join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+						from UFDATA_101_2021.dbo.PO_Podetails p
+						join UFDATA_101_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
+						join UFDATA_101_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 					  where pm.cVenCode != 'T010001'
 					  where pm.cVenCode != 'T010001'
 						GROUP BY p.cInvCode,p.iorderdid
 						GROUP BY p.cInvCode,p.iorderdid
 
 
@@ -185,13 +185,13 @@
 						 select
 						 select
 						pod.cInvCode,pod.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 						pod.cInvCode,pod.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 						,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
 						,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
-						 from UFDATA_901_2021.dbo.PO_Pomain pom
-						 join UFDATA_901_2021.dbo.PO_Podetails pod on pod.POID  = pom.POID
-						 join UFDATA_902_2021.dbo.SO_SODetails sd on sd.cSOCode=pom.cpoid and sd.irowno=pod.ivouchrowno
-						 join UFDATA_902_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
-						 join UFDATA_902_2021.dbo.PO_Pomain pm on pd.POID  = pm.POID
-						 join UFDATA_902_2021.dbo.PurBillVouchs bi  on bi.iPOsID=pd.ID
-						 join UFDATA_902_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
+						 from UFDATA_101_2021.dbo.PO_Pomain pom
+						 join UFDATA_101_2021.dbo.PO_Podetails pod on pod.POID  = pom.POID
+						 join UFDATA_102_2021.dbo.SO_SODetails sd on sd.cSOCode=pom.cpoid and sd.irowno=pod.ivouchrowno
+						 join UFDATA_102_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
+						 join UFDATA_102_2021.dbo.PO_Pomain pm on pd.POID  = pm.POID
+						 join UFDATA_102_2021.dbo.PurBillVouchs bi  on bi.iPOsID=pd.ID
+						 join UFDATA_102_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 GROUP BY pod.cInvCode,pod.iorderdid
 						 GROUP BY pod.cInvCode,pod.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
@@ -206,29 +206,29 @@
 				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,max(om.cCode) as ccode
 				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,max(om.cCode) as ccode
 -- 				(
 -- 				(
 -- 						select distinct om.cCode
 -- 						select distinct om.cCode
--- 						from UFDATA_901_2021.dbo.om_momain om
--- 						join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
--- 						join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+-- 						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 (om.cCloser is null or om.cCloser='asuser')
 -- 									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
 -- 									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
 -- 				) as ccode
 -- 				) as ccode
-				from UFDATA_901_2021.dbo.rdrecords01 rs
-				join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-				left join UFDATA_901_2021.dbo.OM_MODetails od on od.csocode=rs.iordercode
-				join UFDATA_901_2021.dbo.om_momain om on om.moid=od.moid
+				from UFDATA_101_2021.dbo.rdrecords01 rs
+				join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				left join UFDATA_101_2021.dbo.OM_MODetails od on od.csocode=rs.iordercode
+				join UFDATA_101_2021.dbo.om_momain om on om.moid=od.moid
 				where (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
 				where (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 = '0399' or i.cInvCCode = '0499')
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
 		)tab1 on tab1.cInvName=tab.goodsName
 		)tab1 on tab1.cInvName=tab.goodsName
 		 join
 		 join
 		(
 		(
-				select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_901_2021.dbo.rdrecords11 rs
-				join UFDATA_901_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_101_2021.dbo.rdrecords11 rs
+				join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
 				where iordercode in (
 						select distinct od.csocode
 						select distinct od.csocode
-						from UFDATA_901_2021.dbo.om_momain om
-						join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+						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 (om.cCloser is null or om.cCloser='asuser')
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 									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%'
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
@@ -244,16 +244,16 @@
 		from
 		from
 		(
 		(
 				select oti.cInvName as goodsName,sum(pb.iCost) as cost
 				select oti.cInvName as goodsName,sum(pb.iCost) as cost
-				from UFDATA_903_2021.dbo.om_momain om
-				join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-				join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-				join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-				join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+				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
 				left join (
 				left join (
 						SELECT p.cInvCode,p.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 						SELECT p.cInvCode,p.iorderdid,sum(bi.iMoney) as rmbAmount,sum(bi.iOriMoney) as usdAmount
 									,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
 									,sum(bi.iMoney-bi.iTaxPrice) as priceExcludingtax,sum(bi.iCost) as iCost
-						from UFDATA_903_2021.dbo.PO_Podetails p
-						join UFDATA_903_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+						from UFDATA_103_2021.dbo.PO_Podetails p
+						join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 						GROUP BY p.cInvCode,p.iorderdid
 						GROUP BY p.cInvCode,p.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
 				 ) 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 (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
@@ -267,29 +267,29 @@
 				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,max(om.cCode) as ccode
 				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,max(om.cCode) as ccode
 -- 				(
 -- 				(
 -- 						select distinct om.cCode
 -- 						select distinct om.cCode
--- 						from UFDATA_903_2021.dbo.om_momain om
--- 						join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
--- 						join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+-- 						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 (om.cCloser is null or om.cCloser='asuser')
 -- 									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
 -- 									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
 -- 				) as ccode
 -- 				) as ccode
-				from UFDATA_903_2021.dbo.rdrecords01 rs
-				join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-				left join UFDATA_903_2021.dbo.OM_MODetails od on od.csocode=rs.iordercode
-				join UFDATA_903_2021.dbo.om_momain om on om.moid=od.moid
+				from UFDATA_103_2021.dbo.rdrecords01 rs
+				join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				left join UFDATA_103_2021.dbo.OM_MODetails od on od.csocode=rs.iordercode
+				join UFDATA_103_2021.dbo.om_momain om on om.moid=od.moid
 				where (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
 				where (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 = '0399' or i.cInvCCode = '0499')
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
 		)tab1 on tab1.cInvName=tab.goodsName
 		)tab1 on tab1.cInvName=tab.goodsName
 		 join
 		 join
 		(
 		(
-				select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_903_2021.dbo.rdrecords11 rs
-				join UFDATA_903_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+				select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_103_2021.dbo.rdrecords11 rs
+				join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
 				where iordercode in (
 						select distinct od.csocode
 						select distinct od.csocode
-						from UFDATA_903_2021.dbo.om_momain om
-						join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-						join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+						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 (om.cCloser is null or om.cCloser='asuser')
 									and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 									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%'
 				) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
@@ -302,16 +302,16 @@
 	<select id="queryRemainingByIngredient" resultType="org.jeecg.modules.cost.entity.SyRemaining">
 	<select id="queryRemainingByIngredient" resultType="org.jeecg.modules.cost.entity.SyRemaining">
 		select oti.cInvName as goodsName,max(om.cCode) as planCode,sum(ot.iSendQTY) as number ,
 		select oti.cInvName as goodsName,max(om.cCode) as planCode,sum(ot.iSendQTY) as number ,
 								max(pb.iCost) as unitCost,sum(ot.iSendQTY)*max(pb.iCost) as cost
 								max(pb.iCost) as unitCost,sum(ot.iSendQTY)*max(pb.iCost) as cost
-				from UFDATA_901_2021.dbo.om_momain om
-				join UFDATA_901_2021.dbo.OM_MODetails od on om.moid=od.moid
-				join UFDATA_901_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-				join UFDATA_901_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-				join UFDATA_901_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+				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
 				left join (
 				left join (
 						SELECT p.cInvCode,p.iorderdid,sum(bi.iCost) as iCost
 						SELECT p.cInvCode,p.iorderdid,sum(bi.iCost) as iCost
-						from UFDATA_901_2021.dbo.PO_Podetails p
-						join UFDATA_901_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
-						join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+						from UFDATA_101_2021.dbo.PO_Podetails p
+						join UFDATA_101_2021.dbo.PO_Pomain pm on p.POID  = pm.POID
+						join UFDATA_101_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 					  where pm.cVenCode != 'T010001'
 					  where pm.cVenCode != 'T010001'
 						GROUP BY p.cInvCode,p.iorderdid
 						GROUP BY p.cInvCode,p.iorderdid
 
 
@@ -319,13 +319,13 @@
 
 
 					 select
 					 select
 						pod.cInvCode,pod.iorderdid,sum(bi.iCost) as iCost
 						pod.cInvCode,pod.iorderdid,sum(bi.iCost) as iCost
-						 from UFDATA_901_2021.dbo.PO_Pomain pom
-						 join UFDATA_901_2021.dbo.PO_Podetails pod on pod.POID  = pom.POID
-						 join UFDATA_902_2021.dbo.SO_SODetails sd on sd.cSOCode=pom.cpoid and sd.irowno=pod.ivouchrowno
-						 join UFDATA_902_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
-						 join UFDATA_902_2021.dbo.PO_Pomain pm on pd.POID  = pm.POID
-						 join UFDATA_902_2021.dbo.PurBillVouchs bi  on bi.iPOsID=pd.ID
-						 join UFDATA_902_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
+						 from UFDATA_101_2021.dbo.PO_Pomain pom
+						 join UFDATA_101_2021.dbo.PO_Podetails pod on pod.POID  = pom.POID
+						 join UFDATA_102_2021.dbo.SO_SODetails sd on sd.cSOCode=pom.cpoid and sd.irowno=pod.ivouchrowno
+						 join UFDATA_102_2021.dbo.PO_Podetails pd on pd.iorderdid=sd.isosid
+						 join UFDATA_102_2021.dbo.PO_Pomain pm on pd.POID  = pm.POID
+						 join UFDATA_102_2021.dbo.PurBillVouchs bi  on bi.iPOsID=pd.ID
+						 join UFDATA_102_2021.dbo.Inventory oti on oti.cInvCode=pd.cInvCode
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 where pm.cVenCode != 'T010001' and pom.cVenCode = 'T010001'
 						 GROUP BY pod.cInvCode,pod.iorderdid
 						 GROUP BY pod.cInvCode,pod.iorderdid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
 				 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
@@ -339,15 +339,15 @@
 
 
 		select oti.cInvName as goodsName,max(om.cCode) as planCode,sum(ot.iSendQTY) as number ,
 		select oti.cInvName as goodsName,max(om.cCode) as planCode,sum(ot.iSendQTY) as number ,
 								max(pb.iCost) as unitCost,sum(ot.iSendQTY)*max(pb.iCost) as cost
 								max(pb.iCost) as unitCost,sum(ot.iSendQTY)*max(pb.iCost) as cost
-		from UFDATA_903_2021.dbo.om_momain om
-		join UFDATA_903_2021.dbo.OM_MODetails od on om.moid=od.moid
-		join UFDATA_903_2021.dbo.OM_MOMaterials ot on ot.MoDetailsID=od.MODetailsID
-		join UFDATA_903_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
-		join UFDATA_903_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		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
 		left join (
 		left join (
 				SELECT p.cInvCode,p.iorderdid,max(bi.iCost) as iCost
 				SELECT p.cInvCode,p.iorderdid,max(bi.iCost) as iCost
-				from UFDATA_903_2021.dbo.PO_Podetails p
-				join UFDATA_903_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+				from UFDATA_103_2021.dbo.PO_Podetails p
+				join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
 				GROUP BY p.cInvCode,p.iorderdid
 				GROUP BY p.cInvCode,p.iorderdid
 		 ) pb on pb.cInvCode=ot.cInvCode and pb.iorderdid=od.isosid
 		 ) 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 (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'

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

@@ -24,26 +24,26 @@
             max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
-        FROM  UFDATA_901_2021.dbo.SO_SODetails s     
-        inner JOIN UFDATA_901_2021.dbo.SO_SOMain ss on ss.ID= s.ID
-        JOIN UFDATA_901_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
-		JOIN UFDATA_901_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
+        FROM  UFDATA_101_2021.dbo.SO_SODetails s     
+        inner JOIN UFDATA_101_2021.dbo.SO_SOMain ss on ss.ID= s.ID
+        JOIN UFDATA_101_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
+		JOIN UFDATA_101_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
         inner JOIN (     
         inner JOIN (     
                      SELECT      
                      SELECT      
                      om.cCode AS omCode,     
                      om.cCode AS omCode,     
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      FROM     
                      FROM     
-                     UFDATA_901_2021.dbo.OM_MOMain om     
-                     inner JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
+                     UFDATA_101_2021.dbo.OM_MOMain om     
+                     inner JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
                      WHERE     
                      WHERE     
                      om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') 
                      om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') 
                      ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode     
                      ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode     
-        inner JOIN UFDATA_901_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode     
-        inner JOIN UFDATA_901_2021.dbo.Inventory c on c.cInvCode=s.cInvCode     
-        inner JOIN UFDATA_901_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode     
-        inner JOIN UFDATA_901_2021.dbo.Department de ON ss.cDepCode = de.cDepCode     
-        inner JOIN UFDATA_901_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode     
+        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     
+        inner JOIN UFDATA_101_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode     
+        inner JOIN UFDATA_101_2021.dbo.Department de ON ss.cDepCode = de.cDepCode     
+        inner JOIN UFDATA_101_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode     
         WHERE c.cInvCcode like '19%' GROUP BY v.cVenName  
         WHERE c.cInvCcode like '19%' GROUP BY v.cVenName  
         
         
         union all  
         union all  
@@ -54,32 +54,32 @@
             max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
-        FROM  UFDATA_903_2021.dbo.SO_SODetails a     
-        inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID     
+        FROM  UFDATA_103_2021.dbo.SO_SODetails a     
+        inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID     
         inner JOIN (     
         inner JOIN (     
                      SELECT      
                      SELECT      
                      om.cCode AS omCode, od.csoordercode,    
                      om.cCode AS omCode, od.csoordercode,    
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      FROM     
                      FROM     
-                     UFDATA_903_2021.dbo.OM_MOMain om     
-                     inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
+                     UFDATA_103_2021.dbo.OM_MOMain om     
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
                      WHERE     
                      WHERE     
                      om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') 
                      om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') 
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
-        inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode     
-        inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode     
-        inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode     
-        inner JOIN UFDATA_903_2021.dbo.Department de ON b.cDepCode = de.cDepCode
-        inner JOIN UFDATA_903_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode 
-        inner join UFDATA_902_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
-        inner join UFDATA_902_2021.dbo.po_podetails g on g.POID=f.POID
-        inner join UFDATA_902_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
-        inner join UFDATA_902_2021.dbo.so_somain ss on ss.id=s.id
-        inner JOIN UFDATA_902_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
-		inner JOIN UFDATA_902_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
-        inner join UFDATA_902_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
-        inner JOIN UFDATA_902_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
+        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     
+        inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode     
+        inner JOIN UFDATA_103_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_103_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode 
+        inner join UFDATA_102_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+        inner join UFDATA_102_2021.dbo.po_podetails g on g.POID=f.POID
+        inner join UFDATA_102_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+        inner join UFDATA_102_2021.dbo.so_somain ss on ss.id=s.id
+        inner JOIN UFDATA_102_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
+		inner JOIN UFDATA_102_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
+        inner join UFDATA_102_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
+        inner JOIN UFDATA_102_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenName 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenName 
         
         
         
         
@@ -91,32 +91,32 @@
             max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
-        FROM  UFDATA_903_2021.dbo.SO_SODetails a     
-        inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID     
+        FROM  UFDATA_103_2021.dbo.SO_SODetails a     
+        inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID     
         inner JOIN (     
         inner JOIN (     
                      SELECT      
                      SELECT      
                      om.cCode AS omCode, od.csoordercode,    
                      om.cCode AS omCode, od.csoordercode,    
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity      
                      FROM     
                      FROM     
-                     UFDATA_903_2021.dbo.OM_MOMain om     
-                     inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
+                     UFDATA_103_2021.dbo.OM_MOMain om     
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID      
                      WHERE     
                      WHERE     
                      om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') 
                      om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%') 
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
-        inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode     
-        inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode     
-        inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode     
-        inner JOIN UFDATA_903_2021.dbo.Department de ON b.cDepCode = de.cDepCode
-        inner JOIN UFDATA_903_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode 
-        inner join UFDATA_901_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
-        inner join UFDATA_901_2021.dbo.po_podetails g on g.POID=f.POID
-        inner join UFDATA_901_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
-        inner join UFDATA_901_2021.dbo.so_somain ss on ss.id=s.id
-        inner JOIN UFDATA_901_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
-		inner JOIN UFDATA_901_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
-        inner join UFDATA_901_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
-        inner JOIN UFDATA_901_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
+        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     
+        inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode     
+        inner JOIN UFDATA_103_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_103_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode 
+        inner join UFDATA_101_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+        inner join UFDATA_101_2021.dbo.po_podetails g on g.POID=f.POID
+        inner join UFDATA_101_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+        inner join UFDATA_101_2021.dbo.so_somain ss on ss.id=s.id
+        inner JOIN UFDATA_101_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
+		inner JOIN UFDATA_101_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
+        inner join UFDATA_101_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
+        inner JOIN UFDATA_101_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenName 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenName 
     </select>
     </select>
 </mapper>
 </mapper>

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

@@ -33,26 +33,26 @@
 			avg(so.procesUnitPricermb) * sum(shs.iQuantity) as processCost,
 			avg(so.procesUnitPricermb) * sum(shs.iQuantity) as processCost,
 			v.cVenName AS processUnit
 			v.cVenName AS processUnit
 		 FROM
 		 FROM
-			UFDATA_901_2021.dbo.SaleBillVouch sh
-			JOIN UFDATA_901_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
-			LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
-			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
+			UFDATA_101_2021.dbo.SaleBillVouch sh
+			JOIN UFDATA_101_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
+			LEFT JOIN UFDATA_101_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
+			LEFT JOIN UFDATA_101_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 			JOIN (
 			JOIN (
 			 SELECT
 			 SELECT
 				supplierCode,s.iSOsID,s.id ,o.procesUnitPriceusd,o.procesUnitPricermb,o.iPBVQuantity,s.cdefine22,s.cDefine28
 				supplierCode,s.iSOsID,s.id ,o.procesUnitPriceusd,o.procesUnitPricermb,o.iPBVQuantity,s.cdefine22,s.cDefine28
-			 FROM UFDATA_901_2021.dbo.SO_SODetails s
+			 FROM UFDATA_101_2021.dbo.SO_SODetails s
 			 JOIN (
 			 JOIN (
 					SELECT
 					SELECT
 			 max(om.cVenCode) AS supplierCode,od.cInvCode,od.isosid,sum(od.iTax) as iTax,sum(od.iNatTax) as iNatTax
 			 max(om.cVenCode) AS supplierCode,od.cInvCode,od.isosid,sum(od.iTax) as iTax,sum(od.iNatTax) as iNatTax
 			 ,min(od.iNatUnitPrice) as procesUnitPricermb,min(bi.iOriTaxCost ) as procesUnitPriceusd,count(1) as iPBVQuantity
 			 ,min(od.iNatUnitPrice) as procesUnitPricermb,min(bi.iOriTaxCost ) as procesUnitPriceusd,count(1) as iPBVQuantity
-					FROM UFDATA_901_2021.dbo.OM_MOMain om
-					LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
-					left join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
+					FROM UFDATA_101_2021.dbo.OM_MOMain om
+					LEFT JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+					left join UFDATA_101_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
 					WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 					WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 					GROUP BY od.cInvCode,od.isosid
 					GROUP BY od.cInvCode,od.isosid
 				) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 				) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 			) so ON so.iSOsID = rd.iorderdid
 			) so ON so.iSOsID = rd.iorderdid
-		 LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
+		 LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
 		 group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 		 group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 
 
 		 union all
 		 union all
@@ -73,35 +73,35 @@
 			max(so.iNatTax) * sum(shs.iQuantity) as processCost,
 			max(so.iNatTax) * sum(shs.iQuantity) as processCost,
 			v.cVenName AS processUnit
 			v.cVenName AS processUnit
 		FROM
 		FROM
-			UFDATA_902_2021.dbo.SaleBillVouch sh
-			JOIN UFDATA_902_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
-			LEFT JOIN UFDATA_902_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
-			LEFT JOIN UFDATA_902_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
+			UFDATA_102_2021.dbo.SaleBillVouch sh
+			JOIN UFDATA_102_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
+			LEFT JOIN UFDATA_102_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
+			LEFT JOIN UFDATA_102_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 		JOIN (
 		JOIN (
 			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax,s.cdefine22,s.cDefine28
 			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax,s.cdefine22,s.cDefine28
-						FROM  UFDATA_903_2021.dbo.SO_SODetails a
-						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
+						FROM  UFDATA_103_2021.dbo.SO_SODetails a
+						inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (
 						inner JOIN (
 									 SELECT
 									 SELECT
 									 om.cCode AS omCode, od.csoordercode,
 									 om.cCode AS omCode, od.csoordercode,
 									 om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
 									 om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
 									 om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity ,od.iTax,od.iNatTax
 									 om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity ,od.iTax,od.iNatTax
 									 FROM
 									 FROM
-									 UFDATA_903_2021.dbo.OM_MOMain om
-									 inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+									 UFDATA_103_2021.dbo.OM_MOMain om
+									 inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
 									 WHERE
 									 WHERE
 									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
 									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
 									 ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
 									 ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
-						inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
-						inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
-						inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
-						inner join UFDATA_902_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
-						inner join UFDATA_902_2021.dbo.po_podetails g on g.POID=f.POID
-						inner join UFDATA_902_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
-						inner join UFDATA_902_2021.dbo.so_somain ss on ss.id=s.id
+						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
+						inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+						inner join UFDATA_102_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+						inner join UFDATA_102_2021.dbo.po_podetails g on g.POID=f.POID
+						inner join UFDATA_102_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+						inner join UFDATA_102_2021.dbo.so_somain ss on ss.id=s.id
 						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%'
 						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%'
 			) so ON so.iSOsID = rd.iorderdid
 			) so ON so.iSOsID = rd.iorderdid
-		LEFT JOIN UFDATA_902_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
+		LEFT JOIN UFDATA_102_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
 		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 
 
 		union all
 		union all
@@ -122,39 +122,39 @@
 		avg(so.iNatUnitPrice) * sum(shs.iQuantity) as processCost,
 		avg(so.iNatUnitPrice) * sum(shs.iQuantity) as processCost,
 		v.cVenName AS processUnit
 		v.cVenName AS processUnit
 		 FROM
 		 FROM
-			UFDATA_901_2021.dbo.SaleBillVouch sh
-			JOIN UFDATA_901_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
-			LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
-			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
+			UFDATA_101_2021.dbo.SaleBillVouch sh
+			JOIN UFDATA_101_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
+			LEFT JOIN UFDATA_101_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
+			LEFT JOIN UFDATA_101_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 		  JOIN (
 		  JOIN (
 			 SELECT  max(supplierCode) as supplierCode,s.iSOsID,avg(o.iOriTaxCost) as iOriTaxCost,
 			 SELECT  max(supplierCode) as supplierCode,s.iSOsID,avg(o.iOriTaxCost) as iOriTaxCost,
 					avg(o.iNatUnitPrice) as iNatUnitPrice,max(s.cdefine22) as cdefine22,max(s.cDefine28) as cDefine28
 					avg(o.iNatUnitPrice) as iNatUnitPrice,max(s.cdefine22) as cdefine22,max(s.cDefine28) as cDefine28
-						FROM  UFDATA_903_2021.dbo.SO_SODetails a
-						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
+						FROM  UFDATA_103_2021.dbo.SO_SODetails a
+						inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (
 						inner JOIN (
 									 SELECT
 									 SELECT
 									 max(od.csoordercode) as csoordercode,
 									 max(od.csoordercode) as csoordercode,
 									 max(om.cVenCode) AS supplierCode,od.cInvCode,od.isosid,sum(od.iQuantity) as iQuantity ,
 									 max(om.cVenCode) AS supplierCode,od.cInvCode,od.isosid,sum(od.iQuantity) as iQuantity ,
 									 avg(bi.iOriTaxCost) as iOriTaxCost,avg(od.iNatUnitPrice) as iNatUnitPrice
 									 avg(bi.iOriTaxCost) as iOriTaxCost,avg(od.iNatUnitPrice) as iNatUnitPrice
 									 FROM
 									 FROM
-									 UFDATA_903_2021.dbo.OM_MOMain om
-									 inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
-									 left join UFDATA_903_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
+									 UFDATA_103_2021.dbo.OM_MOMain om
+									 inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+									 left join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
 									 WHERE
 									 WHERE
 									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
 									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
 									 GROUP BY od.cInvCode,od.isosid
 									 GROUP BY od.cInvCode,od.isosid
 									 ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
 									 ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
-						inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
-						inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
-						inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
-						inner join UFDATA_901_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
-						inner join UFDATA_901_2021.dbo.po_podetails g on g.POID=f.POID
-						inner join UFDATA_901_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
-						inner join UFDATA_901_2021.dbo.so_somain ss on ss.id=s.id
+						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
+						inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+						inner join UFDATA_101_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+						inner join UFDATA_101_2021.dbo.po_podetails g on g.POID=f.POID
+						inner join UFDATA_101_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+						inner join UFDATA_101_2021.dbo.so_somain ss on ss.id=s.id
 						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%'
 						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%'
 						GROUP BY s.iSOsID
 						GROUP BY s.iSOsID
 			) so ON so.iSOsID = rd.iorderdid
 			) so ON so.iSOsID = rd.iorderdid
-		LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
+		LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
 		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 
 
 	</select>
 	</select>