成本分配调整

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

@@ -48,11 +48,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
-		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
@@ -130,11 +126,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
-		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%'

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

@@ -47,11 +47,7 @@
 		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
+		join UFDATA_103_2021.dbo.cost_allocation_accessories_view vif on om.ccode = vif.cCode and ot.cInvCode = vif.cInvCode
 		WHERE
 		om.iVerifyStateNew = 2
 
@@ -97,11 +93,7 @@
 		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
+		join UFDATA_103_2021.dbo.cost_allocation_accessories_view vif on om.ccode = vif.cCode and ot.cInvCode = vif.cInvCode
 		WHERE
 		om.iVerifyStateNew = 2
 
@@ -133,9 +125,6 @@
 		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
 
@@ -208,11 +197,7 @@
 		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
-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
+join UFDATA_103_2021.dbo.cost_allocation_accessories_view vif on om.ccode = vif.cCode and ot.cInvCode = vif.cInvCode
 		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%')
 		group by om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName
@@ -243,11 +228,7 @@ join (
 		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
-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
+join UFDATA_103_2021.dbo.cost_allocation_accessories_view vif on om.ccode = vif.cCode and ot.cInvCode = vif.cInvCode
 		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%')
 		group by  om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName
@@ -281,11 +262,7 @@ join (
 		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
-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
+join UFDATA_103_2021.dbo.cost_allocation_accessories_view vif on om.ccode = vif.cCode and ot.cInvCode = vif.cInvCode
 		WHERE om.iVerifyStateNew = 2  and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%')
 		group by om.ccode,ot.cInvCode,od.isosid,om.ccode,oti.cInvName
@@ -311,9 +288,6 @@ join (
 		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
 

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

@@ -31,7 +31,7 @@
         left join UFDATA_101_2021.dbo.SaleBillVouch sh ON sh.SBVID = shs.SBVID
 				GROUP BY sh.SBVID
 				)sa ON s.iSOsID = sa.iSOsID
-        inner JOIN (     
+        inner JOIN (
                      SELECT      
                      om.cCode AS omCode,     
                      om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,     
@@ -39,11 +39,7 @@
                      FROM     
                      UFDATA_101_2021.dbo.OM_MOMain om     
                      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.cCode like CONCAT(#{code},'%')
                      ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode     
@@ -72,11 +68,7 @@
                      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.cCode like CONCAT(#{code},'%')
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
@@ -117,11 +109,7 @@
                      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.cCode like CONCAT(#{code},'%')
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode     
@@ -160,11 +148,7 @@
                      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.cCode like CONCAT(#{code},'%')
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode