bug修改

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

@@ -92,14 +92,24 @@ public class StoragePosController {
         if(map.containsKey("cid")){
         if(map.containsKey("cid")){
             cid= map.get("cid");
             cid= map.get("cid");
         }
         }
-        log.info("开始清理料仓["+cid+"] 所有位置");
         Storage storage=dataCache.getStorage(cid);
         Storage storage=dataCache.getStorage(cid);
         if(storage==null){
         if(storage==null){
             throw new ValidateException("smfcode.valueNotFind","未找到{0}[{1}]" ,new String[]{"cid", cid});
             throw new ValidateException("smfcode.valueNotFind","未找到{0}[{1}]" ,new String[]{"cid", cid});
-//            throw new ValidateException("未找到料仓："+cid);
         }
         }
+        List<StoragePos> allPos=storagePosManager.findByStorage(storage.getId());
+        for (StoragePos storagePos:allPos
+        ) {
+            if (storagePos != null) {
+                Barcode barcode = storagePos.getBarcode();
+                if (barcode != null) {
+                    throw new ValidateException("smfcode.cannotRemove", "删除库位失败，库位[{0}]中有料", new String[]{storagePos.getPosName()});
+                }
+            }
+        }
+
+        log.info("开始删除料仓["+cid+"] 所有位置");
         storagePosManager.removePosByStorageId(storage.getId());
         storagePosManager.removePosByStorageId(storage.getId());
-        log.info("清理料仓["+cid+"] 所有位置完成");
+        log.info("删除料仓["+cid+"] 所有位置完成");
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -133,7 +133,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
     @Override
     @Override
     public void messageReceived(IoSession session, Object message) throws Exception {
     public void messageReceived(IoSession session, Object message) throws Exception {
         String msg = message.toString();
         String msg = message.toString();
-        msg.replace("\u0002","");
+        msg= msg.replace("\u0002","");
         log.info("Received Tcp Server msg:" + msg);
         log.info("Received Tcp Server msg:" + msg);
         String[] resposArr = msg.split(";");
         String[] resposArr = msg.split(";");
         String cmd = resposArr[0];
         String cmd = resposArr[0];

src/main/resources/messages.properties

@@ -84,6 +84,7 @@ smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.error=\u51FA\u9519{0}
 smfcore.error=\u51FA\u9519{0}
 smfcore.userManager=\u7528\u6237\u7BA1\u7406
 smfcore.userManager=\u7528\u6237\u7BA1\u7406
+smfcode.cannotRemove=\u5220\u9664\u5E93\u4F4D\u5931\u8D25\uFF0C\u5E93\u4F4D[{0}]\u4E2D\u6709\u6599
 
 
 
 
 
 

src/main/resources/messages_en_US.properties

@@ -83,4 +83,5 @@ smfcode.error.barcode.exist=[{0}}] is already in {1}}[{2}}]
 smfcore.barcodeSetting=Barcode setting
 smfcore.barcodeSetting=Barcode setting
 smfcore.posNotExist=Positions do not exist
 smfcore.posNotExist=Positions do not exist
 smfcore.error=Error{0}
 smfcore.error=Error{0}
-smfcore.userManager=User Management
\ No newline at end of file
+smfcore.userManager=User Management
+smfcode.cannotRemove=Failed to delete the location, there is material in the location [{0}].
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -83,4 +83,5 @@ smfcode.error.barcode.exist=[0}}]\u306F\u3059\u3067\u306B{1}[{2}}\u306B\u5165\u3
 smfcore.barcodeSetting=\u30D0\u30FC\u30B3\u30FC\u30C9\u8A2D\u5B9A
 smfcore.barcodeSetting=\u30D0\u30FC\u30B3\u30FC\u30C9\u8A2D\u5B9A
 smfcore.posNotExist=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B9\u30DA\u30FC\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcore.posNotExist=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B9\u30DA\u30FC\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcore.error=\u8AA4\u308A{0}
 smfcore.error=\u8AA4\u308A{0}
-smfcore.userManager=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
\ No newline at end of file
+smfcore.userManager=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
+smfcode.cannotRemove=\u30B9\u30C8\u30C3\u30AF\u30EC\u30D9\u30EB\u306E\u524A\u9664\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u30B9\u30C8\u30C3\u30AF\u30EC\u30D9\u30EB[{0}]\u306B\u6750\u6599\u304C\u3042\u308A\u307E\u3059\u3002
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -84,4 +84,5 @@ smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.error=\u51FA\u9519{0}
 smfcore.error=\u51FA\u9519{0}
 smfcore.userManager=\u7528\u6237\u7BA1\u7406
 smfcore.userManager=\u7528\u6237\u7BA1\u7406
+smfcode.cannotRemove=\u5220\u9664\u5E93\u4F4D\u5931\u8D25\uFF0C\u5E93\u4F4D[{0}]\u4E2D\u6709\u6599
 
 

src/main/resources/messages_zh_TW.properties

@@ -83,4 +83,5 @@ smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcore.barcodeSetting=\u689D\u78BC\u8A2D\u7F6E
 smfcore.barcodeSetting=\u689D\u78BC\u8A2D\u7F6E
 smfcore.posNotExist=\u5EAB\u4F4D\u4E0D\u5B58\u5728
 smfcore.posNotExist=\u5EAB\u4F4D\u4E0D\u5B58\u5728
 smfcore.error=\u51FA\u932F{0}
 smfcore.error=\u51FA\u932F{0}
-smfcore.userManager=\u7528\u6236\u7BA1\u7406
\ No newline at end of file
+smfcore.userManager=\u7528\u6236\u7BA1\u7406
+smfcode.cannotRemove=\u522A\u9664\u5EAB\u4F4D\u5931\u6557\uFF0C\u5EAB\u4F4D[{0}]\u4E2D\u6709\u6599
\ No newline at end of file