库位搜索页面去除SOxxx的前缀

src/main/java/com/neotel/smfcore/core/device/enums/BOX_STATUS.java

@@ -104,4 +104,9 @@ public class BOX_STATUS {
      * 22 搅拌完成放回原来的仓中
      * 22 搅拌完成放回原来的仓中
      */
      */
     public final static int MIX_END = 22;
     public final static int MIX_END = 22;
+
+    /**
+     * 23出库失败(放到料仓门口后,未检测到有料盘)
+     */
+    public final static  int OUT_FAILED = 23;
 }
 }

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java

@@ -120,6 +120,15 @@ public class NLPShelfHandler extends BaseDeviceHandler{
         }
         }
 
 
 
 
+        StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
+        if (pos != null) {
+            throw new ValidateException("smfcore.materialBox.inPos", "物料已在库位{0}中", new String[]{pos.getPosName()});
+        }
+
+        if (barcode.getAmount() <= 0) {
+            throw new ValidateException("smfcore.error.barcode.wrongQty", "条码[{0}]对应的数量<=0为: {1}" , new String[]{barcode.getBarcode(), barcode.getAmount() + ""});
+        }
+
         Date expireDate = barcode.getExpireDate();
         Date expireDate = barcode.getExpireDate();
         if (expireDate != null) {
         if (expireDate != null) {
             if (System.currentTimeMillis() > expireDate.getTime()) {
             if (System.currentTimeMillis() > expireDate.getTime()) {

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -291,13 +291,12 @@ public class BoxKanbanController {
 
 
        List<String> allhasReelPosErrorList=new ArrayList<>();
        List<String> allhasReelPosErrorList=new ArrayList<>();
         List<String>  allnoReelPosErrorList = new ArrayList<>();
         List<String>  allnoReelPosErrorList = new ArrayList<>();
-        for (String cid :
-                cids) {
+        for (String cid : cids) {
             List<List<String>> objects = DevicesStatusUtil.getDeviceData(cid);
             List<List<String>> objects = DevicesStatusUtil.getDeviceData(cid);
-//            List<String> hasReelPosErrorList =new ArrayList<>();
-//            List<String> noReelPosErrorList =new ArrayList<>();
-            List<String> hasReelPosErrorList =Arrays.asList(new String[]{"4D1112AA0014","4D0603BB0012","4D0303AA0015"});
-            List<String> noReelPosErrorList =Arrays.asList(new String[]{"4D0601AA0002","4D0601BB0001","4D0601BB0003"});
+            List<String> hasReelPosErrorList =new ArrayList<>();
+            List<String> noReelPosErrorList =new ArrayList<>();
+           // List<String> hasReelPosErrorList =Arrays.asList(new String[]{"4D1112AA0014","4D0603BB0012","4D0303AA0015"});
+           // List<String> noReelPosErrorList =Arrays.asList(new String[]{"4D0601AA0002","4D0601BB0001","4D0601BB0003"});
             if(objects!=null&&objects.size()==2){
             if(objects!=null&&objects.size()==2){
                 hasReelPosErrorList = objects.get(0);
                 hasReelPosErrorList = objects.get(0);
                  noReelPosErrorList = objects.get(1);
                  noReelPosErrorList = objects.get(1);

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

@@ -91,6 +91,13 @@ public class StoragePosController {
         if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
         if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
             criteria.setStorageIdList(null);
             criteria.setStorageIdList(null);
         }
         }
+        String blurry = criteria.getBlurry();
+        if(!Strings.isNullOrEmpty(blurry)){
+            //去除库位中的SOxxxx
+            blurry = blurry.substring(blurry.indexOf("-")+1);
+            criteria.setBlurry(blurry);
+        }
+
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
         PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
         List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
         List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());

src/main/java/com/neotel/smfcore/custom/siemens/SiemensApi.java

@@ -177,8 +177,8 @@ public class SiemensApi extends BaseSmfApiListener {
             }
             }
             throw new ValidateException("siemens.barcode.failed","SIEMENS验证条码["+codeStr+"]失败");
             throw new ValidateException("siemens.barcode.failed","SIEMENS验证条码["+codeStr+"]失败");
         } catch (Exception ex) {
         } catch (Exception ex) {
-            log.info("siemensCheckCode 验证条码 [" + codeStr + "] 出错：", ex);
-            throw new ValidateException("siemens.barcode.error","SIEMENS条码验证出错:" + ex.getMessage());
+            log.info("siemensCheckCode 验证条码 [" + codeStr + "] 出错："+ ex.getMessage());
+            throw new ValidateException("siemens.barcode.error", ex.getMessage());
         }
         }
     }
     }
 
 

src/main/resources/config/application-dev.yml

-#配置数据源
-spring:
-  data:
-      mongodb:
-        host: localhost  # 主机地址
-        port: 27017           # 端口
-        database: smf        # 数据库
 
 
 # 登录相关配置
 # 登录相关配置
 login:
 login:

src/main/resources/config/application-prod.yml

@@ -7,6 +7,14 @@ login:
   #  是否限制单用户登录
   #  是否限制单用户登录
   single-login: false
   single-login: false
 
 
+#配置数据源
+spring:
+  data:
+    mongodb:
+      host: localhost  # 主机地址
+      port: 27017           # 端口
+      database: smf        # 数据库
+
 #jwt
 #jwt
 jwt:
 jwt:
   header: Authorization
   header: Authorization

src/main/resources/config/application.yml

@@ -2,11 +2,10 @@ server:
   port: 8800
   port: 8800
 
 
 api:
 api:
-  #name: DaLu
-  #inCheckUrl: DaLu
-  #outNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/OutBox
-  #inNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/InBox
-
+  name: Siemens
+  inCheckUrl: http://cnctu04053:8014/api/JsonC
+  outNotifyUrl: http://cnctu04053:8014/api/JsonC
+  inNotifyUrl: http://cnctu04053:8014/api/JsonC
 
 
 
 
 # 文件存储路径
 # 文件存储路径