Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

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

@@ -61,7 +61,7 @@
 									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') 
-				GROUP BY i.cInvName,rs.cBatch
+				GROUP BY i.cInvName--,rs.cBatch
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join 
 		(
@@ -76,7 +76,7 @@
 									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') 
-				GROUP BY i.cInvName,rs.cBatch
+				GROUP BY i.cInvName--,rs.cBatch
 		)tab2 on tab2.cInvName=tab.goodsName
 
 		union all
@@ -142,7 +142,7 @@
 									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')
-				GROUP BY i.cInvName,rs.cBatch
+				GROUP BY i.cInvName--,rs.cBatch
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join
 		(
@@ -157,7 +157,7 @@
 									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')
-				GROUP BY i.cInvName,rs.cBatch
+				GROUP BY i.cInvName--,rs.cBatch
 		)tab2 on tab2.cInvName=tab.goodsName
 	</select>
 
@@ -205,16 +205,19 @@
 		) tab
 		join
 		(
-				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,(
-						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
-						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
-				) as ccode
+				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,max(om.cCode) as 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
+-- 						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+-- 									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
+-- 				) 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
 				where (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
 						or i.cInvCCode = '0399' or i.cInvCCode = '0499')
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
@@ -234,7 +237,7 @@
 						or i.cInvCCode = '0399' or i.cInvCCode = '0499')
 				GROUP BY i.cInvName,rs.cBatch
 		)tab2 on tab2.cInvName=tab1.cInvName and tab1.cBatch=tab2.cBatch
-		 where tab1.tab2.jian-isnull(tab1.purchaseQuantity,0)>0
+		 where tab2.jian-isnull(tab1.purchaseQuantity,0)>0
 
 		 union all
 
@@ -263,16 +266,19 @@
 		) tab
 		join
 		(
-				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,(
-						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
-						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
-									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
-				) as ccode
+				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity,rs.cBatch,max(om.cCode) as 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
+-- 						WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+-- 									and omi.cInvCcode like '19%' and od.csocode=rs.iordercode
+-- 				) 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
 				where (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
 						or i.cInvCCode = '0399' or i.cInvCCode = '0499')
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
@@ -292,7 +298,7 @@
 						or i.cInvCCode = '0399' or i.cInvCCode = '0499')
 				GROUP BY i.cInvName,rs.cBatch
 		)tab2 on tab2.cInvName=tab1.cInvName and tab1.cBatch=tab2.cBatch
-		 where tab1.tab2.jian-isnull(tab1.purchaseQuantity,0)>0
+		 where tab2.jian-isnull(tab1.purchaseQuantity,0)>0
     </select>
 
 	<select id="queryRemainingByIngredient" resultType="org.jeecg.modules.cost.entity.SyRemaining">