1.批量禁用料,增加验证

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1075,7 +1075,7 @@ public class LiteOrderCache {
 
 
 
 
                 //禁用的物料信息
                 //禁用的物料信息
-                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList,orderNo,"");
+                List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList,orderNo,orderItem.getModel());
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
                 if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
                     for (Barcode subCode : subCodeList){
                     for (Barcode subCode : subCodeList){
                         if (disablePosNameList.contains(subCode.getPosName())) {
                         if (disablePosNameList.contains(subCode.getPosName())) {

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java

@@ -403,6 +403,8 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
 
 
     private String replaceNum;
     private String replaceNum;
 
 
+    private String model;
+
     public void setOutReelList(String reel) {
     public void setOutReelList(String reel) {
         if (outReelList == null){
         if (outReelList == null){
             outReelList = new ArrayList<>();
             outReelList = new ArrayList<>();

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/PkCheckOutController.java

@@ -209,6 +209,7 @@ public class PkCheckOutController {
                         //需要发料的卷数
                         //需要发料的卷数
                         int needReelCount = pkItem.getREQ_REEL() - pkItem.getISSUED_REEL() - pkItem.getCP_REEL() + (pkItem.getRET_QTY() > 0 ? 1 : 0);
                         int needReelCount = pkItem.getREQ_REEL() - pkItem.getISSUED_REEL() - pkItem.getCP_REEL() + (pkItem.getRET_QTY() > 0 ? 1 : 0);
                         item.setNeedReelCount(needReelCount);
                         item.setNeedReelCount(needReelCount);
+                        item.setModel(pkItem.getMODEL());
                         break;
                         break;
                     }
                     }
                 }
                 }
@@ -260,6 +261,8 @@ public class PkCheckOutController {
                 int needReelCount = pkItem.getREQ_REEL() - pkItem.getISSUED_REEL() - pkItem.getCP_REEL() + (pkItem.getRET_QTY() > 0 ? 1 : 0);
                 int needReelCount = pkItem.getREQ_REEL() - pkItem.getISSUED_REEL() - pkItem.getCP_REEL() + (pkItem.getRET_QTY() > 0 ? 1 : 0);
                 item.setNeedReelCount(needReelCount);
                 item.setNeedReelCount(needReelCount);
 
 
+                item.setModel(pkItem.getMODEL());
+
                 itemList.add(item);
                 itemList.add(item);
             }
             }
 
 

src/main/resources/config/application.yml

@@ -49,7 +49,7 @@ lizhen:
     differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
     differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
   storageC12F:
   storageC12F:
     name: storageC12F
     name: storageC12F
-    line: BG02T,BG02B,CG20B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2,BG03T1,BG03T2,BG03B1,BG03B2,BG04B,BG04T,CG03T1,CG03T2,CG03B,CG04T,CG04B,BG05T,BG05B
+    line: BG02T,BG02B,CG20B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2,BG03T1,BG03T2,BG03B1,BG03B2,BG04B,BG04T,CG03T1,CG03T2,CG03B,CG04T,CG04B,BG05T,BG05B,CG03B1,CG03B2
     url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
     url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
     differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel
     differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel