物料过账调整

op-modules/op-wms/src/main/java/com/op/wms/domain/query/BatchProductionMaterialQuery.java

@@ -68,5 +68,10 @@ public class BatchProductionMaterialQuery {
      * **/
     private String userDefined10;
 
+    /**
+     * ids
+     * **/
+    private List<String> ids;
+
 
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawMaterialOutServiceImpl.java

@@ -89,14 +89,15 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
     public AjaxResult submitTransferMaterialList(OdsProcureOutOrder params) {
 
         //更新出库单及新增出库明细
-        updateOdsProcureOutOrder(params);
+        List<String> ids = updateOdsProcureOutOrder(params);
 
         //获取已完成，但没有过账的转储物料
         BatchProductionMaterialQuery query = new BatchProductionMaterialQuery();
-        query.setUserDefined3("ZC");
+        query.setUserDefined3(params.getUserDefined3());
         query.setOrderStatus("3");
         query.setActive("1");
         query.setUserDefined10("1");
+        query.setIds(ids);
         List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.getBatchProductionMaterialList(query);
 
         if (orderList.isEmpty()){
@@ -125,7 +126,7 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
     @DS("#header.poolName")
     public AjaxResult submitReverseMaterialList(OdsProcureOutOrder params) {
         //更新出库单及新增出库明细
-        updateOdsProcureOutOrder(params);
+        List<String> ids = updateOdsProcureOutOrder(params);
 
         //获取已完成，但没有过账的反冲物料
         BatchProductionMaterialQuery query = new BatchProductionMaterialQuery();
@@ -133,6 +134,7 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
         query.setOrderStatus("3");
         query.setActive("1");
         query.setUserDefined10("1");
+        query.setIds(ids);
         List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.getBatchProductionMaterialList(query);
         if (orderList.isEmpty()){
             return AjaxResult.success();
@@ -155,11 +157,14 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
     }
 
     //更新出库单及出库明细
-    private void updateOdsProcureOutOrder(OdsProcureOutOrder params) {
+    private List<String> updateOdsProcureOutOrder(OdsProcureOutOrder params) {
         List<OdsProcureOutOrder> orderList = params.getOrderList();
 
+        List<String> ids = new ArrayList<>();
+
         //遍历列表
         for (OdsProcureOutOrder order : orderList) {
+            ids.add(order.getID());
             //计划数量
             BigDecimal planQty = order.getPlanNumber();
             //已出数量
@@ -206,6 +211,7 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
             order.setUserDefined2(null);
             odsProcureOutOrderMapper.insertWmsRawMissionOut(order);
         }
+        return ids;
     }
 
     //过账信息处理

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -1017,6 +1017,7 @@
 			<if test="enterpriseId != null  and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if>
 			<if test="enterpriseCode != null  and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
 		</where>
+		order by Material_Code
 	</select>
 
 	<insert id="insertWmsOdsProcureOutOrder" parameterType="OdsProcureOutOrder">
@@ -2233,8 +2234,14 @@
 			<if test="userDefined3 != null  and userDefined3 != ''"> and User_Defined3 = #{userDefined3} </if>
 			<if test="userDefined6 != null  and userDefined6 != ''"> and User_Defined6 = #{userDefined6} </if>
 			<if test="userDefined10 != null  and userDefined10 != ''"> and User_Defined10 = #{userDefined10} </if>
+			<if test="ids != null">
+				and id in
+				<foreach collection="ids" item="id" open="(" separator="," close=")">
+					#{id}
+				</foreach>
+			</if>
 		</where>
-		ORDER BY userDefined10, userDefined6, userDefined2
+		ORDER BY userDefined10, Material_Code
 	</select>
 
 	<update id="batchUpdateWmsOdsProcureOutOrder" parameterType="com.op.wms.domain.OdsProcureOutOrder">