任务展示栈板id

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

@@ -1320,6 +1320,11 @@ public class LiteOrderCache {
                     task.setType(OP.CHECKOUT);
                     task.setType(OP.CHECKOUT);
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setLoc(loc);
                     task.setLoc(loc);
+
+                    if (StringUtils.isNotEmpty(barcode.getCartonId())){
+                        task.setCartonId(barcode.getCartonId());
+                    }
+
                     taskService.addTaskToExecute(task);
                     taskService.addTaskToExecute(task);
                 }
                 }
             }
             }
@@ -1417,6 +1422,9 @@ public class LiteOrderCache {
                     task.setType(OP.CHECKOUT);
                     task.setType(OP.CHECKOUT);
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setLoc(TaskLocUtil.OUT);
                     task.setLoc(TaskLocUtil.OUT);
+                    if (StringUtils.isNotEmpty(barcode.getCartonId())){
+                        task.setCartonId(barcode.getCartonId());
+                    }
                     task.setOdn(true);
                     task.setOdn(true);
                     taskService.addTaskToExecute(task);
                     taskService.addTaskToExecute(task);
                 }
                 }

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

@@ -149,6 +149,8 @@ public class TaskDto implements Serializable {
     @ApiModelProperty("当前位置")
     @ApiModelProperty("当前位置")
     private String currentLoc = "";
     private String currentLoc = "";
 
 
+    private String cartonId;
+
     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/rest/bean/query/TaskQueryCondition.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @ApiModel("查询条件")
 @ApiModel("查询条件")
 public class TaskQueryCondition {
 public class TaskQueryCondition {
 
 
-    @QueryCondition(blurry = "barcode,partNumber,posName,sourceName,subSourceInfo,memo,export")
+    @QueryCondition(blurry = "barcode,partNumber,posName,sourceName,subSourceInfo,memo,export,cartonId")
     @ApiModelProperty("模糊搜索")
     @ApiModelProperty("模糊搜索")
     private String blurry;
     private String blurry;
 
 

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -384,6 +384,8 @@ public class DataLog extends BasePo implements Serializable {
 
 
     private boolean odn = false;
     private boolean odn = false;
 
 
+    private String cartonId;
+
     public String getBarcode() {
     public String getBarcode() {
         if(barcode == null){
         if(barcode == null){
             return "";
             return "";

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

@@ -126,6 +126,11 @@ public class TaskService {
             task.setProviderNumber(barcode.getProviderNumber());
             task.setProviderNumber(barcode.getProviderNumber());
             task.setKeeperCode(barcode.getKeeperCode());
             task.setKeeperCode(barcode.getKeeperCode());
             task.setNum(barcode.getAmount());
             task.setNum(barcode.getAmount());
+
+            if(StringUtils.isNotEmpty(barcode.getCartonId())){
+                task.setCartonId(barcode.getCartonId());
+            }
+
             barcode.setPutInTime(System.currentTimeMillis());
             barcode.setPutInTime(System.currentTimeMillis());
             barcode.updateSluggishTime(dataCache.getPNsluggishDay(barcode.getPartNumber()));
             barcode.updateSluggishTime(dataCache.getPNsluggishDay(barcode.getPartNumber()));
             barcodeManager.saveBarcode(barcode);
             barcodeManager.saveBarcode(barcode);