制品报废收货

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -705,7 +705,6 @@ public interface ErrorCodeConstants {
     ErrorCode PRODUCTRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_001_102_001, "制品收货申请子不存在");
     ErrorCode PRODUCTRECEIPT_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_001_102_001, "导入制品收货申请不能为空");
     ErrorCode PRODUCTRECEIPT_REQUEST_JOB_EXISTS = new ErrorCode(1_001_102_002, "制品收货申请存在制品收货任务单");
-
     ErrorCode PRODUCTRECEIPT_REQUEST_MAIN_STATUS_ERROR = new ErrorCode(1_001_102_003, "制品收货申请状态错误");
     //制品收货任务主ErrorCode
     ErrorCode PRODUCTRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_103_000, "制品收货任务主不存在");
@@ -718,9 +717,23 @@ public interface ErrorCodeConstants {
     ErrorCode PRODUCTRECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_001_104_001, "制品收货记录子不存在");
     //制品收货记录子ErrorCode
     ErrorCode BACKFLUSH_RECORD_DETAILB_NOT_EXISTS = new ErrorCode(1_001_104_002, "制品收货记录子不存在");
+
+    //制品报废收货申请ErrorCode
+    ErrorCode PRODUCTSCRAPRECEIPT_MAIN_NOT_EXISTS = new ErrorCode(1_001_102_001, "制品报废收货申请主不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_001_102_001, "制品报废收货申请主列表不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_DETAIL_NOT_EXISTS = new ErrorCode(1_001_102_001, "制品报废收货申请子不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_DETAIL_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_001_102_001, "制品报废收货申请子列表不存在");
+    //制品报废收货任务ErrorCode
+    ErrorCode PRODUCTSCRAPRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_001_102_001, "制品报废收货任务主不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_JOB_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_001_102_001, "制品报废收货任务主列表不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_102_001, "制品报废收货任务子不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_JOB_DETAIL_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_001_102_001, "制品报废收货任务子列表不存在");
+    //制品报废收货记录ErrorCode
+    ErrorCode PRODUCTSCRAPRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_001_102_001, "制品报废收货记录主不存在");
+    ErrorCode PRODUCTSCRAPRECEIPT_RECORD_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_001_102_001, "制品报废收货记录主列表不存在");
+
     //制品拆解申请主ErrorCode
     ErrorCode PRODUCTDISMANTLE_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_105_000, "制品拆解申请主不存在");
-
     //制品拆解申请子ErrorCode
     ErrorCode PRODUCTDISMANTLE_REQUEST_DETAILA_NOT_EXISTS = new ErrorCode(1_001_105_001, "制品拆解申请子不存在");
     //制品拆解申请子ErrorCode

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/ProductscrapreceiptJobDetailController.java

@@ -0,0 +1,135 @@
+package com.win.module.wms.controller.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.*;
+import com.win.module.wms.convert.productscrapreceiptJob.ProductscrapreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobDetailDO;
+import com.win.module.wms.service.productscrapreceiptJob.ProductscrapreceiptJobDetailService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
+
+import static com.win.framework.common.pojo.CommonResult.success;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+@Tag(name = "管理后台 - 制品报废收货任务子")
+@RestController
+@RequestMapping("/wms/productscrapreceipt-job-detail")
+@Validated
+public class ProductscrapreceiptJobDetailController {
+
+    @Resource
+    private ProductscrapreceiptJobDetailService productscrapreceiptJobDetailService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建制品报废收货任务子")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:create')")
+    public CommonResult<Long> createProductscrapreceiptJobDetail(@Valid @RequestBody ProductscrapreceiptJobDetailCreateReqVO createReqVO) {
+        return success(productscrapreceiptJobDetailService.createProductscrapreceiptJobDetail(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新制品报废收货任务子")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:update')")
+    public CommonResult<Boolean> updateProductscrapreceiptJobDetail(@Valid @RequestBody ProductscrapreceiptJobDetailUpdateReqVO updateReqVO) {
+        int result = productscrapreceiptJobDetailService.updateProductscrapreceiptJobDetail(updateReqVO);
+        return success(result > 0);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除制品报废收货任务子")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:delete')")
+    public CommonResult<Boolean> deleteProductscrapreceiptJobDetail(@RequestParam("id") Long id) {
+        int result = productscrapreceiptJobDetailService.deleteProductscrapreceiptJobDetail(id);
+        return success(result > 0);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得制品报废收货任务子")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:query')")
+    public CommonResult<ProductscrapreceiptJobDetailRespVO> getProductscrapreceiptJobDetail(@RequestParam("id") Long id) {
+        ProductscrapreceiptJobDetailDO productscrapreceiptJobDetail = productscrapreceiptJobDetailService.getProductscrapreceiptJobDetail(id);
+        return success(ProductscrapreceiptJobDetailConvert.INSTANCE.convert(productscrapreceiptJobDetail));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得制品报废收货任务子列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:query')")
+    public CommonResult<List<ProductscrapreceiptJobDetailRespVO>> getProductscrapreceiptJobDetailList(@RequestParam("ids") Collection<Long> ids) {
+        List<ProductscrapreceiptJobDetailDO> list = productscrapreceiptJobDetailService.getProductscrapreceiptJobDetailList(ids);
+        return success(ProductscrapreceiptJobDetailConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得制品报废收货任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:query')")
+    public CommonResult<PageResult<ProductscrapreceiptJobDetailRespVO>> getProductscrapreceiptJobDetailPage(@Valid ProductscrapreceiptJobDetailPageReqVO pageVO) {
+        PageResult<ProductscrapreceiptJobDetailDO> pageResult = productscrapreceiptJobDetailService.getProductscrapreceiptJobDetailPage(pageVO);
+        return success(ProductscrapreceiptJobDetailConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出制品报废收货任务子 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductscrapreceiptJobDetailExcel(@Valid ProductscrapreceiptJobDetailExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptJobDetailDO> list = productscrapreceiptJobDetailService.getProductscrapreceiptJobDetailList(exportReqVO);
+        // 导出 Excel
+        List<ProductscrapreceiptJobDetailExcelVO> datas = ProductscrapreceiptJobDetailConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "制品报废收货任务子.xls", "数据", ProductscrapreceiptJobDetailExcelVO.class, datas);
+    }
+
+    @GetMapping("/get-import-template")
+    @Operation(summary = "获得导入制品报废收货任务子模板")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptJobDetailExcelVO> list = Arrays.asList();
+        // 输出
+        ExcelUtils.write(response, "制品报废收货任务子基本信息导入模板.xls", "制品报废收货任务子基本信息列表", ProductscrapreceiptJobDetailExcelVO.class, list);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "导入制品报废收货任务子基本信息")
+    @Parameters({
+    @Parameter(name = "file", description = "Excel 文件", required = true),
+    @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"),
+    @Parameter(name = "updatePart", description = "部分更新，默认为 true", example = "true")
+    })
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-detail:import')")
+    public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
+                                                         @RequestParam("file") MultipartFile file,
+                                                         @RequestParam(value = "mode") Integer mode,
+                                                         @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception {
+
+        List<ProductscrapreceiptJobDetailExcelVO> list = ExcelUtils.read(file, ProductscrapreceiptJobDetailExcelVO.class);
+        List<ProductscrapreceiptJobDetailExcelVO> errorList = productscrapreceiptJobDetailService.importProductscrapreceiptJobDetailList(list, mode, updatePart);
+
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("errorCount", errorList.size());
+        if(!errorList.isEmpty()) {
+            String url = ExcelUtils.writeLocalFile("制品报废收货任务子基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
+            returnMap.put("errorFile", url);
+        }
+
+        return success(returnMap);
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/ProductscrapreceiptJobMainController.java

@@ -0,0 +1,135 @@
+package com.win.module.wms.controller.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.*;
+import com.win.module.wms.convert.productscrapreceiptJob.ProductscrapreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobMainDO;
+import com.win.module.wms.service.productscrapreceiptJob.ProductscrapreceiptJobMainService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
+
+import static com.win.framework.common.pojo.CommonResult.success;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+@Tag(name = "管理后台 - 制品报废收货任务主")
+@RestController
+@RequestMapping("/wms/productscrapreceipt-job-main")
+@Validated
+public class ProductscrapreceiptJobMainController {
+
+    @Resource
+    private ProductscrapreceiptJobMainService productscrapreceiptJobMainService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建制品报废收货任务主")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:create')")
+    public CommonResult<Long> createProductscrapreceiptJobMain(@Valid @RequestBody ProductscrapreceiptJobMainCreateReqVO createReqVO) {
+        return success(productscrapreceiptJobMainService.createProductscrapreceiptJobMain(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新制品报废收货任务主")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:update')")
+    public CommonResult<Boolean> updateProductscrapreceiptJobMain(@Valid @RequestBody ProductscrapreceiptJobMainUpdateReqVO updateReqVO) {
+        int result = productscrapreceiptJobMainService.updateProductscrapreceiptJobMain(updateReqVO);
+        return success(result > 0);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除制品报废收货任务主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:delete')")
+    public CommonResult<Boolean> deleteProductscrapreceiptJobMain(@RequestParam("id") Long id) {
+        int result = productscrapreceiptJobMainService.deleteProductscrapreceiptJobMain(id);
+        return success(result > 0);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得制品报废收货任务主")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:query')")
+    public CommonResult<ProductscrapreceiptJobMainRespVO> getProductscrapreceiptJobMain(@RequestParam("id") Long id) {
+        ProductscrapreceiptJobMainDO productscrapreceiptJobMain = productscrapreceiptJobMainService.getProductscrapreceiptJobMain(id);
+        return success(ProductscrapreceiptJobMainConvert.INSTANCE.convert(productscrapreceiptJobMain));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得制品报废收货任务主列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:query')")
+    public CommonResult<List<ProductscrapreceiptJobMainRespVO>> getProductscrapreceiptJobMainList(@RequestParam("ids") Collection<Long> ids) {
+        List<ProductscrapreceiptJobMainDO> list = productscrapreceiptJobMainService.getProductscrapreceiptJobMainList(ids);
+        return success(ProductscrapreceiptJobMainConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得制品报废收货任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:query')")
+    public CommonResult<PageResult<ProductscrapreceiptJobMainRespVO>> getProductscrapreceiptJobMainPage(@Valid ProductscrapreceiptJobMainPageReqVO pageVO) {
+        PageResult<ProductscrapreceiptJobMainDO> pageResult = productscrapreceiptJobMainService.getProductscrapreceiptJobMainPage(pageVO);
+        return success(ProductscrapreceiptJobMainConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出制品报废收货任务主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductscrapreceiptJobMainExcel(@Valid ProductscrapreceiptJobMainExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptJobMainDO> list = productscrapreceiptJobMainService.getProductscrapreceiptJobMainList(exportReqVO);
+        // 导出 Excel
+        List<ProductscrapreceiptJobMainExcelVO> datas = ProductscrapreceiptJobMainConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "制品报废收货任务主.xls", "数据", ProductscrapreceiptJobMainExcelVO.class, datas);
+    }
+
+    @GetMapping("/get-import-template")
+    @Operation(summary = "获得导入制品报废收货任务主模板")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptJobMainExcelVO> list = Arrays.asList();
+        // 输出
+        ExcelUtils.write(response, "制品报废收货任务主基本信息导入模板.xls", "制品报废收货任务主基本信息列表", ProductscrapreceiptJobMainExcelVO.class, list);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "导入制品报废收货任务主基本信息")
+    @Parameters({
+    @Parameter(name = "file", description = "Excel 文件", required = true),
+    @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"),
+    @Parameter(name = "updatePart", description = "部分更新，默认为 true", example = "true")
+    })
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-job-main:import')")
+    public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
+                                                         @RequestParam("file") MultipartFile file,
+                                                         @RequestParam(value = "mode") Integer mode,
+                                                         @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception {
+
+        List<ProductscrapreceiptJobMainExcelVO> list = ExcelUtils.read(file, ProductscrapreceiptJobMainExcelVO.class);
+        List<ProductscrapreceiptJobMainExcelVO> errorList = productscrapreceiptJobMainService.importProductscrapreceiptJobMainList(list, mode, updatePart);
+
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("errorCount", errorList.size());
+        if(!errorList.isEmpty()) {
+            String url = ExcelUtils.writeLocalFile("制品报废收货任务主基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
+            returnMap.put("errorFile", url);
+        }
+
+        return success(returnMap);
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailBaseVO.java

@@ -0,0 +1,107 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 制品报废收货任务子 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class ProductscrapreceiptJobDetailBaseVO {
+
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
+
+    @Schema(description = "包装号")
+    private String packingNumber;
+
+    @Schema(description = "器具号")
+    private String containerNumber;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime produceDate;
+
+    @Schema(description = "过期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime expireDate;
+
+    @Schema(description = "库存状态", example = "1")
+    private String inventoryStatus;
+
+    @Schema(description = "到库位代码")
+    private String toLocationCode;
+
+    @Schema(description = "订单号")
+    private String woNumber;
+
+    @Schema(description = "订单行")
+    private String woLine;
+
+    @Schema(description = "包装数量")
+    private BigDecimal packQty;
+
+    @Schema(description = "包装规格")
+    private String packUnit;
+
+    @Schema(description = "明细")
+    private String backFlushDetails;
+
+    @Schema(description = "物品代码")
+    private String itemCode;
+
+    @Schema(description = "物品名称", example = "赵六")
+    private String itemName;
+
+    @Schema(description = "物品描述1")
+    private String itemDesc1;
+
+    @Schema(description = "物品描述2")
+    private String itemDesc2;
+
+    @Schema(description = "项目代码")
+    private String projectCode;
+
+    @Schema(description = "数量")
+    private BigDecimal qty;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "主表ID", example = "10395")
+    private Long masterId;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "地点ID", example = "1341")
+    private String siteId;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailCreateReqVO.java

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 制品报废收货任务子创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobDetailCreateReqVO extends ProductscrapreceiptJobDetailBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailExcelVO.java

@@ -0,0 +1,110 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * 制品报废收货任务子 Excel VO
+ *
+ * @author 超级管理员
+ */
+@Data
+public class ProductscrapreceiptJobDetailExcelVO {
+
+    @ExcelProperty("id")
+    private Long id;
+
+    @ExcelProperty("生产线代码")
+    private String productionLineCode;
+
+    @ExcelProperty("工位代码")
+    private String workStationCode;
+
+    @ExcelProperty("工序代码")
+    private String processCode;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("器具号")
+    private String containerNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty("生产日期")
+    private LocalDateTime produceDate;
+
+    @ExcelProperty("过期日期")
+    private LocalDateTime expireDate;
+
+    @ExcelProperty("库存状态")
+    private String inventoryStatus;
+
+    @ExcelProperty("到库位代码")
+    private String toLocationCode;
+
+    @ExcelProperty("订单号")
+    private String woNumber;
+
+    @ExcelProperty("订单行")
+    private String woLine;
+
+    @ExcelProperty("包装数量")
+    private BigDecimal packQty;
+
+    @ExcelProperty("包装规格")
+    private String packUnit;
+
+    @ExcelProperty("明细")
+    private String backFlushDetails;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private BigDecimal qty;
+
+    @ExcelProperty("计量单位")
+    private String uom;
+
+    @ExcelProperty("主表ID")
+    private Long masterId;
+
+    @ExcelProperty("单据号")
+    private String number;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("地点ID")
+    private String siteId;
+
+    @ExcelProperty("到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailExportReqVO.java

@@ -0,0 +1,103 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+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;
+
+@Schema(description = "管理后台 - 制品报废收货任务子 Excel 导出 Request VO，参数和 ProductscrapreceiptJobDetailPageReqVO 是一致的")
+@Data
+public class ProductscrapreceiptJobDetailExportReqVO {
+
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
+
+    @Schema(description = "包装号")
+    private String packingNumber;
+
+    @Schema(description = "器具号")
+    private String containerNumber;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] produceDate;
+
+    @Schema(description = "过期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expireDate;
+
+    @Schema(description = "库存状态", example = "1")
+    private String inventoryStatus;
+
+    @Schema(description = "到库位代码")
+    private String toLocationCode;
+
+    @Schema(description = "订单号")
+    private String woNumber;
+
+    @Schema(description = "订单行")
+    private String woLine;
+
+    @Schema(description = "包装数量")
+    private BigDecimal packQty;
+
+    @Schema(description = "包装规格")
+    private String packUnit;
+
+    @Schema(description = "明细")
+    private String backFlushDetails;
+
+    @Schema(description = "物品代码")
+    private String itemCode;
+
+    @Schema(description = "物品名称", example = "赵六")
+    private String itemName;
+
+    @Schema(description = "物品描述1")
+    private String itemDesc1;
+
+    @Schema(description = "物品描述2")
+    private String itemDesc2;
+
+    @Schema(description = "项目代码")
+    private String projectCode;
+
+    @Schema(description = "数量")
+    private BigDecimal qty;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "主表ID", example = "10395")
+    private Long masterId;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "地点ID", example = "1341")
+    private String siteId;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailPageReqVO.java

@@ -0,0 +1,108 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+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;
+
+@Schema(description = "管理后台 - 制品报废收货任务子分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobDetailPageReqVO extends PageParam {
+
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
+
+    @Schema(description = "包装号")
+    private String packingNumber;
+
+    @Schema(description = "器具号")
+    private String containerNumber;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] produceDate;
+
+    @Schema(description = "过期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expireDate;
+
+    @Schema(description = "库存状态", example = "1")
+    private String inventoryStatus;
+
+    @Schema(description = "到库位代码")
+    private String toLocationCode;
+
+    @Schema(description = "订单号")
+    private String woNumber;
+
+    @Schema(description = "订单行")
+    private String woLine;
+
+    @Schema(description = "包装数量")
+    private BigDecimal packQty;
+
+    @Schema(description = "包装规格")
+    private String packUnit;
+
+    @Schema(description = "明细")
+    private String backFlushDetails;
+
+    @Schema(description = "物品代码")
+    private String itemCode;
+
+    @Schema(description = "物品名称", example = "赵六")
+    private String itemName;
+
+    @Schema(description = "物品描述1")
+    private String itemDesc1;
+
+    @Schema(description = "物品描述2")
+    private String itemDesc2;
+
+    @Schema(description = "项目代码")
+    private String projectCode;
+
+    @Schema(description = "数量")
+    private BigDecimal qty;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "主表ID", example = "10395")
+    private Long masterId;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "地点ID", example = "1341")
+    private String siteId;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailRespVO.java

@@ -0,0 +1,19 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 制品报废收货任务子 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobDetailRespVO extends ProductscrapreceiptJobDetailBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17521")
+    private Long id;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobDetailUpdateReqVO.java

@@ -0,0 +1,18 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 制品报废收货任务子更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobDetailUpdateReqVO extends ProductscrapreceiptJobDetailBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17521")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainBaseVO.java

@@ -0,0 +1,163 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 制品报废收货任务主 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class ProductscrapreceiptJobMainBaseVO {
+
+    @Schema(description = "申请单号")
+    private String requestNumber;
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workShopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "明细")
+    private String details;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime requestTime;
+
+    @Schema(description = "要求截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime requestDueTime;
+
+    @Schema(description = "状态", example = "1")
+    private String status;
+
+    @Schema(description = "过期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime expiredTime;
+
+    @Schema(description = "并发乐观锁", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "并发乐观锁不能为空")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "状态", example = "1")
+    private String jobStageStatus;
+
+    @Schema(description = "优先级")
+    private Integer priority;
+
+    @Schema(description = "优先级增量")
+    private Integer priorityIncrement;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "用户组")
+    private String userGroupCode;
+
+    @Schema(description = "承接人用户ID", example = "6918")
+    private String acceptUserId;
+
+    @Schema(description = "承接人用户名", example = "赵六")
+    private String acceptUserName;
+
+    @Schema(description = "承接时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime acceptTime;
+
+    @Schema(description = "完成人用户ID", example = "18858")
+    private String completeUserId;
+
+    @Schema(description = "完成人用户名", example = "王五")
+    private String completeUserName;
+
+    @Schema(description = "完成时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime completeTime;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+    @Schema(description = "从库区类型范围")
+    private String fromAreaTypes;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "16670")
+    private String siteId;
+
+    @Schema(description = "自动完成")
+    private String autoComplete;
+
+    @Schema(description = "允许修改库位")
+    private String allowModifyLocation;
+
+    @Schema(description = "允许修改数量")
+    private String allowModifyQty;
+
+    @Schema(description = "允许大于推荐数量")
+    private String allowBiggerQty;
+
+    @Schema(description = "允许小于推荐数量")
+    private String allowSmallerQty;
+
+    @Schema(description = "允许修改库存状态", example = "2")
+    private String allowModifyInventoryStatus;
+
+    @Schema(description = "允许连续扫描")
+    private String allowContinuousScanning;
+
+    @Schema(description = "允许部分完成")
+    private String allowPartialComplete;
+
+    @Schema(description = "允许修改批次")
+    private String allowModifyBatch;
+
+    @Schema(description = "允许修改箱码")
+    private String allowModifyPackingNumber;
+
+    @Schema(description = "工作流流水号")
+    private String serialNumber;
+
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainCreateReqVO.java

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 制品报废收货任务主创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobMainCreateReqVO extends ProductscrapreceiptJobMainBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainExcelVO.java

@@ -0,0 +1,162 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * 制品报废收货任务主 Excel VO
+ *
+ * @author 超级管理员
+ */
+@Data
+public class ProductscrapreceiptJobMainExcelVO {
+
+    @ExcelProperty("id")
+    private Long id;
+
+    @ExcelProperty("申请单号")
+    private String requestNumber;
+
+    @ExcelProperty("生产计划单号")
+    private String productionPlanNumber;
+
+    @ExcelProperty("车间代码")
+    private String workShopCode;
+
+    @ExcelProperty("班组")
+    private String team;
+
+    @ExcelProperty("班次")
+    private String shift;
+
+    @ExcelProperty("明细")
+    private String details;
+
+    @ExcelProperty("申请时间")
+    private LocalDateTime requestTime;
+
+    @ExcelProperty("要求截止时间")
+    private LocalDateTime requestDueTime;
+
+    @ExcelProperty("状态")
+    private String status;
+
+    @ExcelProperty("过期时间")
+    private LocalDateTime expiredTime;
+
+    @ExcelProperty("并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @ExcelProperty("状态")
+    private String jobStageStatus;
+
+    @ExcelProperty("优先级")
+    private Integer priority;
+
+    @ExcelProperty("优先级增量")
+    private Integer priorityIncrement;
+
+    @ExcelProperty("部门")
+    private String departmentCode;
+
+    @ExcelProperty("用户组")
+    private String userGroupCode;
+
+    @ExcelProperty("承接人用户ID")
+    private String acceptUserId;
+
+    @ExcelProperty("承接人用户名")
+    private String acceptUserName;
+
+    @ExcelProperty("承接时间")
+    private LocalDateTime acceptTime;
+
+    @ExcelProperty("完成人用户ID")
+    private String completeUserId;
+
+    @ExcelProperty("完成人用户名")
+    private String completeUserName;
+
+    @ExcelProperty("完成时间")
+    private LocalDateTime completeTime;
+
+    @ExcelProperty("到仓库代码")
+    private String toWarehouseCode;
+
+    @ExcelProperty("到库区代码范围")
+    private String toAreaCodes;
+
+    @ExcelProperty("从库区类型范围")
+    private String fromAreaTypes;
+
+    @ExcelProperty("到库区类型范围")
+    private String toAreaTypes;
+
+    @ExcelProperty("单据号")
+    private String number;
+
+    @ExcelProperty("业务类型")
+    private String businessType;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("扩展属性")
+    private String extraProperties;
+
+    @ExcelProperty("地点ID")
+    private String siteId;
+
+    @ExcelProperty("自动完成")
+    private String autoComplete;
+
+    @ExcelProperty("允许修改库位")
+    private String allowModifyLocation;
+
+    @ExcelProperty("允许修改数量")
+    private String allowModifyQty;
+
+    @ExcelProperty("允许大于推荐数量")
+    private String allowBiggerQty;
+
+    @ExcelProperty("允许小于推荐数量")
+    private String allowSmallerQty;
+
+    @ExcelProperty("允许修改库存状态")
+    private String allowModifyInventoryStatus;
+
+    @ExcelProperty("允许连续扫描")
+    private String allowContinuousScanning;
+
+    @ExcelProperty("允许部分完成")
+    private String allowPartialComplete;
+
+    @ExcelProperty("允许修改批次")
+    private String allowModifyBatch;
+
+    @ExcelProperty("允许修改箱码")
+    private String allowModifyPackingNumber;
+
+    @ExcelProperty("工作流流水号")
+    private String serialNumber;
+
+    @ExcelProperty("入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @ExcelProperty("出库库存状态范围")
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainExportReqVO.java

@@ -0,0 +1,157 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.win.framework.common.pojo.PageParam;
+import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 制品报废收货任务主 Excel 导出 Request VO，参数和 ProductscrapreceiptJobMainPageReqVO 是一致的")
+@Data
+public class ProductscrapreceiptJobMainExportReqVO {
+
+    @Schema(description = "申请单号")
+    private String requestNumber;
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workShopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "明细")
+    private String details;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] requestTime;
+
+    @Schema(description = "要求截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] requestDueTime;
+
+    @Schema(description = "状态", example = "1")
+    private String status;
+
+    @Schema(description = "过期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expiredTime;
+
+    @Schema(description = "并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "状态", example = "1")
+    private String jobStageStatus;
+
+    @Schema(description = "优先级")
+    private Integer priority;
+
+    @Schema(description = "优先级增量")
+    private Integer priorityIncrement;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "用户组")
+    private String userGroupCode;
+
+    @Schema(description = "承接人用户ID", example = "6918")
+    private String acceptUserId;
+
+    @Schema(description = "承接人用户名", example = "赵六")
+    private String acceptUserName;
+
+    @Schema(description = "承接时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] acceptTime;
+
+    @Schema(description = "完成人用户ID", example = "18858")
+    private String completeUserId;
+
+    @Schema(description = "完成人用户名", example = "王五")
+    private String completeUserName;
+
+    @Schema(description = "完成时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] completeTime;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+    @Schema(description = "从库区类型范围")
+    private String fromAreaTypes;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "16670")
+    private String siteId;
+
+    @Schema(description = "自动完成")
+    private String autoComplete;
+
+    @Schema(description = "允许修改库位")
+    private String allowModifyLocation;
+
+    @Schema(description = "允许修改数量")
+    private String allowModifyQty;
+
+    @Schema(description = "允许大于推荐数量")
+    private String allowBiggerQty;
+
+    @Schema(description = "允许小于推荐数量")
+    private String allowSmallerQty;
+
+    @Schema(description = "允许修改库存状态", example = "2")
+    private String allowModifyInventoryStatus;
+
+    @Schema(description = "允许连续扫描")
+    private String allowContinuousScanning;
+
+    @Schema(description = "允许部分完成")
+    private String allowPartialComplete;
+
+    @Schema(description = "允许修改批次")
+    private String allowModifyBatch;
+
+    @Schema(description = "允许修改箱码")
+    private String allowModifyPackingNumber;
+
+    @Schema(description = "工作流流水号")
+    private String serialNumber;
+
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainPageReqVO.java

@@ -0,0 +1,159 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.win.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 制品报废收货任务主分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobMainPageReqVO extends PageParam {
+
+    @Schema(description = "申请单号")
+    private String requestNumber;
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workShopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "明细")
+    private String details;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] requestTime;
+
+    @Schema(description = "要求截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] requestDueTime;
+
+    @Schema(description = "状态", example = "1")
+    private String status;
+
+    @Schema(description = "过期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expiredTime;
+
+    @Schema(description = "并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "状态", example = "1")
+    private String jobStageStatus;
+
+    @Schema(description = "优先级")
+    private Integer priority;
+
+    @Schema(description = "优先级增量")
+    private Integer priorityIncrement;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "用户组")
+    private String userGroupCode;
+
+    @Schema(description = "承接人用户ID", example = "6918")
+    private String acceptUserId;
+
+    @Schema(description = "承接人用户名", example = "赵六")
+    private String acceptUserName;
+
+    @Schema(description = "承接时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] acceptTime;
+
+    @Schema(description = "完成人用户ID", example = "18858")
+    private String completeUserId;
+
+    @Schema(description = "完成人用户名", example = "王五")
+    private String completeUserName;
+
+    @Schema(description = "完成时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] completeTime;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+    @Schema(description = "从库区类型范围")
+    private String fromAreaTypes;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "16670")
+    private String siteId;
+
+    @Schema(description = "自动完成")
+    private String autoComplete;
+
+    @Schema(description = "允许修改库位")
+    private String allowModifyLocation;
+
+    @Schema(description = "允许修改数量")
+    private String allowModifyQty;
+
+    @Schema(description = "允许大于推荐数量")
+    private String allowBiggerQty;
+
+    @Schema(description = "允许小于推荐数量")
+    private String allowSmallerQty;
+
+    @Schema(description = "允许修改库存状态", example = "2")
+    private String allowModifyInventoryStatus;
+
+    @Schema(description = "允许连续扫描")
+    private String allowContinuousScanning;
+
+    @Schema(description = "允许部分完成")
+    private String allowPartialComplete;
+
+    @Schema(description = "允许修改批次")
+    private String allowModifyBatch;
+
+    @Schema(description = "允许修改箱码")
+    private String allowModifyPackingNumber;
+
+    @Schema(description = "工作流流水号")
+    private String serialNumber;
+
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainRespVO.java

@@ -0,0 +1,19 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 制品报废收货任务主 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobMainRespVO extends ProductscrapreceiptJobMainBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8270")
+    private Long id;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptJob/vo/ProductscrapreceiptJobMainUpdateReqVO.java

@@ -0,0 +1,18 @@
+package com.win.module.wms.controller.productscrapreceiptJob.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 制品报废收货任务主更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptJobMainUpdateReqVO extends ProductscrapreceiptJobMainBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8270")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/ProductscrapreceiptRecordMainController.java

@@ -0,0 +1,135 @@
+package com.win.module.wms.controller.productscrapreceiptRecord;
+
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.*;
+import com.win.module.wms.convert.productscrapreceiptRecord.ProductscrapreceiptRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRecord.ProductscrapreceiptRecordMainDO;
+import com.win.module.wms.service.productscrapreceiptRecord.ProductscrapreceiptRecordMainService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
+
+import static com.win.framework.common.pojo.CommonResult.success;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+@Tag(name = "管理后台 - 制品报废收货记录主")
+@RestController
+@RequestMapping("/wms/productscrapreceipt-record-main")
+@Validated
+public class ProductscrapreceiptRecordMainController {
+
+    @Resource
+    private ProductscrapreceiptRecordMainService productscrapreceiptRecordMainService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建制品报废收货记录主")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:create')")
+    public CommonResult<Long> createProductscrapreceiptRecordMain(@Valid @RequestBody ProductscrapreceiptRecordMainCreateReqVO createReqVO) {
+        return success(productscrapreceiptRecordMainService.createProductscrapreceiptRecordMain(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新制品报废收货记录主")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:update')")
+    public CommonResult<Boolean> updateProductscrapreceiptRecordMain(@Valid @RequestBody ProductscrapreceiptRecordMainUpdateReqVO updateReqVO) {
+        int result = productscrapreceiptRecordMainService.updateProductscrapreceiptRecordMain(updateReqVO);
+        return success(result > 0);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除制品报废收货记录主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:delete')")
+    public CommonResult<Boolean> deleteProductscrapreceiptRecordMain(@RequestParam("id") Long id) {
+        int result = productscrapreceiptRecordMainService.deleteProductscrapreceiptRecordMain(id);
+        return success(result > 0);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得制品报废收货记录主")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:query')")
+    public CommonResult<ProductscrapreceiptRecordMainRespVO> getProductscrapreceiptRecordMain(@RequestParam("id") Long id) {
+        ProductscrapreceiptRecordMainDO productscrapreceiptRecordMain = productscrapreceiptRecordMainService.getProductscrapreceiptRecordMain(id);
+        return success(ProductscrapreceiptRecordMainConvert.INSTANCE.convert(productscrapreceiptRecordMain));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得制品报废收货记录主列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:query')")
+    public CommonResult<List<ProductscrapreceiptRecordMainRespVO>> getProductscrapreceiptRecordMainList(@RequestParam("ids") Collection<Long> ids) {
+        List<ProductscrapreceiptRecordMainDO> list = productscrapreceiptRecordMainService.getProductscrapreceiptRecordMainList(ids);
+        return success(ProductscrapreceiptRecordMainConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得制品报废收货记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:query')")
+    public CommonResult<PageResult<ProductscrapreceiptRecordMainRespVO>> getProductscrapreceiptRecordMainPage(@Valid ProductscrapreceiptRecordMainPageReqVO pageVO) {
+        PageResult<ProductscrapreceiptRecordMainDO> pageResult = productscrapreceiptRecordMainService.getProductscrapreceiptRecordMainPage(pageVO);
+        return success(ProductscrapreceiptRecordMainConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出制品报废收货记录主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductscrapreceiptRecordMainExcel(@Valid ProductscrapreceiptRecordMainExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptRecordMainDO> list = productscrapreceiptRecordMainService.getProductscrapreceiptRecordMainList(exportReqVO);
+        // 导出 Excel
+        List<ProductscrapreceiptRecordMainExcelVO> datas = ProductscrapreceiptRecordMainConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "制品报废收货记录主.xls", "数据", ProductscrapreceiptRecordMainExcelVO.class, datas);
+    }
+
+    @GetMapping("/get-import-template")
+    @Operation(summary = "获得导入制品报废收货记录主模板")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptRecordMainExcelVO> list = Arrays.asList();
+        // 输出
+        ExcelUtils.write(response, "制品报废收货记录主基本信息导入模板.xls", "制品报废收货记录主基本信息列表", ProductscrapreceiptRecordMainExcelVO.class, list);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "导入制品报废收货记录主基本信息")
+    @Parameters({
+    @Parameter(name = "file", description = "Excel 文件", required = true),
+    @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"),
+    @Parameter(name = "updatePart", description = "部分更新，默认为 true", example = "true")
+    })
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-record-main:import')")
+    public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
+                                                         @RequestParam("file") MultipartFile file,
+                                                         @RequestParam(value = "mode") Integer mode,
+                                                         @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception {
+
+        List<ProductscrapreceiptRecordMainExcelVO> list = ExcelUtils.read(file, ProductscrapreceiptRecordMainExcelVO.class);
+        List<ProductscrapreceiptRecordMainExcelVO> errorList = productscrapreceiptRecordMainService.importProductscrapreceiptRecordMainList(list, mode, updatePart);
+
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("errorCount", errorList.size());
+        if(!errorList.isEmpty()) {
+            String url = ExcelUtils.writeLocalFile("制品报废收货记录主基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
+            returnMap.put("errorFile", url);
+        }
+
+        return success(returnMap);
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainBaseVO.java

@@ -0,0 +1,106 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 制品报废收货记录主 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class ProductscrapreceiptRecordMainBaseVO {
+
+    @Schema(description = "申请单号")
+    private String requestNumber;
+
+    @Schema(description = "任务单号")
+    private String jobNumber;
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "明细")
+    private String details;
+
+    @Schema(description = "出库事务类型", example = "1")
+    private String outTransactionType;
+
+    @Schema(description = "入库事务类型", example = "2")
+    private String inTransactionType;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime executeTime;
+
+    @Schema(description = "生效日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime activeDate;
+
+    @Schema(description = "是否可用")
+    private String available;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime requestTime;
+
+    @Schema(description = "截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime dueTime;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "用户组")
+    private String userGroupCode;
+
+    @Schema(description = "接口类型", example = "2")
+    private String interfaceType;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "28678")
+    private String siteId;
+
+    @Schema(description = "代码")
+    private String code;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainCreateReqVO.java

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 制品报废收货记录主创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptRecordMainCreateReqVO extends ProductscrapreceiptRecordMainBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainExcelVO.java

@@ -0,0 +1,107 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * 制品报废收货记录主 Excel VO
+ *
+ * @author 超级管理员
+ */
+@Data
+public class ProductscrapreceiptRecordMainExcelVO {
+
+    @ExcelProperty("id")
+    private Long id;
+
+    @ExcelProperty("申请单号")
+    private String requestNumber;
+
+    @ExcelProperty("任务单号")
+    private String jobNumber;
+
+    @ExcelProperty("生产计划单号")
+    private String productionPlanNumber;
+
+    @ExcelProperty("车间代码")
+    private String workshopCode;
+
+    @ExcelProperty("班组")
+    private String team;
+
+    @ExcelProperty("班次")
+    private String shift;
+
+    @ExcelProperty("明细")
+    private String details;
+
+    @ExcelProperty("出库事务类型")
+    private String outTransactionType;
+
+    @ExcelProperty("入库事务类型")
+    private String inTransactionType;
+
+    @ExcelProperty("执行时间")
+    private LocalDateTime executeTime;
+
+    @ExcelProperty("生效日期")
+    private LocalDateTime activeDate;
+
+    @ExcelProperty("是否可用")
+    private String available;
+
+    @ExcelProperty("申请时间")
+    private LocalDateTime requestTime;
+
+    @ExcelProperty("截止时间")
+    private LocalDateTime dueTime;
+
+    @ExcelProperty("部门")
+    private String departmentCode;
+
+    @ExcelProperty("用户组")
+    private String userGroupCode;
+
+    @ExcelProperty("接口类型")
+    private String interfaceType;
+
+    @ExcelProperty("单据号")
+    private String number;
+
+    @ExcelProperty("业务类型")
+    private String businessType;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("扩展属性")
+    private String extraProperties;
+
+    @ExcelProperty("地点ID")
+    private String siteId;
+
+    @ExcelProperty("代码")
+    private String code;
+
+    @ExcelProperty("到仓库代码")
+    private String toWarehouseCode;
+
+    @ExcelProperty("到库区类型范围")
+    private String toAreaTypes;
+
+    @ExcelProperty("到库区代码范围")
+    private String toAreaCodes;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainExportReqVO.java

@@ -0,0 +1,102 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.win.framework.common.pojo.PageParam;
+import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 制品报废收货记录主 Excel 导出 Request VO，参数和 ProductscrapreceiptRecordMainPageReqVO 是一致的")
+@Data
+public class ProductscrapreceiptRecordMainExportReqVO {
+
+    @Schema(description = "申请单号")
+    private String requestNumber;
+
+    @Schema(description = "任务单号")
+    private String jobNumber;
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "明细")
+    private String details;
+
+    @Schema(description = "出库事务类型", example = "1")
+    private String outTransactionType;
+
+    @Schema(description = "入库事务类型", example = "2")
+    private String inTransactionType;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] executeTime;
+
+    @Schema(description = "生效日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] activeDate;
+
+    @Schema(description = "是否可用")
+    private String available;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] requestTime;
+
+    @Schema(description = "截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] dueTime;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "用户组")
+    private String userGroupCode;
+
+    @Schema(description = "接口类型", example = "2")
+    private String interfaceType;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "28678")
+    private String siteId;
+
+    @Schema(description = "代码")
+    private String code;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainPageReqVO.java

@@ -0,0 +1,104 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.win.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 制品报废收货记录主分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptRecordMainPageReqVO extends PageParam {
+
+    @Schema(description = "申请单号")
+    private String requestNumber;
+
+    @Schema(description = "任务单号")
+    private String jobNumber;
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "明细")
+    private String details;
+
+    @Schema(description = "出库事务类型", example = "1")
+    private String outTransactionType;
+
+    @Schema(description = "入库事务类型", example = "2")
+    private String inTransactionType;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] executeTime;
+
+    @Schema(description = "生效日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] activeDate;
+
+    @Schema(description = "是否可用")
+    private String available;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] requestTime;
+
+    @Schema(description = "截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] dueTime;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "用户组")
+    private String userGroupCode;
+
+    @Schema(description = "接口类型", example = "2")
+    private String interfaceType;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "28678")
+    private String siteId;
+
+    @Schema(description = "代码")
+    private String code;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainRespVO.java

@@ -0,0 +1,19 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 制品报废收货记录主 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptRecordMainRespVO extends ProductscrapreceiptRecordMainBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25040")
+    private Long id;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRecord/vo/ProductscrapreceiptRecordMainUpdateReqVO.java

@@ -0,0 +1,18 @@
+package com.win.module.wms.controller.productscrapreceiptRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 制品报废收货记录主更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptRecordMainUpdateReqVO extends ProductscrapreceiptRecordMainBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25040")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/ProductscrapreceiptDetailController.java

@@ -0,0 +1,135 @@
+package com.win.module.wms.controller.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.*;
+import com.win.module.wms.convert.productscrapreceiptRequest.ProductscrapreceiptDetailConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptDetailDO;
+import com.win.module.wms.service.productscrapreceiptRequest.ProductscrapreceiptDetailService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
+
+import static com.win.framework.common.pojo.CommonResult.success;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+@Tag(name = "管理后台 - 制品报废收货申请子")
+@RestController
+@RequestMapping("/wms/productscrapreceipt-detail")
+@Validated
+public class ProductscrapreceiptDetailController {
+
+    @Resource
+    private ProductscrapreceiptDetailService productscrapreceiptDetailService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建制品报废收货申请子")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:create')")
+    public CommonResult<Long> createProductscrapreceiptDetail(@Valid @RequestBody ProductscrapreceiptDetailCreateReqVO createReqVO) {
+        return success(productscrapreceiptDetailService.createProductscrapreceiptDetail(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新制品报废收货申请子")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:update')")
+    public CommonResult<Boolean> updateProductscrapreceiptDetail(@Valid @RequestBody ProductscrapreceiptDetailUpdateReqVO updateReqVO) {
+        int result = productscrapreceiptDetailService.updateProductscrapreceiptDetail(updateReqVO);
+        return success(result > 0);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除制品报废收货申请子")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:delete')")
+    public CommonResult<Boolean> deleteProductscrapreceiptDetail(@RequestParam("id") Long id) {
+        int result = productscrapreceiptDetailService.deleteProductscrapreceiptDetail(id);
+        return success(result > 0);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得制品报废收货申请子")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:query')")
+    public CommonResult<ProductscrapreceiptDetailRespVO> getProductscrapreceiptDetail(@RequestParam("id") Long id) {
+        ProductscrapreceiptDetailDO productscrapreceiptDetail = productscrapreceiptDetailService.getProductscrapreceiptDetail(id);
+        return success(ProductscrapreceiptDetailConvert.INSTANCE.convert(productscrapreceiptDetail));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得制品报废收货申请子列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:query')")
+    public CommonResult<List<ProductscrapreceiptDetailRespVO>> getProductscrapreceiptDetailList(@RequestParam("ids") Collection<Long> ids) {
+        List<ProductscrapreceiptDetailDO> list = productscrapreceiptDetailService.getProductscrapreceiptDetailList(ids);
+        return success(ProductscrapreceiptDetailConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得制品报废收货申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:query')")
+    public CommonResult<PageResult<ProductscrapreceiptDetailRespVO>> getProductscrapreceiptDetailPage(@Valid ProductscrapreceiptDetailPageReqVO pageVO) {
+        PageResult<ProductscrapreceiptDetailDO> pageResult = productscrapreceiptDetailService.getProductscrapreceiptDetailPage(pageVO);
+        return success(ProductscrapreceiptDetailConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出制品报废收货申请子 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductscrapreceiptDetailExcel(@Valid ProductscrapreceiptDetailExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptDetailDO> list = productscrapreceiptDetailService.getProductscrapreceiptDetailList(exportReqVO);
+        // 导出 Excel
+        List<ProductscrapreceiptDetailExcelVO> datas = ProductscrapreceiptDetailConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "制品报废收货申请子.xls", "数据", ProductscrapreceiptDetailExcelVO.class, datas);
+    }
+
+    @GetMapping("/get-import-template")
+    @Operation(summary = "获得导入制品报废收货申请子模板")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptDetailExcelVO> list = Arrays.asList();
+        // 输出
+        ExcelUtils.write(response, "制品报废收货申请子基本信息导入模板.xls", "制品报废收货申请子基本信息列表", ProductscrapreceiptDetailExcelVO.class, list);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "导入制品报废收货申请子基本信息")
+    @Parameters({
+    @Parameter(name = "file", description = "Excel 文件", required = true),
+    @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"),
+    @Parameter(name = "updatePart", description = "部分更新，默认为 true", example = "true")
+    })
+    @PreAuthorize("@ss.hasPermission('wms:productscrapreceipt-detail:import')")
+    public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
+                                                         @RequestParam("file") MultipartFile file,
+                                                         @RequestParam(value = "mode") Integer mode,
+                                                         @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception {
+
+        List<ProductscrapreceiptDetailExcelVO> list = ExcelUtils.read(file, ProductscrapreceiptDetailExcelVO.class);
+        List<ProductscrapreceiptDetailExcelVO> errorList = productscrapreceiptDetailService.importProductscrapreceiptDetailList(list, mode, updatePart);
+
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("errorCount", errorList.size());
+        if(!errorList.isEmpty()) {
+            String url = ExcelUtils.writeLocalFile("制品报废收货申请子基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
+            returnMap.put("errorFile", url);
+        }
+
+        return success(returnMap);
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/ProductscrapreceiptMainController.java

@@ -0,0 +1,136 @@
+package com.win.module.wms.controller.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.*;
+import com.win.module.wms.convert.productscrapreceiptRequest.ProductscrapreceiptMainConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptMainDO;
+import com.win.module.wms.service.productscrapreceiptRequest.ProductscrapreceiptMainService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
+
+import static com.win.framework.common.pojo.CommonResult.success;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+
+@Tag(name = "管理后台 - 制品报废收货申请主")
+@RestController
+@RequestMapping("/wms/productscrapreceipt-main")
+@Validated
+public class ProductscrapreceiptMainController {
+
+    @Resource
+    private ProductscrapreceiptMainService productscrapreceiptMainService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建制品报废收货申请主")
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:create')")
+    public CommonResult<Long> createProductscrapreceiptMain(@Valid @RequestBody ProductscrapreceiptMainCreateReqVO createReqVO) {
+        return success(productscrapreceiptMainService.createProductscrapreceiptMain(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新制品报废收货申请主")
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:update')")
+    public CommonResult<Boolean> updateProductscrapreceiptMain(@Valid @RequestBody ProductscrapreceiptMainUpdateReqVO updateReqVO) {
+        int result = productscrapreceiptMainService.updateProductscrapreceiptMain(updateReqVO);
+        return success(result > 0);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除制品报废收货申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:delete')")
+    public CommonResult<Boolean> deleteProductscrapreceiptMain(@RequestParam("id") Long id) {
+        int result = productscrapreceiptMainService.deleteProductscrapreceiptMain(id);
+        return success(result > 0);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得制品报废收货申请主")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:query')")
+    public CommonResult<ProductscrapreceiptMainRespVO> getProductscrapreceiptMain(@RequestParam("id") Long id) {
+        ProductscrapreceiptMainDO productscrapreceiptMain = productscrapreceiptMainService.getProductscrapreceiptMain(id);
+        return success(ProductscrapreceiptMainConvert.INSTANCE.convert(productscrapreceiptMain));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得制品报废收货申请主列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:query')")
+    public CommonResult<List<ProductscrapreceiptMainRespVO>> getProductscrapreceiptMainList(@RequestParam("ids") Collection<Long> ids) {
+        List<ProductscrapreceiptMainDO> list = productscrapreceiptMainService.getProductscrapreceiptMainList(ids);
+        return success(ProductscrapreceiptMainConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得制品报废收货申请主分页")
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:query')")
+    public CommonResult<PageResult<ProductscrapreceiptMainRespVO>> getProductscrapreceiptMainPage(@Valid ProductscrapreceiptMainPageReqVO pageVO) {
+        PageResult<ProductscrapreceiptMainDO> pageResult = productscrapreceiptMainService.getProductscrapreceiptMainPage(pageVO);
+        return success(ProductscrapreceiptMainConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出制品报废收货申请主 Excel")
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductscrapreceiptMainExcel(@Valid ProductscrapreceiptMainExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptMainDO> list = productscrapreceiptMainService.getProductscrapreceiptMainList(exportReqVO);
+        // 导出 Excel
+        List<ProductscrapreceiptMainExcelVO> datas = ProductscrapreceiptMainConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "制品报废收货申请主.xls", "数据", ProductscrapreceiptMainExcelVO.class, datas);
+    }
+
+    @GetMapping("/get-import-template")
+    @Operation(summary = "获得导入制品报废收货申请主模板")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        List<ProductscrapreceiptMainExcelVO> list = Arrays.asList();
+        // 输出
+        ExcelUtils.write(response, "制品报废收货申请主基本信息导入模板.xls", "制品报废收货申请主基本信息列表", ProductscrapreceiptMainExcelVO.class, list);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "导入制品报废收货申请主基本信息")
+    @Parameters({
+    @Parameter(name = "file", description = "Excel 文件", required = true),
+    @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"),
+    @Parameter(name = "updatePart", description = "部分更新，默认为 true", example = "true")
+    })
+    @PreAuthorize("@ss.hasPermission('ProductscrapreceiptRequest:productscrapreceipt-main:import')")
+    public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
+                                                         @RequestParam("file") MultipartFile file,
+                                                         @RequestParam(value = "mode") Integer mode,
+                                                         @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception {
+
+        List<ProductscrapreceiptMainExcelVO> list = ExcelUtils.read(file, ProductscrapreceiptMainExcelVO.class);
+        List<ProductscrapreceiptMainExcelVO> errorList = productscrapreceiptMainService.importProductscrapreceiptMainList(list, mode, updatePart);
+
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("errorCount", errorList.size());
+        if(!errorList.isEmpty()) {
+            String url = ExcelUtils.writeLocalFile("制品报废收货申请主基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
+            returnMap.put("errorFile", url);
+        }
+
+        return success(returnMap);
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailBaseVO.java

@@ -0,0 +1,110 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 制品报废收货申请子 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class ProductscrapreceiptDetailBaseVO {
+
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "目标库位")
+    private String toLocationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
+
+    @Schema(description = "包装号")
+    private String packingNumber;
+
+    @Schema(description = "器具号")
+    private String containerNumber;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime produceDate;
+
+    @Schema(description = "过期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime expireDate;
+
+    @Schema(description = "库存状态", example = "2")
+    private String inventoryStatus;
+
+    @Schema(description = "订单号")
+    private String woNumber;
+
+    @Schema(description = "订单行")
+    private String woLine;
+
+    @Schema(description = "包装数量")
+    private BigDecimal packQty;
+
+    @Schema(description = "包装规格")
+    private String packUnit;
+
+    @Schema(description = "BOM版本")
+    private String bomVersion;
+
+    @Schema(description = "BackFlushDetails")
+    private String backFlushDetails;
+
+    @Schema(description = "主表ID", example = "29914")
+    private Long masterId;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "物品代码")
+    private String itemCode;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "地点ID", example = "4837")
+    private String siteId;
+
+    @Schema(description = "物品名称", example = "赵六")
+    private String itemName;
+
+    @Schema(description = "物品描述1")
+    private String itemDesc1;
+
+    @Schema(description = "物品描述2")
+    private String itemDesc2;
+
+    @Schema(description = "项目代码")
+    private String projectCode;
+
+    @Schema(description = "数量")
+    private Double qty;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "并发乐观锁", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "并发乐观锁不能为空")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailCreateReqVO.java

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品报废收货申请子创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptDetailCreateReqVO extends ProductscrapreceiptDetailBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailExcelVO.java

@@ -0,0 +1,110 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 制品报废收货申请子 Excel VO
+ *
+ * @author 超级管理员
+ */
+@Data
+public class ProductscrapreceiptDetailExcelVO {
+
+    @ExcelProperty("id")
+    private Long id;
+
+    @ExcelProperty("生产线代码")
+    private String productionLineCode;
+
+    @ExcelProperty("工位代码")
+    private String workStationCode;
+
+    @ExcelProperty("目标库位")
+    private String toLocationCode;
+
+    @ExcelProperty("工序代码")
+    private String processCode;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("器具号")
+    private String containerNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty("生产日期")
+    private LocalDateTime produceDate;
+
+    @ExcelProperty("过期日期")
+    private LocalDateTime expireDate;
+
+    @ExcelProperty("库存状态")
+    private String inventoryStatus;
+
+    @ExcelProperty("订单号")
+    private String woNumber;
+
+    @ExcelProperty("订单行")
+    private String woLine;
+
+    @ExcelProperty("包装数量")
+    private BigDecimal packQty;
+
+    @ExcelProperty("包装规格")
+    private String packUnit;
+
+    @ExcelProperty("BOM版本")
+    private String bomVersion;
+
+    @ExcelProperty("BackFlushDetails")
+    private String backFlushDetails;
+
+    @ExcelProperty("主表ID")
+    private Long masterId;
+
+    @ExcelProperty("单据号")
+    private String number;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("地点ID")
+    private String siteId;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private Double qty;
+
+    @ExcelProperty("计量单位")
+    private String uom;
+
+    @ExcelProperty("并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @ExcelProperty("到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailExportReqVO.java

@@ -0,0 +1,109 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+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;
+
+@Schema(description = "管理后台 - 制品报废收货申请子 Excel 导出 Request VO，参数和 ProductscrapreceiptDetailPageReqVO 是一致的")
+@Data
+public class ProductscrapreceiptDetailExportReqVO {
+
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "目标库位")
+    private String toLocationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
+
+    @Schema(description = "包装号")
+    private String packingNumber;
+
+    @Schema(description = "器具号")
+    private String containerNumber;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] produceDate;
+
+    @Schema(description = "过期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expireDate;
+
+    @Schema(description = "库存状态", example = "2")
+    private String inventoryStatus;
+
+    @Schema(description = "订单号")
+    private String woNumber;
+
+    @Schema(description = "订单行")
+    private String woLine;
+
+    @Schema(description = "包装数量")
+    private BigDecimal packQty;
+
+    @Schema(description = "包装规格")
+    private String packUnit;
+
+    @Schema(description = "BOM版本")
+    private String bomVersion;
+
+    @Schema(description = "BackFlushDetails")
+    private String backFlushDetails;
+
+    @Schema(description = "主表ID", example = "29914")
+    private Long masterId;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "物品代码")
+    private String itemCode;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "地点ID", example = "4837")
+    private String siteId;
+
+    @Schema(description = "物品名称", example = "赵六")
+    private String itemName;
+
+    @Schema(description = "物品描述1")
+    private String itemDesc1;
+
+    @Schema(description = "物品描述2")
+    private String itemDesc2;
+
+    @Schema(description = "项目代码")
+    private String projectCode;
+
+    @Schema(description = "数量")
+    private Double qty;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailPageReqVO.java

@@ -0,0 +1,114 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+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;
+
+@Schema(description = "管理后台 - 制品报废收货申请子分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptDetailPageReqVO extends PageParam {
+
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "目标库位")
+    private String toLocationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
+
+    @Schema(description = "包装号")
+    private String packingNumber;
+
+    @Schema(description = "器具号")
+    private String containerNumber;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] produceDate;
+
+    @Schema(description = "过期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expireDate;
+
+    @Schema(description = "库存状态", example = "2")
+    private String inventoryStatus;
+
+    @Schema(description = "订单号")
+    private String woNumber;
+
+    @Schema(description = "订单行")
+    private String woLine;
+
+    @Schema(description = "包装数量")
+    private BigDecimal packQty;
+
+    @Schema(description = "包装规格")
+    private String packUnit;
+
+    @Schema(description = "BOM版本")
+    private String bomVersion;
+
+    @Schema(description = "BackFlushDetails")
+    private String backFlushDetails;
+
+    @Schema(description = "主表ID", example = "29914")
+    private Long masterId;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "物品代码")
+    private String itemCode;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "地点ID", example = "4837")
+    private String siteId;
+
+    @Schema(description = "物品名称", example = "赵六")
+    private String itemName;
+
+    @Schema(description = "物品描述1")
+    private String itemDesc1;
+
+    @Schema(description = "物品描述2")
+    private String itemDesc2;
+
+    @Schema(description = "项目代码")
+    private String projectCode;
+
+    @Schema(description = "数量")
+    private Double qty;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "到货主代码")
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailRespVO.java

@@ -0,0 +1,19 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 制品报废收货申请子 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptDetailRespVO extends ProductscrapreceiptDetailBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13748")
+    private Long id;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptDetailUpdateReqVO.java

@@ -0,0 +1,20 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 制品报废收货申请子更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptDetailUpdateReqVO extends ProductscrapreceiptDetailBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13748")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainBaseVO.java

@@ -0,0 +1,104 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 制品报废收货申请主 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class ProductscrapreceiptMainBaseVO {
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
+    @Schema(description = "到仓库代码")
+    private String toWarehouseCode;
+
+    @Schema(description = "到库区类型范围")
+    private String toAreaTypes;
+
+    @Schema(description = "到库区代码范围")
+    private String toAreaCodes;
+
+    @Schema(description = "details")
+    private String details;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "业务类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "扩展属性")
+    private String extraProperties;
+
+    @Schema(description = "地点ID", example = "24393")
+    private String siteId;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime requestTime;
+
+    @Schema(description = "截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime dueTime;
+
+    @Schema(description = "部门")
+    private String departmentCode;
+
+    @Schema(description = "状态", example = "2")
+    private String status;
+
+    @Schema(description = "自动提交", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "自动提交不能为空")
+    private String autoCommit;
+
+    @Schema(description = "自动通过", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "自动通过不能为空")
+    private String autoAgree;
+
+    @Schema(description = "自动执行", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "自动执行不能为空")
+    private String autoExecute;
+
+    @Schema(description = "直接生成记录", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "直接生成记录不能为空")
+    private String directCreateRecord;
+
+    @Schema(description = "并发乐观锁", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "并发乐观锁不能为空")
+    private Integer concurrencyStamp;
+
+    @Schema(description = "权限所属人员id", example = "27211")
+    private Long ruleUserId;
+
+    @Schema(description = "工作流流水号")
+    private String serialNumber;
+
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainCreateReqVO.java

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品报废收货申请主创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptMainCreateReqVO extends ProductscrapreceiptMainBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainExcelVO.java

@@ -0,0 +1,100 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 制品报废收货申请主 Excel VO
+ *
+ * @author 超级管理员
+ */
+@Data
+public class ProductscrapreceiptMainExcelVO {
+
+    @ExcelProperty("id")
+    private Long id;
+
+    @ExcelProperty("生产计划单号")
+    private String productionPlanNumber;
+
+    @ExcelProperty("车间代码")
+    private String workshopCode;
+
+    @ExcelProperty("班组")
+    private String team;
+
+    @ExcelProperty("班次")
+    private String shift;
+
+    @ExcelProperty("到仓库代码")
+    private String toWarehouseCode;
+
+    @ExcelProperty("到库区类型范围")
+    private String toAreaTypes;
+
+    @ExcelProperty("到库区代码范围")
+    private String toAreaCodes;
+
+    @ExcelProperty("details")
+    private String details;
+
+    @ExcelProperty("单据号")
+    private String number;
+
+    @ExcelProperty("业务类型")
+    private String businessType;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("扩展属性")
+    private String extraProperties;
+
+    @ExcelProperty("地点ID")
+    private String siteId;
+
+    @ExcelProperty("申请时间")
+    private LocalDateTime requestTime;
+
+    @ExcelProperty("截止时间")
+    private LocalDateTime dueTime;
+
+    @ExcelProperty("部门")
+    private String departmentCode;
+
+    @ExcelProperty("状态")
+    private String status;
+
+    @ExcelProperty("自动提交")
+    private String autoCommit;
+
+    @ExcelProperty("自动通过")
+    private String autoAgree;
+
+    @ExcelProperty("自动执行")
+    private String autoExecute;
+
+    @ExcelProperty("直接生成记录")
+    private String directCreateRecord;
+
+    @ExcelProperty("并发乐观锁")
+    private Integer concurrencyStamp;
+
+    @ExcelProperty("权限所属人员id")
+    private Long ruleUserId;
+
+    @ExcelProperty("工作流流水号")
+    private String serialNumber;
+
+    @ExcelProperty("入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @ExcelProperty("出库库存状态范围")
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainExportReqVO.java

@@ -0,0 +1,22 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 制品报废收货申请主 Excel 导出 Request VO，参数和 ProductscrapreceiptMainPageReqVO 是一致的")
+@Data
+public class ProductscrapreceiptMainExportReqVO {
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "状态", example = "2")
+    private String status;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainPageReqVO.java

@@ -0,0 +1,27 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品报废收货申请主分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptMainPageReqVO extends PageParam {
+
+    @Schema(description = "生产计划单号")
+    private String productionPlanNumber;
+
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "单据号")
+    private String number;
+
+    @Schema(description = "状态", example = "2")
+    private String status;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainRespVO.java

@@ -0,0 +1,22 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 制品报废收货申请主 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptMainRespVO extends ProductscrapreceiptMainBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10220")
+    private Long id;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapreceiptRequest/vo/ProductscrapreceiptMainUpdateReqVO.java

@@ -0,0 +1,20 @@
+package com.win.module.wms.controller.productscrapreceiptRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 制品报废收货申请主更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductscrapreceiptMainUpdateReqVO extends ProductscrapreceiptMainBaseVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10220")
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapreceiptJob/ProductscrapreceiptJobDetailConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobDetailCreateReqVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobDetailExcelVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobDetailRespVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobDetailUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobDetailDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品报废收货任务子 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptJobDetailConvert {
+
+    ProductscrapreceiptJobDetailConvert INSTANCE = Mappers.getMapper(ProductscrapreceiptJobDetailConvert.class);
+
+    ProductscrapreceiptJobDetailDO convert(ProductscrapreceiptJobDetailCreateReqVO bean);
+
+    ProductscrapreceiptJobDetailDO convert(ProductscrapreceiptJobDetailUpdateReqVO bean);
+
+    ProductscrapreceiptJobDetailRespVO convert(ProductscrapreceiptJobDetailDO bean);
+
+    List<ProductscrapreceiptJobDetailRespVO> convertList(List<ProductscrapreceiptJobDetailDO> list);
+
+    PageResult<ProductscrapreceiptJobDetailRespVO> convertPage(PageResult<ProductscrapreceiptJobDetailDO> page);
+
+    List<ProductscrapreceiptJobDetailExcelVO> convertList02(List<ProductscrapreceiptJobDetailDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapreceiptJob/ProductscrapreceiptJobMainConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobMainCreateReqVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobMainExcelVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobMainRespVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobMainDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品报废收货任务主 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptJobMainConvert {
+
+    ProductscrapreceiptJobMainConvert INSTANCE = Mappers.getMapper(ProductscrapreceiptJobMainConvert.class);
+
+    ProductscrapreceiptJobMainDO convert(ProductscrapreceiptJobMainCreateReqVO bean);
+
+    ProductscrapreceiptJobMainDO convert(ProductscrapreceiptJobMainUpdateReqVO bean);
+
+    ProductscrapreceiptJobMainRespVO convert(ProductscrapreceiptJobMainDO bean);
+
+    List<ProductscrapreceiptJobMainRespVO> convertList(List<ProductscrapreceiptJobMainDO> list);
+
+    PageResult<ProductscrapreceiptJobMainRespVO> convertPage(PageResult<ProductscrapreceiptJobMainDO> page);
+
+    List<ProductscrapreceiptJobMainExcelVO> convertList02(List<ProductscrapreceiptJobMainDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapreceiptRecord/ProductscrapreceiptRecordMainConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productscrapreceiptRecord;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.ProductscrapreceiptRecordMainCreateReqVO;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.ProductscrapreceiptRecordMainExcelVO;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.ProductscrapreceiptRecordMainRespVO;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.ProductscrapreceiptRecordMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRecord.ProductscrapreceiptRecordMainDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品报废收货记录主 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptRecordMainConvert {
+
+    ProductscrapreceiptRecordMainConvert INSTANCE = Mappers.getMapper(ProductscrapreceiptRecordMainConvert.class);
+
+    ProductscrapreceiptRecordMainDO convert(ProductscrapreceiptRecordMainCreateReqVO bean);
+
+    ProductscrapreceiptRecordMainDO convert(ProductscrapreceiptRecordMainUpdateReqVO bean);
+
+    ProductscrapreceiptRecordMainRespVO convert(ProductscrapreceiptRecordMainDO bean);
+
+    List<ProductscrapreceiptRecordMainRespVO> convertList(List<ProductscrapreceiptRecordMainDO> list);
+
+    PageResult<ProductscrapreceiptRecordMainRespVO> convertPage(PageResult<ProductscrapreceiptRecordMainDO> page);
+
+    List<ProductscrapreceiptRecordMainExcelVO> convertList02(List<ProductscrapreceiptRecordMainDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapreceiptRequest/ProductscrapreceiptDetailConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptDetailCreateReqVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptDetailExcelVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptDetailRespVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptDetailUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptDetailDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品报废收货申请子 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptDetailConvert {
+
+    ProductscrapreceiptDetailConvert INSTANCE = Mappers.getMapper(ProductscrapreceiptDetailConvert.class);
+
+    ProductscrapreceiptDetailDO convert(ProductscrapreceiptDetailCreateReqVO bean);
+
+    ProductscrapreceiptDetailDO convert(ProductscrapreceiptDetailUpdateReqVO bean);
+
+    ProductscrapreceiptDetailRespVO convert(ProductscrapreceiptDetailDO bean);
+
+    List<ProductscrapreceiptDetailRespVO> convertList(List<ProductscrapreceiptDetailDO> list);
+
+    PageResult<ProductscrapreceiptDetailRespVO> convertPage(PageResult<ProductscrapreceiptDetailDO> page);
+
+    List<ProductscrapreceiptDetailExcelVO> convertList02(List<ProductscrapreceiptDetailDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapreceiptRequest/ProductscrapreceiptMainConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptMainCreateReqVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptMainExcelVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptMainRespVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptMainDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品报废收货申请主 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptMainConvert {
+
+    ProductscrapreceiptMainConvert INSTANCE = Mappers.getMapper(ProductscrapreceiptMainConvert.class);
+
+    ProductscrapreceiptMainDO convert(ProductscrapreceiptMainCreateReqVO bean);
+
+    ProductscrapreceiptMainDO convert(ProductscrapreceiptMainUpdateReqVO bean);
+
+    ProductscrapreceiptMainRespVO convert(ProductscrapreceiptMainDO bean);
+
+    List<ProductscrapreceiptMainRespVO> convertList(List<ProductscrapreceiptMainDO> list);
+
+    PageResult<ProductscrapreceiptMainRespVO> convertPage(PageResult<ProductscrapreceiptMainDO> page);
+
+    List<ProductscrapreceiptMainExcelVO> convertList02(List<ProductscrapreceiptMainDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapreceiptJob/ProductscrapreceiptJobDetailDO.java

@@ -0,0 +1,142 @@
+package com.win.module.wms.dal.dataobject.productscrapreceiptJob;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 制品报废收货任务子 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("job_productscrapreceipt_detail")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductscrapreceiptJobDetailDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 生产线代码
+     */
+    private String productionLineCode;
+    /**
+     * 工位代码
+     */
+    private String workStationCode;
+    /**
+     * 工序代码
+     */
+    private String processCode;
+    /**
+     * 包装号
+     */
+    private String packingNumber;
+    /**
+     * 器具号
+     */
+    private String containerNumber;
+    /**
+     * 批次
+     */
+    private String batch;
+    /**
+     * 生产日期
+     */
+    private LocalDateTime produceDate;
+    /**
+     * 过期日期
+     */
+    private LocalDateTime expireDate;
+    /**
+     * 库存状态
+     */
+    private String inventoryStatus;
+    /**
+     * 到库位代码
+     */
+    private String toLocationCode;
+    /**
+     * 订单号
+     */
+    private String woNumber;
+    /**
+     * 订单行
+     */
+    private String woLine;
+    /**
+     * 包装数量
+     */
+    private BigDecimal packQty;
+    /**
+     * 包装规格
+     */
+    private String packUnit;
+    /**
+     * 明细
+     */
+    private String backFlushDetails;
+    /**
+     * 物品代码
+     */
+    private String itemCode;
+    /**
+     * 物品名称
+     */
+    private String itemName;
+    /**
+     * 物品描述1
+     */
+    private String itemDesc1;
+    /**
+     * 物品描述2
+     */
+    private String itemDesc2;
+    /**
+     * 项目代码
+     */
+    private String projectCode;
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+    /**
+     * 计量单位
+     */
+    private String uom;
+    /**
+     * 主表ID
+     */
+    private Long masterId;
+    /**
+     * 单据号
+     */
+    private String number;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 地点ID
+     */
+    private String siteId;
+    /**
+     * 到货主代码
+     */
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapreceiptJob/ProductscrapreceiptJobMainDO.java

@@ -0,0 +1,206 @@
+package com.win.module.wms.dal.dataobject.productscrapreceiptJob;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 制品报废收货任务主 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("job_productscrapreceipt_main")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductscrapreceiptJobMainDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 申请单号
+     */
+    private String requestNumber;
+    /**
+     * 生产计划单号
+     */
+    private String productionPlanNumber;
+    /**
+     * 车间代码
+     */
+    private String workShopCode;
+    /**
+     * 班组
+     */
+    private String team;
+    /**
+     * 班次
+     */
+    private String shift;
+    /**
+     * 明细
+     */
+    private String details;
+    /**
+     * 申请时间
+     */
+    private LocalDateTime requestTime;
+    /**
+     * 要求截止时间
+     */
+    private LocalDateTime requestDueTime;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expiredTime;
+    /**
+     * 并发乐观锁
+     */
+    private Integer concurrencyStamp;
+    /**
+     * 状态
+     */
+    private String jobStageStatus;
+    /**
+     * 优先级
+     */
+    private Integer priority;
+    /**
+     * 优先级增量
+     */
+    private Integer priorityIncrement;
+    /**
+     * 部门
+     */
+    private String departmentCode;
+    /**
+     * 用户组
+     */
+    private String userGroupCode;
+    /**
+     * 承接人用户ID
+     */
+    private String acceptUserId;
+    /**
+     * 承接人用户名
+     */
+    private String acceptUserName;
+    /**
+     * 承接时间
+     */
+    private LocalDateTime acceptTime;
+    /**
+     * 完成人用户ID
+     */
+    private String completeUserId;
+    /**
+     * 完成人用户名
+     */
+    private String completeUserName;
+    /**
+     * 完成时间
+     */
+    private LocalDateTime completeTime;
+    /**
+     * 到仓库代码
+     */
+    private String toWarehouseCode;
+    /**
+     * 到库区代码范围
+     */
+    private String toAreaCodes;
+    /**
+     * 从库区类型范围
+     */
+    private String fromAreaTypes;
+    /**
+     * 到库区类型范围
+     */
+    private String toAreaTypes;
+    /**
+     * 单据号
+     */
+    private String number;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 扩展属性
+     */
+    private String extraProperties;
+    /**
+     * 地点ID
+     */
+    private String siteId;
+    /**
+     * 自动完成
+     */
+    private String autoComplete;
+    /**
+     * 允许修改库位
+     */
+    private String allowModifyLocation;
+    /**
+     * 允许修改数量
+     */
+    private String allowModifyQty;
+    /**
+     * 允许大于推荐数量
+     */
+    private String allowBiggerQty;
+    /**
+     * 允许小于推荐数量
+     */
+    private String allowSmallerQty;
+    /**
+     * 允许修改库存状态
+     */
+    private String allowModifyInventoryStatus;
+    /**
+     * 允许连续扫描
+     */
+    private String allowContinuousScanning;
+    /**
+     * 允许部分完成
+     */
+    private String allowPartialComplete;
+    /**
+     * 允许修改批次
+     */
+    private String allowModifyBatch;
+    /**
+     * 允许修改箱码
+     */
+    private String allowModifyPackingNumber;
+    /**
+     * 工作流流水号
+     */
+    private String serialNumber;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapreceiptRecord/ProductscrapreceiptRecordMainDO.java

@@ -0,0 +1,138 @@
+package com.win.module.wms.dal.dataobject.productscrapreceiptRecord;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 制品报废收货记录主 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("record_productscrapreceipt_main")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductscrapreceiptRecordMainDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 申请单号
+     */
+    private String requestNumber;
+    /**
+     * 任务单号
+     */
+    private String jobNumber;
+    /**
+     * 生产计划单号
+     */
+    private String productionPlanNumber;
+    /**
+     * 车间代码
+     */
+    private String workshopCode;
+    /**
+     * 班组
+     */
+    private String team;
+    /**
+     * 班次
+     */
+    private String shift;
+    /**
+     * 明细
+     */
+    private String details;
+    /**
+     * 出库事务类型
+     */
+    private String outTransactionType;
+    /**
+     * 入库事务类型
+     */
+    private String inTransactionType;
+    /**
+     * 执行时间
+     */
+    private LocalDateTime executeTime;
+    /**
+     * 生效日期
+     */
+    private LocalDateTime activeDate;
+    /**
+     * 是否可用
+     */
+    private String available;
+    /**
+     * 申请时间
+     */
+    private LocalDateTime requestTime;
+    /**
+     * 截止时间
+     */
+    private LocalDateTime dueTime;
+    /**
+     * 部门
+     */
+    private String departmentCode;
+    /**
+     * 用户组
+     */
+    private String userGroupCode;
+    /**
+     * 接口类型
+     */
+    private String interfaceType;
+    /**
+     * 单据号
+     */
+    private String number;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 扩展属性
+     */
+    private String extraProperties;
+    /**
+     * 地点ID
+     */
+    private String siteId;
+    /**
+     * 代码
+     */
+    private String code;
+    /**
+     * 到仓库代码
+     */
+    private String toWarehouseCode;
+    /**
+     * 到库区类型范围
+     */
+    private String toAreaTypes;
+    /**
+     * 到库区代码范围
+     */
+    private String toAreaCodes;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapreceiptRequest/ProductscrapreceiptDetailDO.java

@@ -0,0 +1,147 @@
+package com.win.module.wms.dal.dataobject.productscrapreceiptRequest;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 制品报废收货申请子 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("request_productscrapreceipt_detail")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductscrapreceiptDetailDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 生产线代码
+     */
+    private String productionLineCode;
+    /**
+     * 工位代码
+     */
+    private String workStationCode;
+    /**
+     * 目标库位
+     */
+    private String toLocationCode;
+    /**
+     * 工序代码
+     */
+    private String processCode;
+    /**
+     * 包装号
+     */
+    private String packingNumber;
+    /**
+     * 器具号
+     */
+    private String containerNumber;
+    /**
+     * 批次
+     */
+    private String batch;
+    /**
+     * 生产日期
+     */
+    private LocalDateTime produceDate;
+    /**
+     * 过期日期
+     */
+    private LocalDateTime expireDate;
+    /**
+     * 库存状态
+     */
+    private String inventoryStatus;
+    /**
+     * 订单号
+     */
+    private String woNumber;
+    /**
+     * 订单行
+     */
+    private String woLine;
+    /**
+     * 包装数量
+     */
+    private BigDecimal packQty;
+    /**
+     * 包装规格
+     */
+    private String packUnit;
+    /**
+     * BOM版本
+     */
+    private String bomVersion;
+    /**
+     * BackFlushDetails
+     */
+    private String backFlushDetails;
+    /**
+     * 主表ID
+     */
+    private Long masterId;
+    /**
+     * 单据号
+     */
+    private String number;
+    /**
+     * 物品代码
+     */
+    private String itemCode;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 地点ID
+     */
+    private String siteId;
+    /**
+     * 物品名称
+     */
+    private String itemName;
+    /**
+     * 物品描述1
+     */
+    private String itemDesc1;
+    /**
+     * 物品描述2
+     */
+    private String itemDesc2;
+    /**
+     * 项目代码
+     */
+    private String projectCode;
+    /**
+     * 数量
+     */
+    private Double qty;
+    /**
+     * 计量单位
+     */
+    private String uom;
+    /**
+     * 并发乐观锁
+     */
+    private Integer concurrencyStamp;
+    /**
+     * 到货主代码
+     */
+    private String toOwnerCode;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapreceiptRequest/ProductscrapreceiptMainDO.java

@@ -0,0 +1,134 @@
+package com.win.module.wms.dal.dataobject.productscrapreceiptRequest;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 制品报废收货申请主 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("request_productscrapreceipt_main")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductscrapreceiptMainDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 生产计划单号
+     */
+    private String productionPlanNumber;
+    /**
+     * 车间代码
+     */
+    private String workshopCode;
+    /**
+     * 班组
+     */
+    private String team;
+    /**
+     * 班次
+     */
+    private String shift;
+    /**
+     * 到仓库代码
+     */
+    private String toWarehouseCode;
+    /**
+     * 到库区类型范围
+     */
+    private String toAreaTypes;
+    /**
+     * 到库区代码范围
+     */
+    private String toAreaCodes;
+    /**
+     * details
+     */
+    private String details;
+    /**
+     * 单据号
+     */
+    private String number;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 扩展属性
+     */
+    private String extraProperties;
+    /**
+     * 地点ID
+     */
+    private String siteId;
+    /**
+     * 申请时间
+     */
+    private LocalDateTime requestTime;
+    /**
+     * 截止时间
+     */
+    private LocalDateTime dueTime;
+    /**
+     * 部门
+     */
+    private String departmentCode;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 自动提交
+     */
+    private String autoCommit;
+    /**
+     * 自动通过
+     */
+    private String autoAgree;
+    /**
+     * 自动执行
+     */
+    private String autoExecute;
+    /**
+     * 直接生成记录
+     */
+    private String directCreateRecord;
+    /**
+     * 并发乐观锁
+     */
+    private Integer concurrencyStamp;
+    /**
+     * 权限所属人员id
+     */
+    private Long ruleUserId;
+    /**
+     * 工作流流水号
+     */
+    private String serialNumber;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapreceiptJob/ProductscrapreceiptJobDetailMapper.java

@@ -0,0 +1,87 @@
+package com.win.module.wms.dal.mysql.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobDetailExportReqVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobDetailDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 制品报废收货任务子 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptJobDetailMapper extends BaseMapperX<ProductscrapreceiptJobDetailDO> {
+
+    default PageResult<ProductscrapreceiptJobDetailDO> selectPage(ProductscrapreceiptJobDetailPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductscrapreceiptJobDetailDO>()
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getProcessCode, reqVO.getProcessCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getBatch, reqVO.getBatch())
+                .betweenIfPresent(ProductscrapreceiptJobDetailDO::getProduceDate, reqVO.getProduceDate())
+                .betweenIfPresent(ProductscrapreceiptJobDetailDO::getExpireDate, reqVO.getExpireDate())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getToLocationCode, reqVO.getToLocationCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getWoNumber, reqVO.getWoNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getWoLine, reqVO.getWoLine())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getPackQty, reqVO.getPackQty())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getPackUnit, reqVO.getPackUnit())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getBackFlushDetails, reqVO.getBackFlushDetails())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getItemCode, reqVO.getItemCode())
+                .likeIfPresent(ProductscrapreceiptJobDetailDO::getItemName, reqVO.getItemName())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getItemDesc1, reqVO.getItemDesc1())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getItemDesc2, reqVO.getItemDesc2())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getProjectCode, reqVO.getProjectCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getQty, reqVO.getQty())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getUom, reqVO.getUom())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptJobDetailDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getSiteId, reqVO.getSiteId())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
+                .orderByDesc(ProductscrapreceiptJobDetailDO::getId));
+    }
+
+    default List<ProductscrapreceiptJobDetailDO> selectList(ProductscrapreceiptJobDetailExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductscrapreceiptJobDetailDO>()
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getProcessCode, reqVO.getProcessCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getBatch, reqVO.getBatch())
+                .betweenIfPresent(ProductscrapreceiptJobDetailDO::getProduceDate, reqVO.getProduceDate())
+                .betweenIfPresent(ProductscrapreceiptJobDetailDO::getExpireDate, reqVO.getExpireDate())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getToLocationCode, reqVO.getToLocationCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getWoNumber, reqVO.getWoNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getWoLine, reqVO.getWoLine())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getPackQty, reqVO.getPackQty())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getPackUnit, reqVO.getPackUnit())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getBackFlushDetails, reqVO.getBackFlushDetails())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getItemCode, reqVO.getItemCode())
+                .likeIfPresent(ProductscrapreceiptJobDetailDO::getItemName, reqVO.getItemName())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getItemDesc1, reqVO.getItemDesc1())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getItemDesc2, reqVO.getItemDesc2())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getProjectCode, reqVO.getProjectCode())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getQty, reqVO.getQty())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getUom, reqVO.getUom())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptJobDetailDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getSiteId, reqVO.getSiteId())
+                .eqIfPresent(ProductscrapreceiptJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
+                .orderByDesc(ProductscrapreceiptJobDetailDO::getId));
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapreceiptJob/ProductscrapreceiptJobMainMapper.java

@@ -0,0 +1,121 @@
+package com.win.module.wms.dal.mysql.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobMainExportReqVO;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.ProductscrapreceiptJobMainPageReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobMainDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 制品报废收货任务主 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptJobMainMapper extends BaseMapperX<ProductscrapreceiptJobMainDO> {
+
+    default PageResult<ProductscrapreceiptJobMainDO> selectPage(ProductscrapreceiptJobMainPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductscrapreceiptJobMainDO>()
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getWorkShopCode, reqVO.getWorkShopCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getTeam, reqVO.getTeam())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getShift, reqVO.getShift())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getDetails, reqVO.getDetails())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getRequestTime, reqVO.getRequestTime())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getRequestDueTime, reqVO.getRequestDueTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getPriority, reqVO.getPriority())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getUserGroupCode, reqVO.getUserGroupCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
+                .likeIfPresent(ProductscrapreceiptJobMainDO::getAcceptUserName, reqVO.getAcceptUserName())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getAcceptTime, reqVO.getAcceptTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
+                .likeIfPresent(ProductscrapreceiptJobMainDO::getCompleteUserName, reqVO.getCompleteUserName())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getCompleteTime, reqVO.getCompleteTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getToAreaCodes, reqVO.getToAreaCodes())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getFromAreaTypes, reqVO.getFromAreaTypes())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getToAreaTypes, reqVO.getToAreaTypes())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getExtraProperties, reqVO.getExtraProperties())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getSiteId, reqVO.getSiteId())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAutoComplete, reqVO.getAutoComplete())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getSerialNumber, reqVO.getSerialNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getInInventoryStatuses, reqVO.getInInventoryStatuses())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getOutInventoryStatuses, reqVO.getOutInventoryStatuses())
+                .orderByDesc(ProductscrapreceiptJobMainDO::getId));
+    }
+
+    default List<ProductscrapreceiptJobMainDO> selectList(ProductscrapreceiptJobMainExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductscrapreceiptJobMainDO>()
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getWorkShopCode, reqVO.getWorkShopCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getTeam, reqVO.getTeam())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getShift, reqVO.getShift())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getDetails, reqVO.getDetails())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getRequestTime, reqVO.getRequestTime())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getRequestDueTime, reqVO.getRequestDueTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getPriority, reqVO.getPriority())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getUserGroupCode, reqVO.getUserGroupCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
+                .likeIfPresent(ProductscrapreceiptJobMainDO::getAcceptUserName, reqVO.getAcceptUserName())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getAcceptTime, reqVO.getAcceptTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
+                .likeIfPresent(ProductscrapreceiptJobMainDO::getCompleteUserName, reqVO.getCompleteUserName())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getCompleteTime, reqVO.getCompleteTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getToAreaCodes, reqVO.getToAreaCodes())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getFromAreaTypes, reqVO.getFromAreaTypes())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getToAreaTypes, reqVO.getToAreaTypes())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptJobMainDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getExtraProperties, reqVO.getExtraProperties())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getSiteId, reqVO.getSiteId())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAutoComplete, reqVO.getAutoComplete())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getSerialNumber, reqVO.getSerialNumber())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getInInventoryStatuses, reqVO.getInInventoryStatuses())
+                .eqIfPresent(ProductscrapreceiptJobMainDO::getOutInventoryStatuses, reqVO.getOutInventoryStatuses())
+                .orderByDesc(ProductscrapreceiptJobMainDO::getId));
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapreceiptRecord/ProductscrapreceiptRecordMainMapper.java

@@ -0,0 +1,85 @@
+package com.win.module.wms.dal.mysql.productscrapreceiptRecord;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.ProductscrapreceiptRecordMainExportReqVO;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.ProductscrapreceiptRecordMainPageReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRecord.ProductscrapreceiptRecordMainDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 制品报废收货记录主 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptRecordMainMapper extends BaseMapperX<ProductscrapreceiptRecordMainDO> {
+
+    default PageResult<ProductscrapreceiptRecordMainDO> selectPage(ProductscrapreceiptRecordMainPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductscrapreceiptRecordMainDO>()
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getJobNumber, reqVO.getJobNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getWorkshopCode, reqVO.getWorkshopCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getTeam, reqVO.getTeam())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getShift, reqVO.getShift())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getDetails, reqVO.getDetails())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getInTransactionType, reqVO.getInTransactionType())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getExecuteTime, reqVO.getExecuteTime())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getActiveDate, reqVO.getActiveDate())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getAvailable, reqVO.getAvailable())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getRequestTime, reqVO.getRequestTime())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getDueTime, reqVO.getDueTime())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getDepartmentCode, reqVO.getDepartmentCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getUserGroupCode, reqVO.getUserGroupCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getInterfaceType, reqVO.getInterfaceType())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getExtraProperties, reqVO.getExtraProperties())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getSiteId, reqVO.getSiteId())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getCode, reqVO.getCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getToAreaTypes, reqVO.getToAreaTypes())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getToAreaCodes, reqVO.getToAreaCodes())
+                .orderByDesc(ProductscrapreceiptRecordMainDO::getId));
+    }
+
+    default List<ProductscrapreceiptRecordMainDO> selectList(ProductscrapreceiptRecordMainExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductscrapreceiptRecordMainDO>()
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getJobNumber, reqVO.getJobNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getWorkshopCode, reqVO.getWorkshopCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getTeam, reqVO.getTeam())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getShift, reqVO.getShift())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getDetails, reqVO.getDetails())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getInTransactionType, reqVO.getInTransactionType())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getExecuteTime, reqVO.getExecuteTime())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getActiveDate, reqVO.getActiveDate())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getAvailable, reqVO.getAvailable())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getRequestTime, reqVO.getRequestTime())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getDueTime, reqVO.getDueTime())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getDepartmentCode, reqVO.getDepartmentCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getUserGroupCode, reqVO.getUserGroupCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getInterfaceType, reqVO.getInterfaceType())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptRecordMainDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getExtraProperties, reqVO.getExtraProperties())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getSiteId, reqVO.getSiteId())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getCode, reqVO.getCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getToAreaTypes, reqVO.getToAreaTypes())
+                .eqIfPresent(ProductscrapreceiptRecordMainDO::getToAreaCodes, reqVO.getToAreaCodes())
+                .orderByDesc(ProductscrapreceiptRecordMainDO::getId));
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapreceiptRequest/ProductscrapreceiptDetailMapper.java

@@ -0,0 +1,91 @@
+package com.win.module.wms.dal.mysql.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptDetailExportReqVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptDetailDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 制品报废收货申请子 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptDetailMapper extends BaseMapperX<ProductscrapreceiptDetailDO> {
+
+    default PageResult<ProductscrapreceiptDetailDO> selectPage(ProductscrapreceiptDetailPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductscrapreceiptDetailDO>()
+                .eqIfPresent(ProductscrapreceiptDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getToLocationCode, reqVO.getToLocationCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getProcessCode, reqVO.getProcessCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getPackingNumber, reqVO.getPackingNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getContainerNumber, reqVO.getContainerNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getBatch, reqVO.getBatch())
+                .betweenIfPresent(ProductscrapreceiptDetailDO::getProduceDate, reqVO.getProduceDate())
+                .betweenIfPresent(ProductscrapreceiptDetailDO::getExpireDate, reqVO.getExpireDate())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getWoNumber, reqVO.getWoNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getWoLine, reqVO.getWoLine())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getPackQty, reqVO.getPackQty())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getPackUnit, reqVO.getPackUnit())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getBomVersion, reqVO.getBomVersion())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getBackFlushDetails, reqVO.getBackFlushDetails())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getItemCode, reqVO.getItemCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptDetailDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getSiteId, reqVO.getSiteId())
+                .likeIfPresent(ProductscrapreceiptDetailDO::getItemName, reqVO.getItemName())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getItemDesc1, reqVO.getItemDesc1())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getItemDesc2, reqVO.getItemDesc2())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getProjectCode, reqVO.getProjectCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getQty, reqVO.getQty())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getUom, reqVO.getUom())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
+                .orderByDesc(ProductscrapreceiptDetailDO::getId));
+    }
+
+    default List<ProductscrapreceiptDetailDO> selectList(ProductscrapreceiptDetailExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductscrapreceiptDetailDO>()
+                .eqIfPresent(ProductscrapreceiptDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getToLocationCode, reqVO.getToLocationCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getProcessCode, reqVO.getProcessCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getPackingNumber, reqVO.getPackingNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getContainerNumber, reqVO.getContainerNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getBatch, reqVO.getBatch())
+                .betweenIfPresent(ProductscrapreceiptDetailDO::getProduceDate, reqVO.getProduceDate())
+                .betweenIfPresent(ProductscrapreceiptDetailDO::getExpireDate, reqVO.getExpireDate())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getWoNumber, reqVO.getWoNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getWoLine, reqVO.getWoLine())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getPackQty, reqVO.getPackQty())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getPackUnit, reqVO.getPackUnit())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getBomVersion, reqVO.getBomVersion())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getBackFlushDetails, reqVO.getBackFlushDetails())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getItemCode, reqVO.getItemCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(ProductscrapreceiptDetailDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getSiteId, reqVO.getSiteId())
+                .likeIfPresent(ProductscrapreceiptDetailDO::getItemName, reqVO.getItemName())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getItemDesc1, reqVO.getItemDesc1())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getItemDesc2, reqVO.getItemDesc2())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getProjectCode, reqVO.getProjectCode())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getQty, reqVO.getQty())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getUom, reqVO.getUom())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
+                .eqIfPresent(ProductscrapreceiptDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
+                .orderByDesc(ProductscrapreceiptDetailDO::getId));
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapreceiptRequest/ProductscrapreceiptMainMapper.java

@@ -0,0 +1,39 @@
+package com.win.module.wms.dal.mysql.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptMainExportReqVO;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.ProductscrapreceiptMainPageReqVO;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptMainDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 制品报废收货申请主 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductscrapreceiptMainMapper extends BaseMapperX<ProductscrapreceiptMainDO> {
+
+    default PageResult<ProductscrapreceiptMainDO> selectPage(ProductscrapreceiptMainPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductscrapreceiptMainDO>()
+                .eqIfPresent(ProductscrapreceiptMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())
+                .eqIfPresent(ProductscrapreceiptMainDO::getWorkshopCode, reqVO.getWorkshopCode())
+                .eqIfPresent(ProductscrapreceiptMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptMainDO::getStatus, reqVO.getStatus())
+                .orderByDesc(ProductscrapreceiptMainDO::getId));
+    }
+
+    default List<ProductscrapreceiptMainDO> selectList(ProductscrapreceiptMainExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductscrapreceiptMainDO>()
+                .eqIfPresent(ProductscrapreceiptMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())
+                .eqIfPresent(ProductscrapreceiptMainDO::getWorkshopCode, reqVO.getWorkshopCode())
+                .eqIfPresent(ProductscrapreceiptMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(ProductscrapreceiptMainDO::getStatus, reqVO.getStatus())
+                .orderByDesc(ProductscrapreceiptMainDO::getId));
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptJob/ProductscrapreceiptJobDetailService.java

@@ -0,0 +1,81 @@
+package com.win.module.wms.service.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.*;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobDetailDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 制品报废收货任务子 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface ProductscrapreceiptJobDetailService {
+
+    /**
+     * 创建制品报废收货任务子
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProductscrapreceiptJobDetail(@Valid ProductscrapreceiptJobDetailCreateReqVO createReqVO);
+
+    /**
+     * 更新制品报废收货任务子
+     *
+     * @param updateReqVO 更新信息
+     */
+    Integer updateProductscrapreceiptJobDetail(@Valid ProductscrapreceiptJobDetailUpdateReqVO updateReqVO);
+
+    /**
+     * 删除制品报废收货任务子
+     *
+     * @param id 编号
+     */
+    Integer deleteProductscrapreceiptJobDetail(Long id);
+
+    /**
+     * 获得制品报废收货任务子
+     *
+     * @param id 编号
+     * @return 制品报废收货任务子
+     */
+    ProductscrapreceiptJobDetailDO getProductscrapreceiptJobDetail(Long id);
+
+    /**
+     * 获得制品报废收货任务子列表
+     *
+     * @param ids 编号
+     * @return 制品报废收货任务子列表
+     */
+    List<ProductscrapreceiptJobDetailDO> getProductscrapreceiptJobDetailList(Collection<Long> ids);
+
+    /**
+     * 获得制品报废收货任务子分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 制品报废收货任务子分页
+     */
+    PageResult<ProductscrapreceiptJobDetailDO> getProductscrapreceiptJobDetailPage(ProductscrapreceiptJobDetailPageReqVO pageReqVO);
+
+    /**
+     * 获得制品报废收货任务子列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 制品报废收货任务子列表
+     */
+    List<ProductscrapreceiptJobDetailDO> getProductscrapreceiptJobDetailList(ProductscrapreceiptJobDetailExportReqVO exportReqVO);
+
+    /**
+    * 导入制品报废收货任务子主信息
+    *
+    * @param datas     导入制品报废收货任务子主信息列表
+    * @param mode 导入模式1更新2追加3覆盖
+    * @param updatePart 是否支持更新
+    * @return 导入结果
+    */
+    public List<ProductscrapreceiptJobDetailExcelVO>  importProductscrapreceiptJobDetailList(List<ProductscrapreceiptJobDetailExcelVO> datas, Integer mode, boolean updatePart);
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptJob/ProductscrapreceiptJobDetailServiceImpl.java

@@ -0,0 +1,95 @@
+package com.win.module.wms.service.productscrapreceiptJob;
+
+import cn.hutool.core.collection.CollUtil;
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.*;
+import com.win.module.wms.convert.productscrapreceiptJob.ProductscrapreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobDetailDO;
+import com.win.module.wms.dal.mysql.productscrapreceiptJob.ProductscrapreceiptJobDetailMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_JOB_DETAIL_IMPORT_LIST_IS_EMPTY;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_JOB_DETAIL_NOT_EXISTS;
+
+/**
+ * 制品报废收货任务子 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class ProductscrapreceiptJobDetailServiceImpl implements ProductscrapreceiptJobDetailService {
+
+    @Resource
+    private ProductscrapreceiptJobDetailMapper productscrapreceiptJobDetailMapper;
+
+    @Override
+    public Long createProductscrapreceiptJobDetail(ProductscrapreceiptJobDetailCreateReqVO createReqVO) {
+        // 插入
+        ProductscrapreceiptJobDetailDO productscrapreceiptJobDetail = ProductscrapreceiptJobDetailConvert.INSTANCE.convert(createReqVO);
+        productscrapreceiptJobDetailMapper.insert(productscrapreceiptJobDetail);
+        // 返回
+        return productscrapreceiptJobDetail.getId();
+    }
+
+    @Override
+    public Integer updateProductscrapreceiptJobDetail(ProductscrapreceiptJobDetailUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateProductscrapreceiptJobDetailExists(updateReqVO.getId());
+        // 更新
+        ProductscrapreceiptJobDetailDO updateObj = ProductscrapreceiptJobDetailConvert.INSTANCE.convert(updateReqVO);
+        return productscrapreceiptJobDetailMapper.updateById(updateObj);
+    }
+
+    @Override
+    public Integer deleteProductscrapreceiptJobDetail(Long id) {
+        // 校验存在
+        validateProductscrapreceiptJobDetailExists(id);
+        // 删除
+        return productscrapreceiptJobDetailMapper.deleteById(id);
+    }
+
+    private void validateProductscrapreceiptJobDetailExists(Long id) {
+        if (productscrapreceiptJobDetailMapper.selectById(id) == null) {
+            throw exception(PRODUCTSCRAPRECEIPT_JOB_DETAIL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProductscrapreceiptJobDetailDO getProductscrapreceiptJobDetail(Long id) {
+        return productscrapreceiptJobDetailMapper.selectById(id);
+    }
+
+    @Override
+    public List<ProductscrapreceiptJobDetailDO> getProductscrapreceiptJobDetailList(Collection<Long> ids) {
+        return productscrapreceiptJobDetailMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<ProductscrapreceiptJobDetailDO> getProductscrapreceiptJobDetailPage(ProductscrapreceiptJobDetailPageReqVO pageReqVO) {
+        return productscrapreceiptJobDetailMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptJobDetailDO> getProductscrapreceiptJobDetailList(ProductscrapreceiptJobDetailExportReqVO exportReqVO) {
+        return productscrapreceiptJobDetailMapper.selectList(exportReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptJobDetailExcelVO> importProductscrapreceiptJobDetailList(List<ProductscrapreceiptJobDetailExcelVO> datas, Integer mode, boolean updatePart) {
+        if (CollUtil.isEmpty(datas)) {
+            throw exception(PRODUCTSCRAPRECEIPT_JOB_DETAIL_IMPORT_LIST_IS_EMPTY);
+        }
+
+        List<ProductscrapreceiptJobDetailExcelVO> errorList = new ArrayList<>();
+
+        return errorList;
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptJob/ProductscrapreceiptJobMainService.java

@@ -0,0 +1,81 @@
+package com.win.module.wms.service.productscrapreceiptJob;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.*;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobMainDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 制品报废收货任务主 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface ProductscrapreceiptJobMainService {
+
+    /**
+     * 创建制品报废收货任务主
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProductscrapreceiptJobMain(@Valid ProductscrapreceiptJobMainCreateReqVO createReqVO);
+
+    /**
+     * 更新制品报废收货任务主
+     *
+     * @param updateReqVO 更新信息
+     */
+    Integer updateProductscrapreceiptJobMain(@Valid ProductscrapreceiptJobMainUpdateReqVO updateReqVO);
+
+    /**
+     * 删除制品报废收货任务主
+     *
+     * @param id 编号
+     */
+    Integer deleteProductscrapreceiptJobMain(Long id);
+
+    /**
+     * 获得制品报废收货任务主
+     *
+     * @param id 编号
+     * @return 制品报废收货任务主
+     */
+    ProductscrapreceiptJobMainDO getProductscrapreceiptJobMain(Long id);
+
+    /**
+     * 获得制品报废收货任务主列表
+     *
+     * @param ids 编号
+     * @return 制品报废收货任务主列表
+     */
+    List<ProductscrapreceiptJobMainDO> getProductscrapreceiptJobMainList(Collection<Long> ids);
+
+    /**
+     * 获得制品报废收货任务主分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 制品报废收货任务主分页
+     */
+    PageResult<ProductscrapreceiptJobMainDO> getProductscrapreceiptJobMainPage(ProductscrapreceiptJobMainPageReqVO pageReqVO);
+
+    /**
+     * 获得制品报废收货任务主列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 制品报废收货任务主列表
+     */
+    List<ProductscrapreceiptJobMainDO> getProductscrapreceiptJobMainList(ProductscrapreceiptJobMainExportReqVO exportReqVO);
+
+    /**
+    * 导入制品报废收货任务主主信息
+    *
+    * @param datas     导入制品报废收货任务主主信息列表
+    * @param mode 导入模式1更新2追加3覆盖
+    * @param updatePart 是否支持更新
+    * @return 导入结果
+    */
+    public List<ProductscrapreceiptJobMainExcelVO>  importProductscrapreceiptJobMainList(List<ProductscrapreceiptJobMainExcelVO> datas, Integer mode, boolean updatePart);
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptJob/ProductscrapreceiptJobMainServiceImpl.java

@@ -0,0 +1,94 @@
+package com.win.module.wms.service.productscrapreceiptJob;
+
+import cn.hutool.core.collection.CollUtil;
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptJob.vo.*;
+import com.win.module.wms.convert.productscrapreceiptJob.ProductscrapreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptJob.ProductscrapreceiptJobMainDO;
+import com.win.module.wms.dal.mysql.productscrapreceiptJob.ProductscrapreceiptJobMainMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_JOB_MAIN_IMPORT_LIST_IS_EMPTY;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_JOB_MAIN_NOT_EXISTS;
+
+/**
+ * 制品报废收货任务主 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class ProductscrapreceiptJobMainServiceImpl implements ProductscrapreceiptJobMainService {
+
+    @Resource
+    private ProductscrapreceiptJobMainMapper productscrapreceiptJobMainMapper;
+
+    @Override
+    public Long createProductscrapreceiptJobMain(ProductscrapreceiptJobMainCreateReqVO createReqVO) {
+        // 插入
+        ProductscrapreceiptJobMainDO productscrapreceiptJobMain = ProductscrapreceiptJobMainConvert.INSTANCE.convert(createReqVO);
+        productscrapreceiptJobMainMapper.insert(productscrapreceiptJobMain);
+        // 返回
+        return productscrapreceiptJobMain.getId();
+    }
+
+    @Override
+    public Integer updateProductscrapreceiptJobMain(ProductscrapreceiptJobMainUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateProductscrapreceiptJobMainExists(updateReqVO.getId());
+        // 更新
+        ProductscrapreceiptJobMainDO updateObj = ProductscrapreceiptJobMainConvert.INSTANCE.convert(updateReqVO);
+        return productscrapreceiptJobMainMapper.updateById(updateObj);
+    }
+
+    @Override
+    public Integer deleteProductscrapreceiptJobMain(Long id) {
+        // 校验存在
+        validateProductscrapreceiptJobMainExists(id);
+        // 删除
+        return productscrapreceiptJobMainMapper.deleteById(id);
+    }
+
+    private void validateProductscrapreceiptJobMainExists(Long id) {
+        if (productscrapreceiptJobMainMapper.selectById(id) == null) {
+            throw exception(PRODUCTSCRAPRECEIPT_JOB_MAIN_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProductscrapreceiptJobMainDO getProductscrapreceiptJobMain(Long id) {
+        return productscrapreceiptJobMainMapper.selectById(id);
+    }
+
+    @Override
+    public List<ProductscrapreceiptJobMainDO> getProductscrapreceiptJobMainList(Collection<Long> ids) {
+        return productscrapreceiptJobMainMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<ProductscrapreceiptJobMainDO> getProductscrapreceiptJobMainPage(ProductscrapreceiptJobMainPageReqVO pageReqVO) {
+        return productscrapreceiptJobMainMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptJobMainDO> getProductscrapreceiptJobMainList(ProductscrapreceiptJobMainExportReqVO exportReqVO) {
+        return productscrapreceiptJobMainMapper.selectList(exportReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptJobMainExcelVO> importProductscrapreceiptJobMainList(List<ProductscrapreceiptJobMainExcelVO> datas, Integer mode, boolean updatePart) {
+        if (CollUtil.isEmpty(datas)) {
+            throw exception(PRODUCTSCRAPRECEIPT_JOB_MAIN_IMPORT_LIST_IS_EMPTY);
+        }
+
+        List<ProductscrapreceiptJobMainExcelVO> errorList = new ArrayList<>();
+        return errorList;
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptRecord/ProductscrapreceiptRecordMainService.java

@@ -0,0 +1,81 @@
+package com.win.module.wms.service.productscrapreceiptRecord;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.*;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRecord.ProductscrapreceiptRecordMainDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 制品报废收货记录主 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface ProductscrapreceiptRecordMainService {
+
+    /**
+     * 创建制品报废收货记录主
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProductscrapreceiptRecordMain(@Valid ProductscrapreceiptRecordMainCreateReqVO createReqVO);
+
+    /**
+     * 更新制品报废收货记录主
+     *
+     * @param updateReqVO 更新信息
+     */
+    Integer updateProductscrapreceiptRecordMain(@Valid ProductscrapreceiptRecordMainUpdateReqVO updateReqVO);
+
+    /**
+     * 删除制品报废收货记录主
+     *
+     * @param id 编号
+     */
+    Integer deleteProductscrapreceiptRecordMain(Long id);
+
+    /**
+     * 获得制品报废收货记录主
+     *
+     * @param id 编号
+     * @return 制品报废收货记录主
+     */
+    ProductscrapreceiptRecordMainDO getProductscrapreceiptRecordMain(Long id);
+
+    /**
+     * 获得制品报废收货记录主列表
+     *
+     * @param ids 编号
+     * @return 制品报废收货记录主列表
+     */
+    List<ProductscrapreceiptRecordMainDO> getProductscrapreceiptRecordMainList(Collection<Long> ids);
+
+    /**
+     * 获得制品报废收货记录主分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 制品报废收货记录主分页
+     */
+    PageResult<ProductscrapreceiptRecordMainDO> getProductscrapreceiptRecordMainPage(ProductscrapreceiptRecordMainPageReqVO pageReqVO);
+
+    /**
+     * 获得制品报废收货记录主列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 制品报废收货记录主列表
+     */
+    List<ProductscrapreceiptRecordMainDO> getProductscrapreceiptRecordMainList(ProductscrapreceiptRecordMainExportReqVO exportReqVO);
+
+    /**
+    * 导入制品报废收货记录主主信息
+    *
+    * @param datas     导入制品报废收货记录主主信息列表
+    * @param mode 导入模式1更新2追加3覆盖
+    * @param updatePart 是否支持更新
+    * @return 导入结果
+    */
+    public List<ProductscrapreceiptRecordMainExcelVO>  importProductscrapreceiptRecordMainList(List<ProductscrapreceiptRecordMainExcelVO> datas, Integer mode, boolean updatePart);
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptRecord/ProductscrapreceiptRecordMainServiceImpl.java

@@ -0,0 +1,95 @@
+package com.win.module.wms.service.productscrapreceiptRecord;
+
+import cn.hutool.core.collection.CollUtil;
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRecord.vo.*;
+import com.win.module.wms.convert.productscrapreceiptRecord.ProductscrapreceiptRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRecord.ProductscrapreceiptRecordMainDO;
+import com.win.module.wms.dal.mysql.productscrapreceiptRecord.ProductscrapreceiptRecordMainMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_RECORD_MAIN_IMPORT_LIST_IS_EMPTY;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_RECORD_MAIN_NOT_EXISTS;
+
+/**
+ * 制品报废收货记录主 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class ProductscrapreceiptRecordMainServiceImpl implements ProductscrapreceiptRecordMainService {
+
+    @Resource
+    private ProductscrapreceiptRecordMainMapper productscrapreceiptRecordMainMapper;
+
+    @Override
+    public Long createProductscrapreceiptRecordMain(ProductscrapreceiptRecordMainCreateReqVO createReqVO) {
+        // 插入
+        ProductscrapreceiptRecordMainDO productscrapreceiptRecordMain = ProductscrapreceiptRecordMainConvert.INSTANCE.convert(createReqVO);
+        productscrapreceiptRecordMainMapper.insert(productscrapreceiptRecordMain);
+        // 返回
+        return productscrapreceiptRecordMain.getId();
+    }
+
+    @Override
+    public Integer updateProductscrapreceiptRecordMain(ProductscrapreceiptRecordMainUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateProductscrapreceiptRecordMainExists(updateReqVO.getId());
+        // 更新
+        ProductscrapreceiptRecordMainDO updateObj = ProductscrapreceiptRecordMainConvert.INSTANCE.convert(updateReqVO);
+        return productscrapreceiptRecordMainMapper.updateById(updateObj);
+    }
+
+    @Override
+    public Integer deleteProductscrapreceiptRecordMain(Long id) {
+        // 校验存在
+        validateProductscrapreceiptRecordMainExists(id);
+        // 删除
+        return productscrapreceiptRecordMainMapper.deleteById(id);
+    }
+
+    private void validateProductscrapreceiptRecordMainExists(Long id) {
+        if (productscrapreceiptRecordMainMapper.selectById(id) == null) {
+            throw exception(PRODUCTSCRAPRECEIPT_RECORD_MAIN_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProductscrapreceiptRecordMainDO getProductscrapreceiptRecordMain(Long id) {
+        return productscrapreceiptRecordMainMapper.selectById(id);
+    }
+
+    @Override
+    public List<ProductscrapreceiptRecordMainDO> getProductscrapreceiptRecordMainList(Collection<Long> ids) {
+        return productscrapreceiptRecordMainMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<ProductscrapreceiptRecordMainDO> getProductscrapreceiptRecordMainPage(ProductscrapreceiptRecordMainPageReqVO pageReqVO) {
+        return productscrapreceiptRecordMainMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptRecordMainDO> getProductscrapreceiptRecordMainList(ProductscrapreceiptRecordMainExportReqVO exportReqVO) {
+        return productscrapreceiptRecordMainMapper.selectList(exportReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptRecordMainExcelVO> importProductscrapreceiptRecordMainList(List<ProductscrapreceiptRecordMainExcelVO> datas, Integer mode, boolean updatePart) {
+        if (CollUtil.isEmpty(datas)) {
+            throw exception(PRODUCTSCRAPRECEIPT_RECORD_MAIN_IMPORT_LIST_IS_EMPTY);
+        }
+
+        List<ProductscrapreceiptRecordMainExcelVO> errorList = new ArrayList<>();
+
+        return errorList;
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptRequest/ProductscrapreceiptDetailService.java

@@ -0,0 +1,81 @@
+package com.win.module.wms.service.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.*;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptDetailDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 制品报废收货申请子 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface ProductscrapreceiptDetailService {
+
+    /**
+     * 创建制品报废收货申请子
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProductscrapreceiptDetail(@Valid ProductscrapreceiptDetailCreateReqVO createReqVO);
+
+    /**
+     * 更新制品报废收货申请子
+     *
+     * @param updateReqVO 更新信息
+     */
+    Integer updateProductscrapreceiptDetail(@Valid ProductscrapreceiptDetailUpdateReqVO updateReqVO);
+
+    /**
+     * 删除制品报废收货申请子
+     *
+     * @param id 编号
+     */
+    Integer deleteProductscrapreceiptDetail(Long id);
+
+    /**
+     * 获得制品报废收货申请子
+     *
+     * @param id 编号
+     * @return 制品报废收货申请子
+     */
+    ProductscrapreceiptDetailDO getProductscrapreceiptDetail(Long id);
+
+    /**
+     * 获得制品报废收货申请子列表
+     *
+     * @param ids 编号
+     * @return 制品报废收货申请子列表
+     */
+    List<ProductscrapreceiptDetailDO> getProductscrapreceiptDetailList(Collection<Long> ids);
+
+    /**
+     * 获得制品报废收货申请子分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 制品报废收货申请子分页
+     */
+    PageResult<ProductscrapreceiptDetailDO> getProductscrapreceiptDetailPage(ProductscrapreceiptDetailPageReqVO pageReqVO);
+
+    /**
+     * 获得制品报废收货申请子列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 制品报废收货申请子列表
+     */
+    List<ProductscrapreceiptDetailDO> getProductscrapreceiptDetailList(ProductscrapreceiptDetailExportReqVO exportReqVO);
+
+    /**
+    * 导入制品报废收货申请子主信息
+    *
+    * @param datas     导入制品报废收货申请子主信息列表
+    * @param mode 导入模式1更新2追加3覆盖
+    * @param updatePart 是否支持更新
+    * @return 导入结果
+    */
+    public List<ProductscrapreceiptDetailExcelVO>  importProductscrapreceiptDetailList(List<ProductscrapreceiptDetailExcelVO> datas, Integer mode, boolean updatePart);
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptRequest/ProductscrapreceiptDetailServiceImpl.java

@@ -0,0 +1,93 @@
+package com.win.module.wms.service.productscrapreceiptRequest;
+
+import cn.hutool.core.collection.CollUtil;
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.*;
+import com.win.module.wms.convert.productscrapreceiptRequest.ProductscrapreceiptDetailConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptDetailDO;
+import com.win.module.wms.dal.mysql.productscrapreceiptRequest.ProductscrapreceiptDetailMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_DETAIL_IMPORT_LIST_IS_EMPTY;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_DETAIL_NOT_EXISTS;
+
+/**
+ * 制品报废收货申请子 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class ProductscrapreceiptDetailServiceImpl implements ProductscrapreceiptDetailService {
+
+    @Resource
+    private ProductscrapreceiptDetailMapper productscrapreceiptDetailMapper;
+
+    @Override
+    public Long createProductscrapreceiptDetail(ProductscrapreceiptDetailCreateReqVO createReqVO) {
+        // 插入
+        ProductscrapreceiptDetailDO productscrapreceiptDetail = ProductscrapreceiptDetailConvert.INSTANCE.convert(createReqVO);
+        productscrapreceiptDetailMapper.insert(productscrapreceiptDetail);
+        // 返回
+        return productscrapreceiptDetail.getId();
+    }
+
+    @Override
+    public Integer updateProductscrapreceiptDetail(ProductscrapreceiptDetailUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateProductscrapreceiptDetailExists(updateReqVO.getId());
+        // 更新
+        ProductscrapreceiptDetailDO updateObj = ProductscrapreceiptDetailConvert.INSTANCE.convert(updateReqVO);
+        return productscrapreceiptDetailMapper.updateById(updateObj);
+    }
+
+    @Override
+    public Integer deleteProductscrapreceiptDetail(Long id) {
+        // 校验存在
+        validateProductscrapreceiptDetailExists(id);
+        // 删除
+        return productscrapreceiptDetailMapper.deleteById(id);
+    }
+
+    private void validateProductscrapreceiptDetailExists(Long id) {
+        if (productscrapreceiptDetailMapper.selectById(id) == null) {
+            throw exception(PRODUCTSCRAPRECEIPT_DETAIL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProductscrapreceiptDetailDO getProductscrapreceiptDetail(Long id) {
+        return productscrapreceiptDetailMapper.selectById(id);
+    }
+
+    @Override
+    public List<ProductscrapreceiptDetailDO> getProductscrapreceiptDetailList(Collection<Long> ids) {
+        return productscrapreceiptDetailMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<ProductscrapreceiptDetailDO> getProductscrapreceiptDetailPage(ProductscrapreceiptDetailPageReqVO pageReqVO) {
+        return productscrapreceiptDetailMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptDetailDO> getProductscrapreceiptDetailList(ProductscrapreceiptDetailExportReqVO exportReqVO) {
+        return productscrapreceiptDetailMapper.selectList(exportReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptDetailExcelVO> importProductscrapreceiptDetailList(List<ProductscrapreceiptDetailExcelVO> datas, Integer mode, boolean updatePart) {
+        if (CollUtil.isEmpty(datas)) {
+            throw exception(PRODUCTSCRAPRECEIPT_DETAIL_IMPORT_LIST_IS_EMPTY);
+        }
+        List<ProductscrapreceiptDetailExcelVO> errorList = new ArrayList<>();
+        return errorList;
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptRequest/ProductscrapreceiptMainService.java

@@ -0,0 +1,81 @@
+package com.win.module.wms.service.productscrapreceiptRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.*;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptMainDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 制品报废收货申请主 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface ProductscrapreceiptMainService {
+
+    /**
+     * 创建制品报废收货申请主
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProductscrapreceiptMain(@Valid ProductscrapreceiptMainCreateReqVO createReqVO);
+
+    /**
+     * 更新制品报废收货申请主
+     *
+     * @param updateReqVO 更新信息
+     */
+    Integer updateProductscrapreceiptMain(@Valid ProductscrapreceiptMainUpdateReqVO updateReqVO);
+
+    /**
+     * 删除制品报废收货申请主
+     *
+     * @param id 编号
+     */
+    Integer deleteProductscrapreceiptMain(Long id);
+
+    /**
+     * 获得制品报废收货申请主
+     *
+     * @param id 编号
+     * @return 制品报废收货申请主
+     */
+    ProductscrapreceiptMainDO getProductscrapreceiptMain(Long id);
+
+    /**
+     * 获得制品报废收货申请主列表
+     *
+     * @param ids 编号
+     * @return 制品报废收货申请主列表
+     */
+    List<ProductscrapreceiptMainDO> getProductscrapreceiptMainList(Collection<Long> ids);
+
+    /**
+     * 获得制品报废收货申请主分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 制品报废收货申请主分页
+     */
+    PageResult<ProductscrapreceiptMainDO> getProductscrapreceiptMainPage(ProductscrapreceiptMainPageReqVO pageReqVO);
+
+    /**
+     * 获得制品报废收货申请主列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 制品报废收货申请主列表
+     */
+    List<ProductscrapreceiptMainDO> getProductscrapreceiptMainList(ProductscrapreceiptMainExportReqVO exportReqVO);
+
+    /**
+    * 导入制品报废收货申请主主信息
+    *
+    * @param datas     导入制品报废收货申请主主信息列表
+    * @param mode 导入模式1更新2追加3覆盖
+    * @param updatePart 是否支持更新
+    * @return 导入结果
+    */
+    public List<ProductscrapreceiptMainExcelVO>  importProductscrapreceiptMainList(List<ProductscrapreceiptMainExcelVO> datas, Integer mode, boolean updatePart);
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapreceiptRequest/ProductscrapreceiptMainServiceImpl.java

@@ -0,0 +1,93 @@
+package com.win.module.wms.service.productscrapreceiptRequest;
+
+import cn.hutool.core.collection.CollUtil;
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productscrapreceiptRequest.vo.*;
+import com.win.module.wms.convert.productscrapreceiptRequest.ProductscrapreceiptMainConvert;
+import com.win.module.wms.dal.dataobject.productscrapreceiptRequest.ProductscrapreceiptMainDO;
+import com.win.module.wms.dal.mysql.productscrapreceiptRequest.ProductscrapreceiptMainMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_MAIN_IMPORT_LIST_IS_EMPTY;
+import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTSCRAPRECEIPT_MAIN_NOT_EXISTS;
+
+/**
+ * 制品报废收货申请主 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class ProductscrapreceiptMainServiceImpl implements ProductscrapreceiptMainService {
+
+    @Resource
+    private ProductscrapreceiptMainMapper productscrapreceiptMainMapper;
+
+    @Override
+    public Long createProductscrapreceiptMain(ProductscrapreceiptMainCreateReqVO createReqVO) {
+        // 插入
+        ProductscrapreceiptMainDO productscrapreceiptMain = ProductscrapreceiptMainConvert.INSTANCE.convert(createReqVO);
+        productscrapreceiptMainMapper.insert(productscrapreceiptMain);
+        // 返回
+        return productscrapreceiptMain.getId();
+    }
+
+    @Override
+    public Integer updateProductscrapreceiptMain(ProductscrapreceiptMainUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateProductscrapreceiptMainExists(updateReqVO.getId());
+        // 更新
+        ProductscrapreceiptMainDO updateObj = ProductscrapreceiptMainConvert.INSTANCE.convert(updateReqVO);
+        return productscrapreceiptMainMapper.updateById(updateObj);
+    }
+
+    @Override
+    public Integer deleteProductscrapreceiptMain(Long id) {
+        // 校验存在
+        validateProductscrapreceiptMainExists(id);
+        // 删除
+        return productscrapreceiptMainMapper.deleteById(id);
+    }
+
+    private void validateProductscrapreceiptMainExists(Long id) {
+        if (productscrapreceiptMainMapper.selectById(id) == null) {
+            throw exception(PRODUCTSCRAPRECEIPT_MAIN_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public ProductscrapreceiptMainDO getProductscrapreceiptMain(Long id) {
+        return productscrapreceiptMainMapper.selectById(id);
+    }
+
+    @Override
+    public List<ProductscrapreceiptMainDO> getProductscrapreceiptMainList(Collection<Long> ids) {
+        return productscrapreceiptMainMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<ProductscrapreceiptMainDO> getProductscrapreceiptMainPage(ProductscrapreceiptMainPageReqVO pageReqVO) {
+        return productscrapreceiptMainMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptMainDO> getProductscrapreceiptMainList(ProductscrapreceiptMainExportReqVO exportReqVO) {
+        return productscrapreceiptMainMapper.selectList(exportReqVO);
+    }
+
+    @Override
+    public List<ProductscrapreceiptMainExcelVO> importProductscrapreceiptMainList(List<ProductscrapreceiptMainExcelVO> datas, Integer mode, boolean updatePart) {
+        if (CollUtil.isEmpty(datas)) {
+            throw exception(PRODUCTSCRAPRECEIPT_MAIN_IMPORT_LIST_IS_EMPTY);
+        }
+        List<ProductscrapreceiptMainExcelVO> errorList = new ArrayList<>();
+        return errorList;
+    }
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

@@ -430,6 +430,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         RequestStatusState requestStatusState = new RequestStatusState();
         requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute());
         mainDo.setStatus(requestStatusState.getState().getCode());
+        mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
         return mainDo;
     }
 

win-module-wms/win-module-wms-biz/src/main/resources/mapper/productscrapreceiptJob/ProductscrapreceiptJobDetailMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.wms.dal.mysql.productscrapreceiptJob.ProductscrapreceiptJobDetailMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

win-module-wms/win-module-wms-biz/src/main/resources/mapper/productscrapreceiptJob/ProductscrapreceiptJobMainMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.wms.dal.mysql.productscrapreceiptJob.ProductscrapreceiptJobMainMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

win-module-wms/win-module-wms-biz/src/main/resources/mapper/productscrapreceiptRecord/ProductscrapreceiptRecordMainMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.wms.dal.mysql.productscrapreceiptRecord.ProductscrapreceiptRecordMainMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

win-module-wms/win-module-wms-biz/src/main/resources/mapper/productscrapreceiptRequest/ProductscrapreceiptDetailMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.wms.dal.mysql.productscrapreceiptRequest.ProductscrapreceiptDetailMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

win-module-wms/win-module-wms-biz/src/main/resources/mapper/productscrapreceiptRequest/ProductscrapreceiptMainMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.wms.dal.mysql.productscrapreceiptRequest.ProductscrapreceiptMainMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>