From 5021722c46b4c8568d597dbdb889352d7ca17ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 21 Dec 2023 19:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=20?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=AE=B0=E5=BD=95=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ProductdismantleRecordDetailbBaseVO.java | 4 ++++ .../vo/ProductdismantleRecordDetailbExportReqVO.java | 3 +++ .../vo/ProductdismantleRecordDetailbPageReqVO.java | 3 +++ .../ProductdismantleRecordDetailbMapper.java | 2 ++ 4 files changed, 12 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java index 544ac5fa..4137c0cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -82,4 +83,7 @@ public class ProductdismantleRecordDetailbBaseVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "数量") + private BigDecimal qty; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java index 1d3ae0d2..f93f49bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java @@ -76,4 +76,7 @@ public class ProductdismantleRecordDetailbExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java index 1243671c..ae2677e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java @@ -81,4 +81,7 @@ public class ProductdismantleRecordDetailbPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java index 2796556f..ea17929c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java @@ -22,6 +22,7 @@ public interface ProductdismantleRecordDetailbMapper extends BaseMapperX selectPage(ProductdismantleRecordDetailbPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProductdismantleRecordDetailbDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) .eqIfPresent(ProductdismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion()) .eqIfPresent(ProductdismantleRecordDetailbDO::getBatch, reqVO.getBatch()) @@ -51,6 +52,7 @@ public interface ProductdismantleRecordDetailbMapper extends BaseMapperX selectList(ProductdismantleRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductdismantleRecordDetailbDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) .eqIfPresent(ProductdismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion()) .eqIfPresent(ProductdismantleRecordDetailbDO::getBatch, reqVO.getBatch())