器具修改

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;
+
 }

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;
+
 }

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));
     }