修改Bug。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.purchasereturnJob.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 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;
@@ -87,4 +88,7 @@ public class PurchasereturnJobDetailPageReqVO extends PageParam {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.purchasereturnRecord.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 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;
@@ -123,4 +124,7 @@ public class PurchasereturnRecordDetailPageReqVO extends PageParam {
     @Schema(description = "到批次")
     private String toBatch;
 
+    @Schema(description = "主表ID")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.purchasereturnRequest.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 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;
@@ -94,4 +95,7 @@ public class PurchasereturnRequestDetailPageReqVO extends PageParam {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.putawayJob.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 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;
@@ -81,4 +82,7 @@ public class PutawayJobDetailPageReqVO extends PageParam {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.putawayRecord.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 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;
@@ -111,4 +112,7 @@ public class PutawayRecordDetailPageReqVO extends PageParam {
     @Schema(description = "到批次")
     private String toBatch;
 
+    @Schema(description = "主表ID")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java

@@ -22,6 +22,7 @@ public interface InspectRequestDetailMapper extends BaseMapperX<InspectRequestDe
 
     default PageResult<InspectRequestDetailDO> selectPage(InspectRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectRequestDetailDO>()
+                .eqIfPresent(InspectRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InspectRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(InspectRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java

@@ -21,6 +21,7 @@ public interface PurchasereturnJobDetailMapper extends BaseMapperX<Purchaseretur
 
     default PageResult<PurchasereturnJobDetailDO> selectPage(PurchasereturnJobDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnJobDetailDO>()
+                .eq(PurchasereturnJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(PurchasereturnJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereturnJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java

@@ -21,6 +21,7 @@ public interface PurchasereturnRecordDetailMapper extends BaseMapperX<Purchasere
 
     default PageResult<PurchasereturnRecordDetailDO> selectPage(PurchasereturnRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnRecordDetailDO>()
+                .eq(PurchasereturnRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
                 .eqIfPresent(PurchasereturnRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
                 .eqIfPresent(PurchasereturnRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java

@@ -21,6 +21,7 @@ public interface PurchasereturnRequestDetailMapper extends BaseMapperX<Purchaser
 
     default PageResult<PurchasereturnRequestDetailDO> selectPage(PurchasereturnRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnRequestDetailDO>()
+                .eq(PurchasereturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java

@@ -22,6 +22,7 @@ public interface PutawayJobDetailMapper extends BaseMapperX<PutawayJobDetailDO>
 
     default PageResult<PutawayJobDetailDO> selectPage(PutawayJobDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayJobDetailDO>()
+                .eq(PutawayJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PutawayJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PutawayJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO;
 import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -22,6 +23,7 @@ public interface PutawayRecordDetailMapper extends BaseMapperX<PutawayRecordDeta
 
     default PageResult<PutawayRecordDetailDO> selectPage(PutawayRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayRecordDetailDO>()
+                .eq(PutawayRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
                 .eqIfPresent(PutawayRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
                 .eqIfPresent(PutawayRecordDetailDO::getFromBatch, reqVO.getFromBatch())