一键导入功能修改

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -142,7 +142,7 @@ public class MessageUtils {
 //                log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]对应语言[" + lanType + "]");
                 return msg.getMsg();
             }
-            log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]");
+            //log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]");
         }
         return defaultMsg;
     }

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -176,7 +176,7 @@ public class LiteOrderCache {
                     String result = checkOutLiteOrder(order.getOrderNo(), false);
                     if (!ObjectUtil.isEmpty(result)) {
                         String msg = MessageUtils.getText(result, MessageUtils.getDefaultLocal(), "");
-                        log.info("自动执行工单 【" + order.getOrderNo() + "】 失败：" + msg);
+                        //log.info("自动执行工单 【" + order.getOrderNo() + "】 失败：" + msg);
                     } else {
                         log.info("自动执行工单 【" + order.getOrderNo() + "】 成功");
                         break;

src/main/java/com/neotel/smfcore/custom/lizhen/report/inner/InnerReportController.java

@@ -197,8 +197,8 @@ public class InnerReportController {
             }
         } else {
             resultMap.put(F2, F2);
-            resultMap.put(F3, F3);
-            resultMap.put(F5, F5);
+            //resultMap.put(F3, F3);
+            //resultMap.put(F5, F5);
         }
         return ResultBean.newOkResult(resultMap);
     }
@@ -209,17 +209,13 @@ public class InnerReportController {
     public ResultBean linePullDown(String floor) {
         //得到每一个楼层的线体
         String f2Line = dataCache.getCache("F2Line").toString();
-        String f3Line = dataCache.getCache("F3Line").toString();
-        String f5Line = dataCache.getCache("F5Line").toString();
+        //String f3Line = dataCache.getCache("F3Line").toString();
+        //String f5Line = dataCache.getCache("F5Line").toString();
         String resultLine = "";
         if (F2.equals(floor)) {
             resultLine = f2Line;
-        } else if (F3.equals(floor)) {
-            resultLine = f3Line;
-        } else if (F5.equals(floor)) {
-            resultLine = f5Line;
         }  else {
-            resultLine = f2Line + "," + f3Line + "," + f5Line;
+            resultLine = f2Line;
         }
         Map<String, String> resultMap = new LinkedHashMap<>();
         for (String line : resultLine.split(",")) {

src/main/resources/config/application.yml

@@ -3,57 +3,51 @@ server:
 
 api:
   name: Lizhen
-  inCheckUrl: #http://172.30.170.148:8001/Npm/WmsCheckReelfob #禁用料
-  batchCheckUrl: #http://172.30.60.117:8001/Npm/WmsCheckReelfob_Batch #批量禁用料
-  outNotifyUrl: #http://172.30.170.148:8082/SmtAutoWH/Save2DReelInfo #保存物料(外仓配置)
-  outNotifyUrlPK: #http://172.30.170.148:8001/Sct/SaveReelInfo #PK发料保存(外仓配置)
-  inNotifyUrl: #http://172.30.170.148:8082/SmtAutoWH/Save2DReelInfo #保存物料(内仓配置)
-  fetchOrderUrl: #http://172.30.170.148:8082/SmtAutoWH/GetWoPickingList #获取工单
-  barcodeInfoUrl: #http://172.30.170.148:8001/Sct/GetReelInfo #mes数量
-  fetchGRUrl:  #http://10.42.25.199:8082/api/wcs/fetchGR #gr标签
-  brandQtyUrl: #http://172.30.170.199:8082/api/wcs/brandQty #gr标签满卷数
-  importUrl: #http://172.30.150.83:8001/smf-core/ext/forward/getDataLogs #内仓导入外仓picking虚拟仓数据
-  checkReelMeasure: #http://172.30.60.117:8001/Sct/CheckReelMeasure #外仓散料仓量测接口
-  getInDateUrl: http://172.30.170.199:8082/api/Mes/GetInDate
-  plant: W337
-  werks: W337
-  outerFactory: B15
+  inCheckUrl:
+  batchCheckUrl:
+  outNotifyUrl:
+  outNotifyUrlPK:
+  inNotifyUrl:
+  fetchOrderUrl:
+  barcodeInfoUrl:
+  fetchGRUrl:
+  brandQtyUrl:
+  importUrl: http://10.68.27.83/smf-core/ext/getDatalogs #虚拟仓从1F导入数据接口
+  checkReelMeasure:
+  getInDateUrl:
+  plant:
+  werks:
+  outerFactory:
 
 #缺料预警对应的地址
 lizhen:
   F2:
-    name: 2F
-    line: A05-2FSMT-16S,A05-2FSMT-17S,A05-2FSMT-06S,A05-2FSMT-07S
-    url: http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
+    name: 1F
+    line: C03-1FSMT-01,C03-1FSMT-11,C03-1FSMT-02,C03-1FSMT-12
+    url: http://127.0.0.1/smf-core/api/Mes/machineCallMaterial
   F3:
-    name: 3F
-    line: A05-3FSMT-04S,A05-3FSMT-14S,A05-3FSMT-15S,A05-3FSMT-05S
-    url: http://172.30.97.99:8001/smf-core/api/Mes/machineCallMaterial
+    name:
+    line:
+    url:
   F5:
-    name: 5F
-    line: A05-5FSMT-13S,A05-5FSMT-03S,A05-5FSMT-02S,A05-5FSMT-12S,A05-5FSMT-01S,A05-5FSMT-11S #,A05-5FARF-06
-    url: http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial
+    name:
+    line:
+    url:
 
 #转发地址
 forward:
   f2:
-    name: 2F
-    url: http://172.30.88.19:8001/smf-core
+    name:
+    url:
   f3:
-    name: 3F
-    url: http://172.30.97.99:8001/smf-core
+    name:
+    url:
   f5:
-    name: 5F
-    url: http://172.30.97.63:8001/smf-core
+    name:
+    url:
   b15:
-    name: B15
-    url: http://10.42.176.209:8001/smf-core
-    #url: http://10.42.23.23:8001/smf-core
-
-
-
-
-
+    name:
+    url:
 
 
 
@@ -90,5 +84,5 @@ app:
   type: ""
 
 menu:
-  show: #expiredMaintenance
+  show: imDetailsReport,feeding,virWarehous
   hide:
\ No newline at end of file