Merge branch 'SO1070-smf-core' of http://106.15.194.121:8083/sunke/smf-core into SO1070-smf-core

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -45,10 +45,10 @@ public class DataInitManager {
     MainTimer mainTimer;
 
     //@Value("${menu.show}")
-    private String[] menuShowList = new String[]{/*"commonIn","returnIn","cutIn"*/};
+    private String[] menuShowList = new String[]{"commonIn","returnIn","cutIn"};
 
     //@Value("${menu.hide}")
-    private String[] menuHideList = new String[]{};
+    private String[] menuHideList = new String[]{"singleDiskWarehousing"};
 
     @Autowired
     PermissionInitUtil annotationUtil;

src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java

@@ -220,6 +220,21 @@ public class SingleInController {
                 }
             }
 
+            //所有入库都先验证唯一码校验接口
+            ResponseParam param = HikApi.riCheckApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(), "", "", inType);
+
+            if (ObjectUtil.isNotEmpty(param)) {
+                if (param.getCode().equals(HikApi.CODE_OK)) {
+                    //唯一码验证成功
+                    log.info("唯一码[" + barcode.getBarcode() + "]验证成功");
+
+                } else {
+                    log.info("唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage());
+                    throw new ValidateException("smfcore.riCheckApi.error", "唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage() + ""
+                            , new String[]{param.getCode().toString(), param.getMessage()});
+                }
+            }
+
             //线边间转储入库和退料入库需要获取数量
             boolean needGetQty = false;
             //01 退料 02 线边仓间入库
@@ -251,7 +266,7 @@ public class SingleInController {
                 int num = HikApi.returnMaterialApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(),businessType,businessNo);
                 if (num > 0) {
                     barcode.setAmount(num);
-                    barcodeManager.saveBarcode(barcode);
+                    //barcodeManager.saveBarcode(barcode);
                     log.info("入库二维码 " + barcode.getBarcode() + " 从接口获得新数量：" + num + "，并更新");
                 } else {
                     throw new ValidateException("smfcore.returnMaterialApi.error", "入库：[" + barcode.getBarcode() + "]获取数量失败");
@@ -265,20 +280,20 @@ public class SingleInController {
                 }
 
             } else {
-                //唯一码校验接口
-                ResponseParam param = HikApi.riCheckApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(), "", "", inType);
-
-                if (ObjectUtil.isNotEmpty(param)) {
-                    if (param.getCode().equals(HikApi.CODE_OK)) {
-                        //唯一码验证成功
-                        log.info("唯一码[" + barcode.getBarcode() + "]验证成功");
-
-                    } else {
-                        log.info("唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage());
-                        throw new ValidateException("smfcore.riCheckApi.error", "唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage() + ""
-                                , new String[]{param.getCode().toString(), param.getMessage()});
-                    }
-                }
+//                //唯一码校验接口
+//                ResponseParam param = HikApi.riCheckApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(), "", "", inType);
+//
+//                if (ObjectUtil.isNotEmpty(param)) {
+//                    if (param.getCode().equals(HikApi.CODE_OK)) {
+//                        //唯一码验证成功
+//                        log.info("唯一码[" + barcode.getBarcode() + "]验证成功");
+//
+//                    } else {
+//                        log.info("唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage());
+//                        throw new ValidateException("smfcore.riCheckApi.error", "唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage() + ""
+//                                , new String[]{param.getCode().toString(), param.getMessage()});
+//                    }
+//                }
             }
 
             String pn = barcode.getPartNumber();
@@ -305,6 +320,7 @@ public class SingleInController {
                 barcode.setPutInTime(System.currentTimeMillis());
                 barcode.updateSluggishDate(dataCache.getPNsluggishDay(barcode.getPartNumber()));
                 barcodeManager.saveBarcode(barcode);
+                log.info("入库二维码 " + barcode.getBarcode() + " 保存入库相关信息");
 
                 dataLog.setNum(barcode.getAmount());
                 dataLog.setStatus(OP_STATUS.WAIT.name());

src/main/java/com/neotel/smfcore/hikvision/HikApi.java

@@ -497,11 +497,23 @@ public class HikApi {
         dataMap.put("baseCode", baseCode);//基地
         dataMap.put("lgort", lgort);//库位
         String businessType = "";
+        //inType 1=普通入库，2=并盘入库，3=截料入库，4=退料入库,5=转储入库
+        //businessType 0普通入库1退料入库2并盘入库3截料入库 4 线边仓间转储入库
         if(inType == 1){
-            //0普通入库 3截料入库
+            //0普通入库
             businessType = "0";
+        }else if(inType == 2){
+            //并盘入库
+            businessType = "2";
         }else if(inType == 3){
+            //截料入库
             businessType = "3";
+        }else if(inType == 4){
+            //退料入库
+            businessType = "1";
+        }else if(inType == 5){
+            //转储入库
+            businessType = "4";
         }
         dataMap.put("businessType", businessType);//库位
 

src/main/resources/banner.txt

@@ -5,4 +5,3 @@
 | \____) | _| |_\/_| |_  _| |_
  \______.'|_____||_____||_____|
 
-:: SMF Version ::      (v1.7.819)

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

@@ -5,6 +5,8 @@ spring:
       host: 10.1.129.59  # 主机地址
       port: 27017           # 端口
       database: hikvision        # 数据库
+      minConSize: 1000
+      maxConSize: 2000
 
 
 # 登录相关配置