1.msd不为1的,不可以入到管控料仓中

2.料串获取目的地修改

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

@@ -165,32 +165,32 @@ public class JkemController {
                         }
                     }
 
-
-                    //判断是不是要入到指定的料仓
                     List<String> newCidList = new ArrayList<>();
                     List<Storage> newStorageList = new ArrayList<>();
                     MJPartNumber mjPartNumber = partNumberManager.findByJkemPartNumber(barcode.getPartNumber());
-                    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.validate", "该物料需要MSD管控不能在本料仓入库");
+                    //其他仓的物料不可以入到
+                    if (mjPartNumber == null || mjPartNumber.getMsd() != 1) {
+                        for (String cid : cidList) {
+                            if (!msdCidList.contains(cid)) {
+                                newCidList.add(cid);
+                                Storage storage = dataCache.getStorage(cid);
+                                newStorageList.add(storage);
                             }
-                        } else {
-                            newCidList.addAll(cidList);
-                            newStorageList.addAll(storageList);
+                        }
+                        if (newCidList == null || newCidList.isEmpty()) {
+                            throw new ValidateException("smf.barcode.msd.noMsdvalidate", "该物料不需要MSD管控不能在本料仓入库");
                         }
                     } else {
-                        newCidList.addAll(cidList);
-                        newStorageList.addAll(storageList);
+                        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管控不能在本料仓入库");
+                        }
                     }
 
                     //判断对应的尺寸,外侧的库位,是否保留5个
