From e804d961b01b1753cbe07b7b3f7c56e315442191 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Tue, 26 Aug 2025 16:06:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E5=B0=86=E6=89=B9=E6=AC=A1id?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1id?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 WmsSchedulePlanDetail 中的 batchId 改为 taskId - 更新相关 BO、VO 类中的字段名称 - 修改数据库查询以适应新的字段 - 移除未使用的权限注解 --- .../WmsProductionLineController.java | 2 -- .../com/klp/domain/WmsSchedulePlanDetail.java | 2 +- .../klp/domain/bo/WmsSchedulePlanDetailBo.java | 4 ++-- .../klp/domain/vo/WmsSchedulePlanDetailVo.java | 17 ++++++++++++++--- .../mapper/WmsSchedulePlanDetailMapper.java | 2 ++ .../impl/WmsSchedulePlanDetailServiceImpl.java | 18 +++--------------- .../mapper/klp/WmsSchedulePlanDetailMapper.xml | 18 +++++++++++++++--- 7 files changed, 37 insertions(+), 26 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java b/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java index eee96d3c..c1f29372 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsProductionLineController.java @@ -1,6 +1,5 @@ package com.klp.controller; -import java.lang.reflect.Method; import java.math.BigDecimal; import java.util.*; @@ -9,7 +8,6 @@ import com.klp.domain.vo.*; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import com.klp.common.annotation.RepeatSubmit; diff --git a/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlanDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlanDetail.java index 2a943f7e..515740ff 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlanDetail.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlanDetail.java @@ -38,7 +38,7 @@ public class WmsSchedulePlanDetail extends BaseEntity { /** * 批次id */ - private Long batchId; + private Long taskId; /** * 产品ID */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanDetailBo.java index a98f2188..692dd840 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanDetailBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanDetailBo.java @@ -36,9 +36,9 @@ public class WmsSchedulePlanDetailBo extends BaseEntity { private Long lineId; /** - * 批次id + * 生产任务ID（原批次id） */ - private Long batchId; + private Long taskId; /** * 产品ID diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsSchedulePlanDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsSchedulePlanDetailVo.java index 365ae5d3..1141d4c4 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsSchedulePlanDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsSchedulePlanDetailVo.java @@ -41,10 +41,10 @@ public class WmsSchedulePlanDetailVo { private Long lineId; /** - * 批次id + * 生产任务id(原批次id) */ - @ExcelProperty(value = "批次id") - private Long batchId; + @ExcelProperty(value = "生产任务id") + private Long taskId; /** * 产品ID @@ -108,4 +108,15 @@ public class WmsSchedulePlanDetailVo { @ExcelProperty(value = "批次号") private String batchNo; + /** + * 计划名称 + */ + @ExcelProperty(value = "计划名称") + private String planName; + + /** + * 计划编码 + */ + @ExcelProperty(value = "计划编码") + private String planCode; } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsSchedulePlanDetailMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsSchedulePlanDetailMapper.java index 011a3f92..e8eed339 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsSchedulePlanDetailMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsSchedulePlanDetailMapper.java @@ -22,4 +22,6 @@ public interface WmsSchedulePlanDetailMapper extends BaseMapperPlus selectPlanTimeAgg(@Param("planIds") List planIds); Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); + + List selectVoListWithName(@Param("ew") QueryWrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanDetailServiceImpl.java index 62e83b02..4bd781a5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanDetailServiceImpl.java @@ -55,20 +55,8 @@ public class WmsSchedulePlanDetailServiceImpl implements IWmsSchedulePlanDetailS */ @Override public List queryList(WmsSchedulePlanDetailBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - private LambdaQueryWrapper buildQueryWrapper(WmsSchedulePlanDetailBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getPlanId() != null, WmsSchedulePlanDetail::getPlanId, bo.getPlanId()); - lqw.eq(bo.getLineId() != null, WmsSchedulePlanDetail::getLineId, bo.getLineId()); - lqw.eq(bo.getBatchId() != null, WmsSchedulePlanDetail::getBatchId, bo.getBatchId()); - lqw.eq(bo.getProductId() != null, WmsSchedulePlanDetail::getProductId, bo.getProductId()); - lqw.eq(bo.getQuantity() != null, WmsSchedulePlanDetail::getQuantity, bo.getQuantity()); - lqw.eq(bo.getStartDate() != null, WmsSchedulePlanDetail::getStartDate, bo.getStartDate()); - lqw.eq(bo.getEndDate() != null, WmsSchedulePlanDetail::getEndDate, bo.getEndDate()); - return lqw; + QueryWrapper lqw = buildQueryWrapperPlus(bo); + return baseMapper.selectVoListWithName(lqw); } private QueryWrapper buildQueryWrapperPlus(WmsSchedulePlanDetailBo bo) { @@ -78,7 +66,7 @@ public class WmsSchedulePlanDetailServiceImpl implements IWmsSchedulePlanDetailS lqw.eq("wspd.del_flag", 0); lqw.eq( bo.getPlanId()!=null ,"wspd.plan_id", bo.getPlanId()); lqw.eq(bo.getLineId()!=null ,"wspd.line_id", bo.getLineId()); - lqw.eq(bo.getBatchId()!=null ,"wspd.batch_id", bo.getBatchId()); + lqw.eq(bo.getTaskId()!=null ,"wspd.task_id", bo.getTaskId()); lqw.eq(bo.getProductId()!=null ,"wspd.product_id", bo.getProductId()); lqw.eq(bo.getQuantity()!=null ,"wspd.quantity", bo.getQuantity()); lqw.eq(bo.getStartDate()!=null ,"wspd.start_date", bo.getStartDate()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml index 5a9f43ee..c008c135 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsSchedulePlanDetailMapper.xml @@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -39,11 +39,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +