1. 工作流增加大盒子的设置

src/main/java/com/wms/controller/KateWorkQueryController.java

@@ -698,7 +698,8 @@ public class KateWorkQueryController {
                     .like(StringUtils.isNotEmpty(workFlowQuery.getWorkStation()), WorkFlow::getWorkStation, workFlowQuery.getWorkStation())
                     .like(StringUtils.isNotEmpty(workFlowQuery.getWorkOrder()), WorkFlow::getWorkOrder, workFlowQuery.getWorkOrder())
                     .like(StringUtils.isNotEmpty(workFlowQuery.getWorkCenter()), WorkFlow::getWorkCenter, workFlowQuery.getWorkCenter())
-                    .like(StringUtils.isNotEmpty(workFlowQuery.getGoodsId()), WorkFlow::getGoodsId, workFlowQuery.getGoodsId()));
+                    .like(StringUtils.isNotEmpty(workFlowQuery.getGoodsId()), WorkFlow::getGoodsId, workFlowQuery.getGoodsId())
+                    .eq(workFlowQuery.getMachineType() != null, WorkFlow::getMachineType, workFlowQuery.getMachineType()));
             PageDto<WorkFlowVo> pageDto = PageDto.of(workFlowsPage, workFlow -> BeanUtil.copyProperties(workFlow, WorkFlowVo.class));
             logger.info("查询工作流成功。");
             response.setCode(ResponseCode.OK.getCode());

src/main/java/com/wms/entity/app/dto/WorkCenterAndOrderDto.java

@@ -20,6 +20,11 @@ public class WorkCenterAndOrderDto {
      */
     @JsonProperty("workCenter")
     private String workCenter;
+    /**
+     * 大盒子
+     */
+    @JsonProperty("bigBox")
+    private String bigBox;
     /**
      * 开工日期
      */

src/main/java/com/wms/entity/app/request/WorkFlowQuery.java

@@ -1,6 +1,7 @@
 package com.wms.entity.app.request;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.wms.entity.table.PickTask;
@@ -93,6 +94,11 @@ public class WorkFlowQuery extends PageQuery {
      */
     @JsonProperty("opUser")
     private String opUser;
+    /**
+     * 机器类型
+     */
+    @TableField("machine_type")
+    private Integer machineType;
 
     /**
      * 转化为WorkFlowPo

src/main/java/com/wms/entity/table/WorkFlow.java

@@ -96,4 +96,9 @@ public class WorkFlow {
      */
     @TableField("plan_date")
     private LocalDate planDate;
+    /**
+     * 大盒子号
+     */
+    @TableField("big_box")
+    private String bigBox;
 }

src/main/java/com/wms/entity/table/WorkFlowLast.java

@@ -96,4 +96,9 @@ public class WorkFlowLast {
      */
     @TableField("plan_date")
     private LocalDate planDate;
+    /**
+     * 大盒子号
+     */
+    @TableField("big_box")
+    private String bigBox;
 }

src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java

@@ -512,6 +512,8 @@ public class WorkServiceImplements implements IWorkService {
                 summary.setLackStatus(summary.getLackNum().compareTo(BigDecimal.ZERO) > 0 ? 1 : 0);
                 summary.setFinishTime(workFlow.getFinishTime());
                 summary.setOpUser(workFlow.getOpUser());
+                summary.setMachineType(workFlow.getMachineType());
+                summary.setPlanDate(workFlow.getPlanDate());
                 // 设置电子标签位置
                 List<ELocationConfig> currentBoxELocationList = eLocationConfigList.stream().filter(e ->
                         e.getWorkOrder().equals(workFlow.getWorkOrder())
@@ -627,6 +629,7 @@ public class WorkServiceImplements implements IWorkService {
                         wcoDto.setWorkOrder(kateWorkOrder.getWorkOrder());
                         wcoDto.setStartDate(LocalDateTime.now().toLocalDate().atStartOfDay());
                         wcoDto.setDbsSequence(kateDBS.getWorkSequence());
+                        wcoDto.setBigBox(workConfig.getBigBox());
                         toDaysOrders.add(wcoDto);
                     }
                 }
@@ -659,6 +662,7 @@ public class WorkServiceImplements implements IWorkService {
                         // 改动
                         tempWorkFlow.setMachineType(Objects.equals(model, "MWL") ? 1 : 2);
                         tempWorkFlow.setPlanDate(currentWorkDate);
+                        tempWorkFlow.setBigBox(currentWorkCenterAndOrderDto.getBigBox());
                         workFlows.add(tempWorkFlow);
                     }
                 }