1.发送出库任务的时候,把出口返回过去

2.Tower目前手动出库增加选择线体

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

@@ -731,6 +731,11 @@ public class StoragePosController {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"机种"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"机种"});
         }
         }
 
 
+        String line = checkOutDto.getLine();
+        if (StringUtils.isEmpty(model)){
+            throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"线体"});
+        }
+
         if (checkOutDto.getSingleOut() == null) {
         if (checkOutDto.getSingleOut() == null) {
             checkOutDto.setSingleOut(true + "");
             checkOutDto.setSingleOut(true + "");
         }
         }
@@ -812,6 +817,7 @@ public class StoragePosController {
             task.setProviderNumber(barcode.getProviderNumber());
             task.setProviderNumber(barcode.getProviderNumber());
             task.setKeeperCode(barcode.getKeeperCode());
             task.setKeeperCode(barcode.getKeeperCode());
             task.setOperator(SecurityUtils.getLoginUsername());
             task.setOperator(SecurityUtils.getLoginUsername());
+            task.setLine(line);
 
 
             String resultStr = lizhenApi.towerCheck(task);
             String resultStr = lizhenApi.towerCheck(task);
             if (StringUtils.isEmpty(resultStr)){
             if (StringUtils.isEmpty(resultStr)){

src/main/java/com/neotel/smfcore/core/storage/rest/dto/CheckOutDto.java

@@ -12,6 +12,8 @@ public class CheckOutDto {
 
 
     private String model;
     private String model;
 
 
+    private String line;
+
     /**
     /**
      * 是否强制出库
      * 是否强制出库
      */
      */

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java

@@ -146,6 +146,8 @@ public class TaskDto implements Serializable {
     @ApiModelProperty("出口位置")
     @ApiModelProperty("出口位置")
     private String export = "";
     private String export = "";
 
 
+    private String line = "";
+
     public String getTaskColor() {
     public String getTaskColor() {
         if (ObjectUtil.isNotEmpty(lightColor)) {
         if (ObjectUtil.isNotEmpty(lightColor)) {
             return "#" + lightColor;
             return "#" + lightColor;

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -496,7 +496,7 @@ public class TaskService {
         String export = exportMap.get(cid);
         String export = exportMap.get(cid);
 
 
         //1.找到与上一次出料口不同的任务
         //1.找到与上一次出料口不同的任务
-        outTask = getNeedOutTask(allTasks, export, cid, true);
+        outTask = getNeedOutTask(allTasks, export, cid, false);
 
 
         //2.如果没找到,不找到最早的任务
         //2.如果没找到,不找到最早的任务
         if (outTask == null) {
         if (outTask == null) {
@@ -687,6 +687,7 @@ public class TaskService {
                         log.warn("出库无料仓位" + storage.getName() + "[" + posName + "]");
                         log.warn("出库无料仓位" + storage.getName() + "[" + posName + "]");
                     }
                     }
                     statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut);
                     statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut);
+                    statusBean.addData("export",task.getExport());
                     log.info("出库" + storage.getName() + "[" + posName + "]物料[" + task.getBarcode() + "]" + isSingleOut + "发送到客户端" + cid+",出料口为:"+task.getExport());
                     log.info("出库" + storage.getName() + "[" + posName + "]物料[" + task.getBarcode() + "]" + isSingleOut + "发送到客户端" + cid+",出料口为:"+task.getExport());
                 }
                 }
            // }
            // }

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/bean/StorageExport.java

@@ -33,4 +33,6 @@ public class StorageExport {
      * 料串信息
      * 料串信息
      */
      */
     private String material = "";
     private String material = "";
+
+    private String cacheID = "";
 }
 }

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

@@ -170,6 +170,7 @@ public class InnerBoxRestController {
                     }
                     }
                 }
                 }
                 storageExport.setRemainTaskCount(remainTaskCount);
                 storageExport.setRemainTaskCount(remainTaskCount);
+                storageExport.setCacheID(liteOrder.getCacheID());
                 log.info(opTask.getBarcode()+"任务完成,更新出料口信息:"+ JSON.toJSONString(storageExport));
                 log.info(opTask.getBarcode()+"任务完成,更新出料口信息:"+ JSON.toJSONString(storageExport));
                 StorageExportUtil.updateExport(outlet,storageExport);
                 StorageExportUtil.updateExport(outlet,storageExport);
             }
             }
@@ -528,6 +529,10 @@ public class InnerBoxRestController {
                 }
                 }
             }
             }
             storageExport.setRemainTaskCount(remainTaskCount);
             storageExport.setRemainTaskCount(remainTaskCount);
+            LiteOrder orderNo = liteOrderManager.findByOrderNo(storageExport.getHSerial());
+            if (orderNo != null){
+             storageExport.setCacheID(orderNo.getCacheID());
+            }
             StorageExportUtil.updateExport(export, storageExport);
             StorageExportUtil.updateExport(export, storageExport);
         }
         }
         log.info(export + "获取出料口信息为:" + JSON.toJSONString(storageExport));
         log.info(export + "获取出料口信息为:" + JSON.toJSONString(storageExport));
@@ -543,6 +548,7 @@ public class InnerBoxRestController {
         if (liteOrder != null){
         if (liteOrder != null){
             storageExport.setLine(liteOrder.getLine());
             storageExport.setLine(liteOrder.getLine());
             storageExport.setHSerial(export);
             storageExport.setHSerial(export);
+            storageExport.setCacheID(liteOrder.getCacheID());
             //storageExport.setRemainTaskCount(0);
             //storageExport.setRemainTaskCount(0);
         }
         }
         log.info(export + "获取目的地信息:" + JSON.toJSONString(storageExport));
         log.info(export + "获取目的地信息:" + JSON.toJSONString(storageExport));

src/main/java/com/neotel/smfcore/custom/lizhen/setting/controller/LineController.java

+package com.neotel.smfcore.custom.lizhen.setting.controller;
+
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/line")
+public class LineController {
+
+    @Value("${3f.line}")
+    private String line;
+
+    @ApiOperation("获取所有线体")
+    @RequestMapping("/getAllLine")
+    @AnonymousAccess
+    public ResultBean getAllLine(){
+        String[] split = line.split(",");
+        List<String> lineList = Arrays.asList(split);
+        lineList = lineList.stream().distinct().collect(Collectors.toList());
+        Collections.sort(lineList);
+        return ResultBean.newOkResult(lineList);
+    }
+
+}

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

+3f:
+  line: C03-3FSMT-13,C02-3FSMT-12,C02-3FSMT-18,C02-3FSMT-19,C03-1FSMT-12,C02-3FSMT-11,C03-1FSMT-11,C02-3FSMT-17,C02-3FSMT-14,C03-1FSMT-12,C02-3FSMT-13,C02-3FSMT-16,C02-3FSMT-15,C02-3FSMT-19
\ No newline at end of file

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

+3f:
+  line: C03-1FSMT-01,C02-3FSMT-02,C03-3FSMT-03,C02-3FSMT-09,C02-3FSMT-01,C03-1FSMT-02,C02-3FSMT-08,C02-3FSMT-06,C02-3FSMT-07,C02-3FSMT-04,C02-3FSMT-05,C02-3FSMT-03,C03-1FSMT-02
\ No newline at end of file

src/main/resources/config/application.yml

@@ -80,7 +80,7 @@ spring:
     check-template-location: false
     check-template-location: false
   profiles:
   profiles:
     active: 'prod'
     active: 'prod'
-    include: 21088prod
+    include: 21088prod,bg
   jackson:
   jackson:
     time-zone: GMT+8
     time-zone: GMT+8
   data:
   data: