生产退料 直接记录 修改

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

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

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

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<Product
 
     default PageResult<ProductdismantleRecordDetailbDO> selectPage(ProductdismantleRecordDetailbPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductdismantleRecordDetailbDO>()
+                .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<Product
 
     default List<ProductdismantleRecordDetailbDO> selectList(ProductdismantleRecordDetailbExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRecordDetailbDO>()
+                .eqIfPresent(ProductdismantleRecordDetailbDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode())
                 .eqIfPresent(ProductdismantleRecordDetailbDO::getBomVersion, reqVO.getBomVersion())
                 .eqIfPresent(ProductdismantleRecordDetailbDO::getBatch, reqVO.getBatch())