1.配置文件增加线体

2.bug,功能优化提交

src/main/java/com/neotel/smfcore/custom/luxsan/common/util/RequestURLUtil.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.luxsan.common.util;
 
 
 import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.custom.luxsan.common.json.IJsonRule;
 import com.neotel.smfcore.custom.luxsan.common.json.IJsonRule;
+import com.neotel.smfcore.custom.luxsan.common.json.impl.DataResultJsonRule;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContext;
@@ -19,7 +20,7 @@ public class RequestURLUtil<T> {
 
 
 
 
     public static List request(String type, Object request, String httpMethod, String url, Class<?> returnType) throws ApiException {
     public static List request(String type, Object request, String httpMethod, String url, Class<?> returnType) throws ApiException {
-        IJsonRule iJsonRule = iJsonRuleMap.get(type);
+        IJsonRule iJsonRule = new DataResultJsonRule();
         List res = iJsonRule.request(request, httpMethod, url, returnType);
         List res = iJsonRule.request(request, httpMethod, url, returnType);
         return res;
         return res;
     }
     }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -772,9 +772,9 @@ public class CDeviceController {
                 }
                 }
             }
             }
         }
         }
-        if (count < 4) {
+        if (count < 2) {
             try {
             try {
-                log.info("AGV上的料箱数量小于4,呼叫一个空料箱出来");
+                log.info("AGV上的料箱数量小于2,呼叫一个空料箱出来");
                 String materialSize = MaterialUtil.getMaterialSize(stackerId);
                 String materialSize = MaterialUtil.getMaterialSize(stackerId);
                 BoxHandleUtil.callEmptyBox(materialSize, TaskCurrentLoc.In_FeedingInlet, stackerBarcode.getWarehouseCode(), new ArrayList<>());
                 BoxHandleUtil.callEmptyBox(materialSize, TaskCurrentLoc.In_FeedingInlet, stackerBarcode.getWarehouseCode(), new ArrayList<>());
             } catch (Exception e) {
             } catch (Exception e) {

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java

@@ -86,12 +86,21 @@ public class CtuDeviceController {
         allTasks = allTasks.stream().sorted(Comparator.comparing(DataLog::getCreateDate)).collect(Collectors.toList());
         allTasks = allTasks.stream().sorted(Comparator.comparing(DataLog::getCreateDate)).collect(Collectors.toList());
         List<CtuTask> shelfToLineTaskList = new ArrayList<>();
         List<CtuTask> shelfToLineTaskList = new ArrayList<>();
         for (DataLog dataLog : allTasks) {
         for (DataLog dataLog : allTasks) {
-            if (shelfToLineTaskList != null && shelfToLineTaskList.size() >= 6) {
-                break;
-            }
             if (dataLog.isCheckOutTask()) {
             if (dataLog.isCheckOutTask()) {
                 if (dataLog.isWait() || dataLog.isExecuting()) {
                 if (dataLog.isWait() || dataLog.isExecuting()) {
 
 
+                    //当大于6个时候,判断目的地是否为出料口
+                    if (shelfToLineTaskList != null && shelfToLineTaskList.size() >= 6) {
+                        if (TaskCurrentLoc.In1_FeedingInlet.equals(dataLog.getLoc())
+                                || TaskCurrentLoc.In2_FeedingInlet.equals(dataLog.getLoc())
+                                || TaskCurrentLoc.In_FeedingInlet.equals(dataLog.getLoc())) {
+
+                        } else {
+                            continue;
+                        }
+                    }
+
+
                     String storageId = dataLog.getStorageId();
                     String storageId = dataLog.getStorageId();
                     Storage storage = dataCache.getStorageById(storageId);
                     Storage storage = dataCache.getStorageById(storageId);
                     if (storage != null && !storage.isVirtual()) {
                     if (storage != null && !storage.isVirtual()) {

src/main/resources/config/application.yml

@@ -32,7 +32,7 @@ lizhen:
     url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
     url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
   F3:
   F3:
     name: 3F
     name: 3F
-    line:
+    line: C02-3FSMT-03,C02-3FSMT-04,C02-3FSMT-05,C02-3FSMT-06,C02-3FSMT-07,C02-3FSMT-13,C02-3FSMT-14,C02-3FSMT-15,C02-3FSMT-16,C02-3FSMT-17
     url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
     url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
   F5:
   F5:
     name: #5F
     name: #5F
@@ -82,7 +82,7 @@ spring:
     check-template-location: false
     check-template-location: false
   profiles:
   profiles:
     active: 'prod'
     active: 'prod'
-    include: 21088test
+    include: 21088prod
   jackson:
   jackson:
     time-zone: GMT+8
     time-zone: GMT+8
   data:
   data:
@@ -105,5 +105,5 @@ app:
   type: ""
   type: ""
 
 
 menu:
 menu:
-  show: manualGrStorageVirtual
+  show:
   hide:
   hide: