From 0e293223b7a0b6a3717fe8c62948b700ae144d5f Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Tue, 22 Apr 2025 11:09:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E7=9B=92=E5=AD=90=E7=9A=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wms/controller/KateWorkQueryController.java | 3 ++- .../java/com/wms/entity/app/dto/WorkCenterAndOrderDto.java | 5 +++++ src/main/java/com/wms/entity/app/request/WorkFlowQuery.java | 6 ++++++ src/main/java/com/wms/entity/table/WorkFlow.java | 5 +++++ src/main/java/com/wms/entity/table/WorkFlowLast.java | 5 +++++ .../business/serviceImplements/WorkServiceImplements.java | 4 ++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/wms/controller/KateWorkQueryController.java b/src/main/java/com/wms/controller/KateWorkQueryController.java index 8d79975..53044ec 100644 --- a/src/main/java/com/wms/controller/KateWorkQueryController.java +++ b/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 pageDto = PageDto.of(workFlowsPage, workFlow -> BeanUtil.copyProperties(workFlow, WorkFlowVo.class)); logger.info("查询工作流成功。"); response.setCode(ResponseCode.OK.getCode()); diff --git a/src/main/java/com/wms/entity/app/dto/WorkCenterAndOrderDto.java b/src/main/java/com/wms/entity/app/dto/WorkCenterAndOrderDto.java index d1fbcd1..89562d5 100644 --- a/src/main/java/com/wms/entity/app/dto/WorkCenterAndOrderDto.java +++ b/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; /** * 开工日期 */ diff --git a/src/main/java/com/wms/entity/app/request/WorkFlowQuery.java b/src/main/java/com/wms/entity/app/request/WorkFlowQuery.java index d454868..86ae9a4 100644 --- a/src/main/java/com/wms/entity/app/request/WorkFlowQuery.java +++ b/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 diff --git a/src/main/java/com/wms/entity/table/WorkFlow.java b/src/main/java/com/wms/entity/table/WorkFlow.java index c2ad01d..1ce9c45 100644 --- a/src/main/java/com/wms/entity/table/WorkFlow.java +++ b/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; } diff --git a/src/main/java/com/wms/entity/table/WorkFlowLast.java b/src/main/java/com/wms/entity/table/WorkFlowLast.java index 335def4..4445e8c 100644 --- a/src/main/java/com/wms/entity/table/WorkFlowLast.java +++ b/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; } diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java index 04b8a3c..e2cec01 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java +++ b/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 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); } }