@@ -276,7 +276,9 @@ public class JkemController {
 
                             StoragePos storagePos = storagePosManager.getByPosName(posName);
                             if (storagePos != null) {
-                                if (storagePos.getBarcode() != null) {
+                                Set<String> allLockPosIds = ReelLockPosUtil.getAllLockPosIds();
+                                boolean contains = allLockPosIds.contains(storagePos.getId());
+                                if (storagePos.getBarcode() != null || contains) {
                                     log.info(posName + "有物料信息,重新查找库位,清除条码[" + barcode.getBarcode() + "]锁定库位");
                                     ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
 
@@ -290,7 +292,6 @@ public class JkemController {
                                     pos = null;
                                 }
                             }
-
                         }
                     }
 

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

@@ -126,7 +126,7 @@ public class StackerController {
             List<String> resultList = new ArrayList<>();
             for (String msdCid : msdCidList) {
                 if (StringUtils.isNotEmpty(storageCid)){
-                    if (storageCid.equals(msdCid)) {
+                    if (msdCid.startsWith(storageCid)) {
                         continue;
                     }
                 }
@@ -140,7 +140,7 @@ public class StackerController {
         List<Storage> noMsdStorageList = new ArrayList<>();
         for (Storage storage : dataCache.getAllStorage().values()) {
             if (StringUtils.isNotEmpty(storageCid)){
-                if (storageCid.equals(storage.getCid())) {
+                if (storage.getCid().startsWith(storageCid)) {
                     continue;
                 }
             }
@@ -156,7 +156,7 @@ public class StackerController {
         List<Storage> msdStorageList = new ArrayList<>();
         for (Storage storage : dataCache.getAllStorage().values()) {
             if (StringUtils.isNotEmpty(storageCid)){
-                if (storageCid.equals(storage.getCid())) {
+                if (storage.getCid().startsWith(storageCid)) {
                     continue;
                 }
             }

src/main/resources/messages.properties

@@ -407,3 +407,4 @@ smfcore.order.quantityIssued=\u51FA\u5E93\u6570\u91CF
 smfcore.order.quantityAfterIssuance=\u56DE\u5E93\u540E\u6570\u91CF
 smfcore.order.lackOfQuantity=\u7F3A\u5C11\u6570\u91CF
 smfcore.barcode.noMatchFeeder=\u51FA\u6599\u53E3feeder[{0}]\u4E0E\u5F53\u524D\u7269\u6599feeder[{1}]\u4E0D\u5339\u914D
+smf.barcode.msd.noMsdvalidate=\u8BE5\u7269\u6599\u4E0D\u9700\u8981MSD\u7BA1\u63A7\u4E0D\u80FD\u5728\u672C\u6599\u4ED3\u5165\u5E93

src/main/resources/messages_en_US.properties

@@ -396,4 +396,5 @@ smfcore.order.quantityBeforeIssuance =Pre-issuance quantity
 smfcore.order.quantityIssued =Issued quantity
 smfcore.order.quantityAfterIssuance =Remaining quantity after issuance
 smfcore.order.lackOfQuantity=Insufficient Quantity
-smfcore.barcode.noMatchFeeder=The feeder [{0}] at the outlet does not match the current material feeder [{1}]
\ No newline at end of file
+smfcore.barcode.noMatchFeeder=The feeder [{0}] at the outlet does not match the current material feeder [{1}]
+smf.barcode.msd.noMsdvalidate=This material is not MSD-controlled and cannot be stored in this warehouse
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -392,4 +392,5 @@ smfcore.order.quantityBeforeIssuance=\u51FA\u5EAB\u524D\u306E\u6570\u91CF
 smfcore.order.quantityIssued=\u51FA\u5EAB\u6570\u91CF
 smfcore.order.quantityAfterIssuance=\u51FA\u5EAB\u5F8C\u306E\u6570\u91CF
 smfcore.order.lackOfQuantity=\u6570\u91CF\u4E0D\u8DB3
-smfcore.barcode.noMatchFeeder=\u51FA\u529B\u53E3\u306E\u30D5\u30A3\u30FC\u30C0\u30FC[{0}]\u304C\u73FE\u5728\u306E\u6750\u6599\u30D5\u30A3\u30FC\u30C0\u30FC[{1}]\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
\ No newline at end of file
+smfcore.barcode.noMatchFeeder=\u51FA\u529B\u53E3\u306E\u30D5\u30A3\u30FC\u30C0\u30FC[{0}]\u304C\u73FE\u5728\u306E\u6750\u6599\u30D5\u30A3\u30FC\u30C0\u30FC[{1}]\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
+smf.barcode.msd.noMsdvalidate=\u3053\u306E\u90E8\u54C1\u306FMSD\u7BA1\u7406\u5BFE\u8C61\u5916\u306E\u305F\u3081\u3001\u3053\u306E\u5009\u5EAB\u306B\u306F\u5165\u5EAB\u3067\u304D\u307E\u305B\u3093
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -392,4 +392,5 @@ smfcore.order.quantityBeforeIssuance=\u51FA\u5E93\u524D\u6570\u91CF
 smfcore.order.quantityIssued=\u51FA\u5E93\u6570\u91CF
 smfcore.order.quantityAfterIssuance=\u56DE\u5E93\u540E\u6570\u91CF
 smfcore.order.lackOfQuantity=\u7F3A\u5C11\u6570\u91CF
-smfcore.barcode.noMatchFeeder=\u51FA\u6599\u53E3feeder[{0}]\u4E0E\u5F53\u524D\u7269\u6599feeder[{1}]\u4E0D\u5339\u914D
\ No newline at end of file
+smfcore.barcode.noMatchFeeder=\u51FA\u6599\u53E3feeder[{0}]\u4E0E\u5F53\u524D\u7269\u6599feeder[{1}]\u4E0D\u5339\u914D
+smf.barcode.msd.noMsdvalidate=\u8BE5\u7269\u6599\u4E0D\u9700\u8981MSD\u7BA1\u63A7\u4E0D\u80FD\u5728\u672C\u6599\u4ED3\u5165\u5E93
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -392,4 +392,5 @@ smfcore.order.quantityBeforeIssuance=\u51FA\u5EAB\u524D\u6578\u91CF
 smfcore.order.quantityIssued=\u51FA\u5EAB\u6578\u91CF
 smfcore.order.quantityAfterIssuance=\u56DE\u5EAB\u5F8C\u6578\u91CF
 smfcore.order.lackOfQuantity=\u7F3A\u5C11\u6578\u91CF
-smfcore.barcode.noMatchFeeder=\u51FA\u6599\u53E3feeder[{0}]\u8207\u7576\u524D\u7269\u6599feeder[{1}]\u4E0D\u5339\u914D
\ No newline at end of file
+smfcore.barcode.noMatchFeeder=\u51FA\u6599\u53E3feeder[{0}]\u8207\u7576\u524D\u7269\u6599feeder[{1}]\u4E0D\u5339\u914D
+smf.barcode.msd.noMsdvalidate=\u8A72\u7269\u6599\u4E0D\u9700\u8981MSD\u7BA1\u63A7\uFF0C\u4E0D\u80FD\u5728\u672C\u6599\u5009\u5165\u5EAB
\ No newline at end of file