订单数据，成本分配

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

@@ -39,7 +39,7 @@
 		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.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and (oti.cInvCCode != '0499' or oti.cInvName like '%棉%') and oti.cInvCCode != '0299'
+		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499' and oti.cInvCCode != '0299'
 		GROUP BY oti.cInvName
 		) tab
 		left join
@@ -54,7 +54,7 @@
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		 and om.cPOID like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and (i.cInvCCode != '0499' or i.cInvName like '%棉%') and i.cInvCCode != '0299'
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499' and i.cInvCCode != '0299'
 		 and rs.cBatch like CONCAT(#{code},'%')
 		GROUP BY i.cInvName
 		)tab1

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

@@ -118,7 +118,7 @@
 
 		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 '05%' or oti.cInvCcode like '06%'
-		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' and oti.cInvName not like '%棉%')
+		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' )
 		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1,
 		(
@@ -150,7 +150,7 @@
 
 		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 '05%' or oti.cInvCcode like '06%'
-		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' and oti.cInvName not like '%棉%')
+		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499')
 		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1,
 		(
@@ -184,7 +184,7 @@
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		and om.cPOID 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' and i.cInvName not like '%棉%' or i.cInvCCode = '0299')
+		or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
 		GROUP BY i.cInvName
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join
@@ -199,7 +199,7 @@
 		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 (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
-		or i.cInvCCode = '0399' or i.cInvCCode = '0499' and i.cInvName not like '%棉%' or i.cInvCCode = '0299') and rs.cBatch LIKE CONCAT(#{code},'%')
+		or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299') and rs.cBatch LIKE CONCAT(#{code},'%')
 		GROUP BY i.cInvName
 		)tab2 on tab2.cInvName=tab.goodsName
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SySOAndOMController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -147,6 +148,8 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
         for (SySOAndOM sy:sySOAndOM) {
             SyOrderDataItem syOrderDataItem = sySOAndOMService.queryOrderItemByCode(sy);
             SyOrderDataVO ordervo = sySOAndOMService.queryOM(sy);
+            syOrderDataItem.setQuantity(new BigDecimal(sy.getQuantity()));
+            syOrderDataItem.setSurplusNum(new BigDecimal(sy.getQuantity()));
             syOrderDataItem.setOmpoAccount(ordervo.getOmpoAccount());
             syOrderDataItem.setOmpoCode(ordervo.getOmpoCode());
             syOrderDataItem.setOmpoId(ordervo.getOmpoId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SySOAndOMMapper.xml

@@ -18,7 +18,7 @@
             left join UFDATA_101_2021.dbo.OM_MOMain om on om.MOID =od.MOID
             join UFDATA_101_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber}
-            order BY c.cInvName,sd.cFree1
+            order BY od.iVouchRowNo
         </if>
         <if test="sy.account =='102'">
             select
@@ -28,7 +28,7 @@
             join UFDATA_102_2021.dbo.SO_SODetails sd on sm.id=sd.id
             join UFDATA_102_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber}
-            order BY c.cInvName,sd.cFree1
+            order BY sd.iRowNo
         </if>
         <if test="sy.account =='103'">
             select t.* from(
@@ -57,7 +57,7 @@
             left join UFDATA_103_2021.dbo.OM_MOMain om on om.MOID =od.MOID
             join UFDATA_103_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber} and c.cInvCcode not like '19%'
-            ) t
+            ) t order by t.iVouchRowNo
         </if>
     </select>