1.msd不卡控

src/main/java/com/neotel/smfcore/custom/Jkem21481/controller/JkemController.java

@@ -165,32 +165,31 @@ public class JkemController {
                         }
                     }
 
+                    //判断是不是要入到指定的料仓
                     List<String> newCidList = new ArrayList<>();
                     List<Storage> newStorageList = new ArrayList<>();
                     MJPartNumber mjPartNumber = partNumberManager.findByJkemPartNumber(barcode.getPartNumber());
-                    //其他仓的物料不可以入到
-                    if (mjPartNumber == null || mjPartNumber.getMsd() != 1) {
-                        for (String cid : cidList) {
-                            if (!msdCidList.contains(cid) || "XLR6A".equals(cid) || "XLR6B".equals(cid)) {
-                                newCidList.add(cid);
-                                Storage storage = dataCache.getStorage(cid);
-                                newStorageList.add(storage);
+                    if (mjPartNumber != null) {
+                        log.info(barcode.getBarcode() + "查询到的信息为:" + JSON.toJSONString(mjPartNumber));
+                        int msd = mjPartNumber.getMsd();
+                        if (msd == 1) {
+                            for (String cid : cidList) {
+                                if (msdCidList.contains(cid)) {
+                                    newCidList.add(cid);
+                                    Storage storage = dataCache.getStorage(cid);
+                                    newStorageList.add(storage);
+                                }
                             }
-                        }
-                        if (newCidList == null || newCidList.isEmpty()) {
-                            throw new ValidateException("smf.barcode.msd.noMsdvalidate", "该物料不需要MSD管控不能在本料仓入库");
-                        }
-                    } else {
-                        for (String cid : cidList) {
-                            if (msdCidList.contains(cid)) {
-                                newCidList.add(cid);
-                                Storage storage = dataCache.getStorage(cid);
-                                newStorageList.add(storage);
+                            if (newCidList == null || newCidList.isEmpty()) {
+                                throw new ValidateException("smf.barcode.msd.validate", "该物料需要MSD管控不能在本料仓入库");
                             }
+                        } else {
+                            newCidList.addAll(cidList);
+                            newStorageList.addAll(storageList);
                         }
-                        if (newCidList == null || newCidList.isEmpty()) {
-                            throw new ValidateException("smf.barcode.msd.validate", "该物料需要MSD管控不能在本料仓入库");
-                        }
+                    } else {
+                        newCidList.addAll(cidList);
+                        newStorageList.addAll(storageList);
                     }
 
                     //判断对应的尺寸,外侧的库位,是否保留5个

src/main/java/com/neotel/smfcore/custom/Jkem21481/util/StorageExportUtil.java

@@ -227,6 +227,10 @@ public class StorageExportUtil {
     public static synchronized void updateExportByTask(String export, String barcode, String feederInfo, String orderNo,String status,String partNumber) {
         log.info("工单任务修改出料口信息:"+export+"barcode为:"+barcode+",站位信息为:"+feederInfo+"工单号为:"+orderNo+",状态为:"+status);
         StorageExport storageExport = exportMap.get(export);
+        String hSerial = storageExport.getHSerial();
+        if (!orderNo.equals(hSerial)){
+            return;
+        }
         List<StorageExportOutDetail> detailList = storageExport.getDetailList();
         if (detailList == null) {
             detailList = new ArrayList<>();