1.配置中增加禁用工位信息

2.返回尺寸信息时,增加返回B/T面

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -434,7 +434,7 @@ public class InnerBoxRestController {
     public Map<String, Object> getLineByBarcode(@RequestBody Map<String,String> paramMap) {
     public Map<String, Object> getLineByBarcode(@RequestBody Map<String,String> paramMap) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         String barcode = paramMap.get("barcode");
         String barcode = paramMap.get("barcode");
-        log.info(barcode+"获取目的地信息");
+        log.info(barcode + "获取目的地信息");
         CodeBean codeBean = codeResolve.resolveSingleCode(barcode);
         CodeBean codeBean = codeResolve.resolveSingleCode(barcode);
         if (codeBean.getBarcode() != null) {
         if (codeBean.getBarcode() != null) {
             List<DataLog> allTasks = taskService.getAllTasks();
             List<DataLog> allTasks = taskService.getAllTasks();
@@ -446,6 +446,16 @@ public class InnerBoxRestController {
                     resultMap.put("height", codeBean.getBarcode().getHeight());
                     resultMap.put("height", codeBean.getBarcode().getHeight());
                     resultMap.put("plateSize", codeBean.getBarcode().getPlateSize());
                     resultMap.put("plateSize", codeBean.getBarcode().getPlateSize());
                     resultMap.put("barcode", codeBean.getBarcode().getBarcode());
                     resultMap.put("barcode", codeBean.getBarcode().getBarcode());
+
+                    //判断料盘放到B/T面
+                    resultMap.put("side", "B");
+                    if (codeBean.getBarcode().getPlateSize() > 7) {
+                        resultMap.put("side", "T");
+                    } else {
+                        if ("T".equals(dataLog.getSide())) {
+                            resultMap.put("side", "T");
+                        }
+                    }
                 }
                 }
             }
             }
         }
         }

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/util/StorageExportUtil.java

@@ -4,6 +4,7 @@ import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.custom.lizhen.innerBox.bean.StorageExport;
 import com.neotel.smfcore.custom.lizhen.innerBox.bean.StorageExport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
@@ -20,6 +21,16 @@ public class StorageExportUtil {
         dataCache = cache;
         dataCache = cache;
     }
     }
 
 
+
+    private static String disableExport = "";
+
+    @Value("${disable.export}")
+    void setDisableExport(String export) {
+        if (StringUtils.isNotBlank(export)) {
+            disableExport = export;
+        }
+    }
+
     //出料口名称
     //出料口名称
     private final String[] exportStr = new String[]{"MU1_1", "MU1_2", "MU2_1", "MU4_1", "MU4_2", "MU5_1", "MU5_2"};
     private final String[] exportStr = new String[]{"MU1_1", "MU1_2", "MU2_1", "MU4_1", "MU4_2", "MU5_1", "MU5_2"};
 
 
@@ -58,6 +69,12 @@ public class StorageExportUtil {
         //判断是否为新工单
         //判断是否为新工单
         if (StringUtils.isBlank(exportStr)) {
         if (StringUtils.isBlank(exportStr)) {
             for (Map.Entry<String, StorageExport> entry : exportMap.entrySet()) {
             for (Map.Entry<String, StorageExport> entry : exportMap.entrySet()) {
+                //判断是否有禁用工位信息
+                if (StringUtils.isNotBlank(disableExport)){
+                    if (disableExport.contains(entry.getKey())){
+                        continue;
+                    }
+                }
                 StorageExport export = entry.getValue();
                 StorageExport export = entry.getValue();
                 if (StringUtils.isBlank(export.getHSerial())){
                 if (StringUtils.isBlank(export.getHSerial())){
                     exportStr = entry.getKey();
                     exportStr = entry.getKey();

src/main/resources/config/application.yml

@@ -59,7 +59,9 @@ forward:
     name: B15
     name: B15
     url: http://10.42.176.209:8001/smf-core
     url: http://10.42.176.209:8001/smf-core
 
 
-
+#禁用工位信息
+disable:
+  export: MU_1,MU_2