1.移库问题慢提交

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -682,7 +682,8 @@ public class StoragePosController {
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.partNumber",locale,"料件编号")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.plateSize",locale,"料盘尺寸")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.w",locale,"直径")));
-                header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.h",locale,"厚度")));
+                header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.h", locale, "厚度")));
+                header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.lock", locale, "是否锁定")));
 
                 return header;
             }
@@ -693,13 +694,17 @@ public class StoragePosController {
                 List<Map<String, Object>> list = new ArrayList<>();
                 PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
                 List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
-
+                Set<String> allLockPosIds = ReelLockPosUtil.getAllLockPosIds();
                 for (int i=0;i<StoragePosDtos.size();i++){
                     Storage storage=dataCache.getStorageById(StoragePosDtos.get(i).getStorageId());
                     if(storage!=null){
                         StoragePosDtos.get(i).setStorageName(storage.getName());
+                        if (allLockPosIds.contains(StoragePosDtos.get(i).getId())){
+                            StoragePosDtos.get(i).setLock(true);
+                        }
                     }
                 }
+
                 for (StoragePosDto pos : StoragePosDtos) {
                     List<Object> data = new ArrayList<>();
                     data.add(pos.getStorageName());
@@ -721,6 +726,7 @@ public class StoragePosController {
                     }
                     data.add(pos.getW());
                     data.add(pos.getH());
+                    data.add(pos.isLock());
                     dataList.add(data);
                 }
                 return dataList;

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -963,9 +963,9 @@ public class TaskService {
 
         //新增外侧有料,里侧没料,排除里侧的库位信息
         List<StoragePos> allUsePosList = new ArrayList<>();
-        List<Map<String, StoragePos>> allUsedPosMapList = dataCache.getAllUsedPosMap();
-        for (Map<String, StoragePos> map : allUsedPosMapList) {
-            for (StoragePos pos : map.values()) {
+        for (Storage storage : availbleStorageList) {
+            Map<String, StoragePos> usedPosList = dataCache.getUsedPosList(storage.getCid());
+            for (StoragePos pos : usedPosList.values()) {
                 allUsePosList.add(pos);
             }
         }
@@ -975,18 +975,17 @@ public class TaskService {
                 boolean hasEndBPos = false;
                 String posName_B = posName.substring(0, posName.length() - 1) + "B";
                 for (StoragePos usePos : allUsePosList) {
-                    if (usePos.getPosName().equals(posName_B)){
+                    if (posName_B.equals(usePos.getPosName())) {
                         hasEndBPos = true;
                         break;
                     }
                 }
-                if (!hasEndBPos){
+                if (!hasEndBPos) {
                     needExcludePosName.add(posName_B);
                 }
             }
         }
 
-
         //第一遍查找，先不查找有出库任务的料仓
         for (Storage storage : availbleStorageList) {
             if(!storage.isSmdDuo()){//DUO料仓无论是否有出库任务,都可以查找空库位

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

@@ -869,7 +869,7 @@ public class JkemController {
 
 
     public static String generateSecureTimeBasedRandom(int length) {
-        String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        String ALPHA_NUMERIC = "ZYXWVUTSRQPONMLKJIHGFEDCBA9876543210";
         // 使用纳秒级时间作为种子的一部分
         long nanoTime = System.nanoTime();
         SecureRandom random = new SecureRandom();

src/main/resources/messages.properties

@@ -408,3 +408,4 @@ 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
+smfcore.storagePos.lock=\u662F\u5426\u9501\u5B9A
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -397,4 +397,5 @@ 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}]
-smf.barcode.msd.noMsdvalidate=This material is not MSD-controlled and cannot be stored in this warehouse
\ No newline at end of file
+smf.barcode.msd.noMsdvalidate=This material is not MSD-controlled and cannot be stored in this warehouse
+smfcore.storagePos.lock=Whether to lock
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -393,4 +393,5 @@ 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
-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
+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
+smfcore.storagePos.lock = \u30ED\u30C3\u30AF\u3059\u308B\u304B\u3069\u3046\u304B
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -393,4 +393,5 @@ 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
\ No newline at end of file
+smf.barcode.msd.noMsdvalidate=\u8BE5\u7269\u6599\u4E0D\u9700\u8981MSD\u7BA1\u63A7\u4E0D\u80FD\u5728\u672C\u6599\u4ED3\u5165\u5E93
+smfcore.storagePos.lock=\u662F\u5426\u9501\u5B9A
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -393,4 +393,5 @@ 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
-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
+smf.barcode.msd.noMsdvalidate=\u8A72\u7269\u6599\u4E0D\u9700\u8981MSD\u7BA1\u63A7\uFF0C\u4E0D\u80FD\u5728\u672C\u6599\u5009\u5165\u5EAB
+smfcore.storagePos.lock = \u662F\u5426\u9396\u5B9A
\ No newline at end of file