From 1403023659bd2c8f74352aaa1f020f11b819bf32 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 28 Dec 2023 11:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container/vo/ContainerDetailExportReqVO.java         | 3 +++
 .../container/vo/ContainerDetailPageReqVO.java           | 3 +++
 .../wms/dal/mysql/container/ContainerDetailMapper.java   | 9 +++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExportReqVO.java
index f4a145e2..b04500dc 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExportReqVO.java
@@ -32,4 +32,7 @@ public class ContainerDetailExportReqVO {
     @Schema(description = "数量")
     private BigDecimal qty;
 
+    @Schema(description = "主键ID")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailPageReqVO.java
index 5c39f15f..16b9e7f1 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailPageReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailPageReqVO.java
@@ -34,4 +34,7 @@ public class ContainerDetailPageReqVO extends PageParam {
     @Schema(description = "数量")
     private BigDecimal qty;
 
+    @Schema(description = "主键ID")
+    private Long masterId;
+
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java
index d084e3d0..75aa250c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java
@@ -1,18 +1,17 @@
 package com.win.module.wms.dal.mysql.container;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.container.vo.ContainerDetailExportReqVO;
 import com.win.module.wms.controller.container.vo.ContainerDetailPageReqVO;
-import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.container.ContainerDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 器具子 Mapper
  *
@@ -30,6 +29,7 @@ public interface ContainerDetailMapper extends BaseMapperX<ContainerDetailDO> {
                 .eqIfPresent(ContainerDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
                 .eqIfPresent(ContainerDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(ContainerDetailDO::getQty, reqVO.getQty())
+                .eqIfPresent(ContainerDetailDO::getMasterId, reqVO.getMasterId())
                 .orderByDesc(ContainerDetailDO::getId));
     }
     default PageResult<ContainerDetailDO> selectSenior(CustomConditions conditions) {
@@ -44,6 +44,7 @@ public interface ContainerDetailMapper extends BaseMapperX<ContainerDetailDO> {
                 .eqIfPresent(ContainerDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
                 .eqIfPresent(ContainerDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(ContainerDetailDO::getQty, reqVO.getQty())
+                .eqIfPresent(ContainerDetailDO::getMasterId, reqVO.getMasterId())
                 .orderByDesc(ContainerDetailDO::getId));
     }