Merge remote-tracking branch 'origin/master'

win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/serialNumber/RuleCodeEnum.java

@@ -141,6 +141,8 @@ public enum RuleCodeEnum {
     TRANSFER_LOG("TransferLog"),  // 库存转移日志
     PACKING_NUMBER("PackingNumber"),  // 包装号
     CUSTOMER_DELIVER_NUMBER("CustomerDeliverNumber"),  // 客户发货单号
+    LABEL_NUMBER("LabelNumber"),  // 标签流水号
+
     ;
 
     private final String code;

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

@@ -611,6 +611,9 @@ public interface ErrorCodeConstants {
     //生产退料申请子ErrorCode
     ErrorCode PRODUCTIONRETURN_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_097_001, "生产退料申请子不存在");
     ErrorCode PRODUCTIONRETURN_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_097_002, "导入生产退料申请不能为空");
+    ErrorCode PRODUCTIONRETURN_REQUEST_JOB_EXISTS = new ErrorCode(1_000_097_003, "生产退料申请存在任务单");
+    ErrorCode PRODUCTIONRETURN_REQUEST_MAIN_ERROR = new ErrorCode(1_000_097_004, "生产退料申请状态错误");
+
     //生产退料申请主ErrorCode
     ErrorCode PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_098_000, "生产退料任务主不存在");
     //生产退料任务子ErrorCode

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailUpdateReqVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.countJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.math.BigDecimal;
+
 @Schema(description = "管理后台 - 盘点任务子更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CountJobDetailUpdateReqVO extends CountJobDetailBaseVO {
 
+    @Schema(description = "盘点数量")
+    private BigDecimal countQty;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainUpdateReqVO.java

@@ -1,7 +1,12 @@
 package com.win.module.wms.controller.countJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.Valid;
+import java.util.List;
 
 @Schema(description = "管理后台 - 盘点任务主更新 Request VO")
 @Data
@@ -9,4 +14,6 @@ import lombok.*;
 @ToString(callSuper = true)
 public class CountJobMainUpdateReqVO extends CountJobMainBaseVO {
 
+    @Schema(description = "子表数据")
+    private List<@Valid CountJobDetailUpdateReqVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java

@@ -1,14 +1,12 @@
 package com.win.module.wms.controller.countRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 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;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java

@@ -1,16 +1,12 @@
 package com.win.module.wms.controller.countadjustRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 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;
 
@@ -29,14 +25,14 @@ public class CountadjustRequestDetailBaseVO {
     private String countDetailNumber;
 
     @Schema(description = "货主代码")
-    private String ownerlCode;
+    private String ownerCode;
 
     @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "包装号不能为空")
-    private String packinglNumber;
+    private String packingNumber;
 
     @Schema(description = "器具号")
-    private String containerlNumber;
+    private String containerNumber;
 
     @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "批次不能为空")
@@ -44,22 +40,22 @@ public class CountadjustRequestDetailBaseVO {
 
     @Schema(description = "库位代码", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "库位代码不能为空")
-    private String locationlCode;
+    private String locationCode;
 
     @Schema(description = "库存状态")
-    private String inventorylStatus;
+    private String inventoryStatus;
 
     @Schema(description = "库存数量", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "库存数量不能为空")
-    private BigDecimal inventorylQty;
+    private BigDecimal inventoryQty;
 
     @Schema(description = "盘点数量", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "盘点数量不能为空")
-    private BigDecimal countlQty;
+    private BigDecimal countQty;
 
     @Schema(description = "调整数量", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "调整数量不能为空")
-    private BigDecimal adjustlQty;
+    private BigDecimal adjustQty;
 
     @Schema(description = "单据号")
     private String number;
@@ -76,16 +72,16 @@ public class CountadjustRequestDetailBaseVO {
     private String creator;
 
     @Schema(description = "物品名称")
-    private String itemlName;
+    private String itemName;
 
     @Schema(description = "物品描述1")
-    private String itemlDesc1;
+    private String itemDesc1;
 
     @Schema(description = "物品描述2")
-    private String itemlDesc2;
+    private String itemDesc2;
 
     @Schema(description = "项目代码")
-    private String projectlCode;
+    private String projectCode;
 
     @Schema(description = "数量")
     private BigDecimal qty;
@@ -101,6 +97,6 @@ public class CountadjustRequestDetailBaseVO {
     private String updater;
 
     @Schema(description = "物品代码")
-    private String itemlCode;
+    private String itemCode;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExcelVO.java

@@ -1,18 +1,12 @@
 package com.win.module.wms.controller.countadjustRequest.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 
 /**
@@ -27,32 +21,32 @@ public class CountadjustRequestDetailExcelVO {
     private String countDetailNumber;
 
     @ExcelProperty("货主代码")
-    private String ownerlCode;
+    private String ownerCode;
 
     @ExcelProperty("包装号")
-    private String packinglNumber;
+    private String packingNumber;
 
     @ExcelProperty("器具号")
-    private String containerlNumber;
+    private String containerNumber;
 
     @ExcelProperty("批次")
     private String batch;
 
     @ExcelProperty("库位代码")
-    private String locationlCode;
+    private String locationCode;
 
     @ExcelProperty(value = "库存状态", converter = DictConvert.class)
     @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private String inventorylStatus;
+    private String inventoryStatus;
 
     @ExcelProperty("库存数量")
-    private BigDecimal inventorylQty;
+    private BigDecimal inventoryQty;
 
     @ExcelProperty("盘点数量")
-    private BigDecimal countlQty;
+    private BigDecimal countQty;
 
     @ExcelProperty("调整数量")
-    private BigDecimal adjustlQty;
+    private BigDecimal adjustQty;
 
     @ExcelProperty("单据号")
     private String number;
@@ -67,16 +61,16 @@ public class CountadjustRequestDetailExcelVO {
     private String creator;
 
     @ExcelProperty("物品名称")
-    private String itemlName;
+    private String itemName;
 
     @ExcelProperty("物品描述1")
-    private String itemlDesc1;
+    private String itemDesc1;
 
     @ExcelProperty("物品描述2")
-    private String itemlDesc2;
+    private String itelDesc2;
 
     @ExcelProperty("项目代码")
-    private String projectlCode;
+    private String projectCode;
 
     @ExcelProperty("数量")
     private BigDecimal qty;
@@ -92,6 +86,6 @@ public class CountadjustRequestDetailExcelVO {
     private String updater;
 
     @ExcelProperty("物品代码")
-    private String itemlCode;
+    private String itemCode;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java

@@ -1,13 +1,11 @@
 package com.win.module.wms.controller.countadjustRequest.vo;
 
-import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-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;
 
@@ -19,31 +17,31 @@ public class CountadjustRequestDetailExportReqVO {
     private String countDetailNumber;
 
     @Schema(description = "货主代码")
-    private String ownerlCode;
+    private String ownerCode;
 
     @Schema(description = "包装号")
-    private String packinglNumber;
+    private String packingNumber;
 
     @Schema(description = "器具号")
-    private String containerlNumber;
+    private String containerNumber;
 
     @Schema(description = "批次")
     private String batch;
 
     @Schema(description = "库位代码")
-    private String locationlCode;
+    private String locationCode;
 
     @Schema(description = "库存状态")
-    private String inventorylStatus;
+    private String inventoryStatus;
 
     @Schema(description = "库存数量")
-    private BigDecimal inventorylQty;
+    private BigDecimal inventoryQty;
 
     @Schema(description = "盘点数量")
-    private BigDecimal countlQty;
+    private BigDecimal countQty;
 
     @Schema(description = "调整数量")
-    private BigDecimal adjustlQty;
+    private BigDecimal adjustQty;
 
     @Schema(description = "单据号")
     private String number;
@@ -59,16 +57,16 @@ public class CountadjustRequestDetailExportReqVO {
     private String creator;
 
     @Schema(description = "物品名称")
-    private String itemlName;
+    private String itemName;
 
     @Schema(description = "物品描述1")
-    private String itemlDesc1;
+    private String itemDesc1;
 
     @Schema(description = "物品描述2")
-    private String itemlDesc2;
+    private String itemDesc2;
 
     @Schema(description = "项目代码")
-    private String projectlCode;
+    private String projectCode;
 
     @Schema(description = "数量")
     private BigDecimal qty;
@@ -84,6 +82,6 @@ public class CountadjustRequestDetailExportReqVO {
     private String updater;
 
     @Schema(description = "物品代码")
-    private String itemlCode;
+    private String itemCode;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.countadjustRequest.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -21,31 +22,31 @@ public class CountadjustRequestDetailPageReqVO extends PageParam {
     private String countDetailNumber;
 
     @Schema(description = "货主代码")
-    private String ownerlCode;
+    private String ownerCode;
 
     @Schema(description = "包装号")
-    private String packinglNumber;
+    private String packingNumber;
 
     @Schema(description = "器具号")
-    private String containerlNumber;
+    private String containerNumber;
 
     @Schema(description = "批次")
     private String batch;
 
     @Schema(description = "库位代码")
-    private String locationlCode;
+    private String locationCode;
 
     @Schema(description = "库存状态")
-    private String inventorylStatus;
+    private String inventoryStatus;
 
     @Schema(description = "库存数量")
-    private BigDecimal inventorylQty;
+    private BigDecimal inventoryQty;
 
     @Schema(description = "盘点数量")
-    private BigDecimal countlQty;
+    private BigDecimal countQty;
 
     @Schema(description = "调整数量")
-    private BigDecimal adjustlQty;
+    private BigDecimal adjustQty;
 
     @Schema(description = "单据号")
     private String number;
@@ -61,16 +62,16 @@ public class CountadjustRequestDetailPageReqVO extends PageParam {
     private String creator;
 
     @Schema(description = "物品名称")
-    private String itemlName;
+    private String itemName;
 
     @Schema(description = "物品描述1")
-    private String itemlDesc1;
+    private String itemDesc1;
 
     @Schema(description = "物品描述2")
-    private String itemlDesc2;
+    private String itemDesc2;
 
     @Schema(description = "项目代码")
-    private String projectlCode;
+    private String projectCode;
 
     @Schema(description = "数量")
     private BigDecimal qty;
@@ -86,6 +87,6 @@ public class CountadjustRequestDetailPageReqVO extends PageParam {
     private String updater;
 
     @Schema(description = "物品代码")
-    private String itemlCode;
+    private String itemCode;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainBaseVO.java

@@ -1,15 +1,12 @@
 package com.win.module.wms.controller.countadjustRequest.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 javax.validation.constraints.*;
+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;
 
 /**
@@ -22,10 +19,6 @@ public class CountadjustRequestMainBaseVO {
     @Schema(description = "id", example = "id")
     private Long id;
 
-    @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "申请单号不能为空")
-    private String requestNumber;
-
     @Schema(description = "盘点记录单号")
     private String countRecordNumber;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java

@@ -1,16 +1,11 @@
 package com.win.module.wms.controller.countadjustRequest.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 com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 
 /**
@@ -21,9 +16,6 @@ import com.win.framework.excel.core.convert.DictConvert;
 @Data
 public class CountadjustRequestMainExcelVO {
 
-    @ExcelProperty("申请单号")
-    private String requestNumber;
-
     @ExcelProperty("盘点记录单号")
     private String countRecordNumber;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExportReqVO.java

@@ -1,21 +1,17 @@
 package com.win.module.wms.controller.countadjustRequest.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 lombok.Data;
 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 = "管理后台 - 盘点调整申请主 Excel 导出 Request VO，参数和 CountadjustRequestMainPageReqVO 是一致的")
 @Data
 public class CountadjustRequestMainExportReqVO {
 
-    @Schema(description = "申请单号")
-    private String requestNumber;
-
     @Schema(description = "盘点记录单号")
     private String countRecordNumber;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainPageReqVO.java

@@ -1,10 +1,12 @@
 package com.win.module.wms.controller.countadjustRequest.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -15,9 +17,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 @ToString(callSuper = true)
 public class CountadjustRequestMainPageReqVO extends PageParam {
 
-    @Schema(description = "申请单号")
-    private String requestNumber;
-
     @Schema(description = "盘点记录单号")
     private String countRecordNumber;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java

@@ -110,4 +110,9 @@ public class CustomerreceiptRequestMainBaseVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java

@@ -101,4 +101,9 @@ public class CustomerreceiptRequestMainExportReqVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java

@@ -103,4 +103,9 @@ public class CustomerreceiptRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java

@@ -1,11 +1,18 @@
 package com.win.module.wms.controller.customerreturnJob;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreturnJob.vo.*;
+import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExcelVO;
+import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO;
 import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConvert;
+import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert;
 import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
+import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
+import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
+import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.customerreturnJob.CustomerreturnJobDetailService;
 import jodd.util.StringUtil;
 import org.springframework.web.bind.annotation.*;
@@ -121,13 +128,53 @@ public class CustomerreturnJobMainController {
               HttpServletResponse response) throws IOException {
         List<CustomerreturnJobMainDO> list = customerreturnJobMainService.getCustomerreturnJobMainList(exportReqVO);
         // 导出 Excel
-        List<CustomerreturnJobMainExcelVO> datas = CustomerreturnJobMainConvert.INSTANCE.convertList02(list);
-        for(CustomerreturnJobMainExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CustomerreturnJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, resultList,mapDropDown);
     }
-        ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, datas);
+
+    @GetMapping("/export-excel-senior")
+    @Operation(summary = "导出客户退货任务 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportCustomerreturnJobMainSeniorExcel(@Valid CustomerreturnJobMainExportReqVO exportReqVO,
+                                                HttpServletResponse response) throws IOException {
+        List<CustomerreturnJobMainDO> list = customerreturnJobMainService.getCustomerreturnJobMainList(exportReqVO);
+        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CustomerreturnJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "发货任务.xls", "数据", CustomerreturnJobMainExcelVO.class, resultList,mapDropDown);
+    }
+
+    private List<CustomerreturnJobMainExcelVO> getExcelVo(List<CustomerreturnJobMainDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
+        mapDropDown.put(8, transferMode);
+        String[] jobStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STATUS);
+        mapDropDown.put(14, jobStatus);
+        String[] jobStageStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STAGE_STATUS);
+        mapDropDown.put(18, jobStageStatus);
+        String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(26, locationType);
+        mapDropDown.put(27, locationType);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(47, inventoryStatus);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(58, uom);
+        List<CustomerreturnJobMainExcelVO> resultList = new ArrayList<>();
+        // 导出
+        for(CustomerreturnJobMainDO mainDO : list) {
+            List<CustomerreturnJobDetailDO> subList = customerreturnJobDetailService.selectList(mainDO.getId());
+            for(CustomerreturnJobDetailDO detailDO : subList) {
+                CustomerreturnJobMainExcelVO vo = CustomerreturnJobMainConvert.INSTANCE.convert(mainDO, detailDO);
+                vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+                vo.setCreatorDetail(userApi.getUser(Long.valueOf(vo.getCreatorDetail())).getNickname());
+                vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+                vo.setAcceptUserId(userApi.getUser(Long.valueOf(vo.getAcceptUserId())).getNickname());
+                vo.setCompleteUserId(userApi.getUser(Long.valueOf(vo.getCompleteUserId())).getNickname());
+                resultList.add(vo);
+            }
+        }
+        return resultList;
     }
 
     @GetMapping("/getCustomerreturnJobById")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailUpdateReqVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.customerreturnJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+import java.util.Map;
+
 @Schema(description = "管理后台 - 客户退货任务子更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CustomerreturnJobDetailUpdateReqVO extends CustomerreturnJobDetailBaseVO {
-
+    @Schema(description = "子表记录数据")
+    private List<Map<String,String>> recordList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java

@@ -1,16 +1,12 @@
 package com.win.module.wms.controller.customerreturnJob.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 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.math.BigDecimal;
 import java.time.LocalDateTime;
 
+
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
@@ -24,6 +20,9 @@ import com.win.framework.excel.core.convert.DictConvert;
 @Data
 public class CustomerreturnJobMainExcelVO {
 
+    @ExcelProperty("单据号")
+    private String number;
+
     @ExcelProperty("申请单号")
     private String requestNumber;
 
@@ -49,8 +48,7 @@ public class CustomerreturnJobMainExcelVO {
     @DictFormat("transfer_mode") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String transferMode;
 
-    @ExcelProperty(value = "车牌号", converter = DictConvert.class)
-    @DictFormat("vehicle_plate_number") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @ExcelProperty("车牌号")
     private String vehiclePlateNumber;
 
     @ExcelProperty("从仓库代码")
@@ -60,9 +58,11 @@ public class CustomerreturnJobMainExcelVO {
     private String toWarehouseCode;
 
     @ExcelProperty("申请时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime requestTime;
 
     @ExcelProperty("要求截止时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime requestDueTime;
 
     @ExcelProperty(value = "状态", converter = DictConvert.class)
@@ -70,9 +70,11 @@ public class CustomerreturnJobMainExcelVO {
     private String status;
 
     @ExcelProperty("过期时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime expiredTime;
 
     @ExcelProperty("最后更新时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime updateTime;
 
     @ExcelProperty("最后更新者Id")
@@ -95,12 +97,14 @@ public class CustomerreturnJobMainExcelVO {
     private String acceptUserId;
 
     @ExcelProperty("承接时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime acceptTime;
 
     @ExcelProperty("完成人用户ID")
     private String completeUserId;
 
     @ExcelProperty("完成时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime completeTime;
 
     @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
@@ -111,9 +115,6 @@ public class CustomerreturnJobMainExcelVO {
     @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String toLocationTypes;
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("业务类型")
     private String businessType;
 
@@ -121,6 +122,7 @@ public class CustomerreturnJobMainExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者id")
@@ -164,5 +166,64 @@ public class CustomerreturnJobMainExcelVO {
 
     @ExcelProperty("允许修改箱码")
     private String allowModifyPackingNumber;
+    //子表数据
+//    @ExcelProperty("销售订单号")
+//    private String soNumber;
+//
+//    @ExcelProperty("销售订单行")
+//    private String soLine;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty(value = "库存状态", converter = DictConvert.class)
+    @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String inventoryStatus;
+
+    @ExcelProperty("货主代码")
+    private String ownerCode;
+
+    @ExcelProperty("器具号")
+    private String containerNumber;
+
+    @ExcelProperty("从库位代码")
+    private String fromLocationCode;
+
+    @ExcelProperty("到库位代码")
+    private String toLocationCode;
+
+    @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(value = "计量单位", converter = DictConvert.class)
+    @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String uom;
+
+    @ExcelProperty("备注")
+    private String remarkDetail;
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
+    private LocalDateTime createtimeDetail;
 
+    @ExcelProperty("创建者Id")
+    private String creatorDetail;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainPageReqVO.java

@@ -157,4 +157,9 @@ public class CustomerreturnJobMainPageReqVO extends PageParam {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @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/customerreturnRecord/CustomerreturnRecordMainController.java

@@ -141,20 +141,20 @@ public class CustomerreturnRecordMainController {
 
     private List<CustomerreturnRecordMainExcelVO> getExcelVo(List<CustomerreturnRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
         String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
-        mapDropDown.put(6, transferMode);
+        mapDropDown.put(7, transferMode);
         String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
-        mapDropDown.put(17, requestStatus);
+        mapDropDown.put(18, requestStatus);
         String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
         mapDropDown.put(24, locationType);
         mapDropDown.put(25, locationType);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(28, available);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(33, inventoryStatus);
+        mapDropDown.put(31, inventoryStatus);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(55, uom);
+        mapDropDown.put(53, uom);
         String[] interfaceTypeDetail = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
-        mapDropDown.put(56, interfaceTypeDetail);
+        mapDropDown.put(54, interfaceTypeDetail);
         List<CustomerreturnRecordMainExcelVO> resultList = new ArrayList<>();
         // 导出
         for(CustomerreturnRecordMainDO mainDO : list) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.customerreturnRecord.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -24,6 +25,9 @@ import com.win.framework.excel.core.convert.DictConvert;
 @Data
 public class CustomerreturnRecordMainExcelVO {
 
+    @ExcelProperty("单据号")
+    private String number;
+
     @ExcelProperty("任务单号")
     private String jobNumber;
 
@@ -62,15 +66,19 @@ public class CustomerreturnRecordMainExcelVO {
     private String inTransactionType;
 
     @ExcelProperty("执行时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime executeTime;
 
     @ExcelProperty("生效日期")
+    @ColumnWidth(value = 22)
     private LocalDateTime activeDate;
 
     @ExcelProperty("申请时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime requestTime;
 
     @ExcelProperty("截止时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime dueTime;
 
     @ExcelProperty("部门")
@@ -80,9 +88,6 @@ public class CustomerreturnRecordMainExcelVO {
     @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String interfaceType;
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("业务类型")
     private String businessType;
 
@@ -90,6 +95,7 @@ public class CustomerreturnRecordMainExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者Id")
@@ -120,11 +126,11 @@ public class CustomerreturnRecordMainExcelVO {
     private String fromAreaCodes;
 
     //子表
-    @ExcelProperty("销售订单号")
-    private String soNumber;
-
-    @ExcelProperty("销售订单行")
-    private String soLine;
+//    @ExcelProperty("销售订单号")
+//    private String soNumber;
+//
+//    @ExcelProperty("销售订单行")
+//    private String soLine;
 
     @ExcelProperty("从批次")
     private String fromBatch;
@@ -176,6 +182,7 @@ public class CustomerreturnRecordMainExcelVO {
     private String remarkDetail;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime createTimeDetail;
 
     @ExcelProperty("创建者Id")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java

@@ -135,7 +135,7 @@ public class CustomerreturnRequestMainController {
     @Operation(summary = "导出发货计划主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:deliver-plan-main:export')")
     @OperateLog(type = EXPORT)
-    public void exportPurchasereceiptRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+    public void exportCustomerreturnRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
             List<CustomerreturnRequestMainDO> list = customerreturnRequestMainService.getCustomerreturnRequestMainList(conditions);
             // 导出 Excel
             Map<Integer, String[]> mapDropDown = new HashMap<>();
@@ -145,16 +145,16 @@ public class CustomerreturnRequestMainController {
 
     private List<CustomerreturnRequestMainExcelVO> getExcelVo(List<CustomerreturnRequestMainDO> list, Map<Integer, String[]> mapDropDown) {
         String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
-        mapDropDown.put(7, transferMode);
+        mapDropDown.put(6, transferMode);
         String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
-        mapDropDown.put(16, requestStatus);
+        mapDropDown.put(15, requestStatus);
         String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
-        mapDropDown.put(20, locationType);
-        mapDropDown.put(23, locationType);
+        mapDropDown.put(19, locationType);
+        mapDropDown.put(22, locationType);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(29, inventoryStatus);
+        mapDropDown.put(26, inventoryStatus);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(41, uom);
+        mapDropDown.put(28, uom);
         List<CustomerreturnRequestMainExcelVO> resultList = new ArrayList<>();
         // 导出
         for(CustomerreturnRequestMainDO mainDO : list) {
@@ -178,9 +178,9 @@ public class CustomerreturnRequestMainController {
         String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
         mapDropDown.put(3, transferMode);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(12, uom);
+        mapDropDown.put(10, uom);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(13, inventoryStatus);
+        mapDropDown.put(11, inventoryStatus);
         // 输出
         ExcelUtils.write(response, "客户退货申请信息导入模板.xls", "客户退货申请信息列表", CustomerreturnRequestImportVO.class, list,mapDropDown);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java

@@ -36,11 +36,11 @@ public class CustomerreturnRequestImportVO {
     private String vehiclePlateNumber;
 
     //子表字段
-    @ExcelProperty("销售订单号")
-    private String soNumber;
-
-    @ExcelProperty("销售订单行")
-    private String soLine;
+//    @ExcelProperty("销售订单号")
+//    private String soNumber;
+//
+//    @ExcelProperty("销售订单行")
+//    private String soLine;
 
     @ExcelProperty("物品代码")
     private String itemCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java

@@ -117,4 +117,9 @@ public class CustomerreturnRequestMainBaseVO {
     @NotBlank(message = "直接生成记录不能为空")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExcelVO.java

@@ -27,9 +27,6 @@ public class CustomerreturnRequestMainExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("申请单号")
-    private String requestNumber;
-
     @ExcelProperty("发货记录单号")
     private String deliverRecordNumber;
 
@@ -123,11 +120,11 @@ public class CustomerreturnRequestMainExcelVO {
     private String directCreateRecord;
 
     //子表
-    @ExcelProperty("销售订单号")
-    private String soNumber;
-
-    @ExcelProperty("销售订单行")
-    private String soLine;
+//    @ExcelProperty("销售订单号")
+//    private String soNumber;
+//
+//    @ExcelProperty("销售订单行")
+//    private String soLine;
 
     @ExcelProperty("包装号")
     private String packingNumber;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExportReqVO.java

@@ -106,5 +106,4 @@ public class CustomerreturnRequestMainExportReqVO {
 
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainPageReqVO.java

@@ -109,4 +109,9 @@ public class CustomerreturnRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java

@@ -1,8 +1,12 @@
 package com.win.module.wms.controller.customersettleRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO;
+import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.service.customersettleRecord.CustomersettleRecordDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +43,8 @@ public class CustomersettleRecordMainController {
     @Resource
     private CustomersettleRecordMainService customersettleRecordMainService;
     @Resource
+    private CustomersettleRecordDetailService customersettleRecordDetailService;
+    @Resource
     private AdminUserApi userApi;
 
     @PostMapping("/create")
@@ -111,13 +117,46 @@ public class CustomersettleRecordMainController {
               HttpServletResponse response) throws IOException {
         List<CustomersettleRecordMainDO> list = customersettleRecordMainService.getCustomersettleRecordMainList(exportReqVO);
         // 导出 Excel
-        List<CustomersettleRecordMainExcelVO> datas = CustomersettleRecordMainConvert.INSTANCE.convertList02(list);
-        for(CustomersettleRecordMainExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CustomersettleRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "客户结算记录.xls", "数据", CustomersettleRecordMainExcelVO.class, resultList,mapDropDown);
     }
-        ExcelUtils.write(response, "客户结算记录主.xls", "数据", CustomersettleRecordMainExcelVO.class, datas);
+
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出客户结算记录主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportCustomersettleRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<CustomersettleRecordMainDO> list = customersettleRecordMainService.getCustomersettleRecordMainList(conditions);
+        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CustomersettleRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "客户结算记录.xls", "数据", CustomersettleRecordMainExcelVO.class, resultList,mapDropDown);
     }
 
+    private List<CustomersettleRecordMainExcelVO> getExcelVo(List<CustomersettleRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
+        mapDropDown.put(12, interfaceType);
+        mapDropDown.put(39, interfaceType);
+        String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(19, locationType);
+        String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(21, trueFalse);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(27, inventoryStatus);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(38, uom);
+        List<CustomersettleRecordMainExcelVO> resultList = new ArrayList<>();
+        // 导出
+        for(CustomersettleRecordMainDO mainDO : list) {
+            List<CustomersettleRecordDetailDO> subList = customersettleRecordDetailService.selectList(mainDO.getId());
+            for(CustomersettleRecordDetailDO detailDO : subList) {
+                CustomersettleRecordMainExcelVO vo = CustomersettleRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
+                vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+                vo.setCreatorDetail(userApi.getUser(Long.valueOf(vo.getCreatorDetail())).getNickname());
+                resultList.add(vo);
+            }
+        }
+        return resultList;
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailBaseVO.java

@@ -101,4 +101,7 @@ public class CustomersettleRecordDetailBaseVO {
     @Schema(description = "任务明细ID", example = "9271")
     private String jobDetailId;
 
+    @Schema(description = "主表id")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExcelVO.java

@@ -102,4 +102,7 @@ public class CustomersettleRecordDetailExcelVO {
     @ExcelProperty("任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主表id")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExportReqVO.java

@@ -94,4 +94,7 @@ public class CustomersettleRecordDetailExportReqVO {
     @Schema(description = "任务明细ID", example = "9271")
     private String jobDetailId;
 
+    @Schema(description = "主表id")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailPageReqVO.java

@@ -96,4 +96,7 @@ public class CustomersettleRecordDetailPageReqVO extends PageParam {
     @Schema(description = "任务明细ID", example = "9271")
     private String jobDetailId;
 
+    @Schema(description = "主表id")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainCreateReqVO.java

@@ -1,12 +1,18 @@
 package com.win.module.wms.controller.customersettleRecord.vo;
 
+import com.win.framework.excel.core.annotations.SubObject;
+import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 客户结算记录主创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CustomersettleRecordMainCreateReqVO extends CustomersettleRecordMainBaseVO {
-
+    @SubObject
+    @Schema(description = "子表数据")
+    private List<CustomersettleRecordDetailCreateReqVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.customersettleRecord.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -22,6 +25,9 @@ import com.win.framework.excel.core.convert.DictConvert;
 @Data
 public class CustomersettleRecordMainExcelVO {
 
+    @ExcelProperty("单据号")
+    private String number;
+
     @ExcelProperty("申请单号")
     private String requestNumber;
 
@@ -41,15 +47,19 @@ public class CustomersettleRecordMainExcelVO {
     private String inTransactionYpe;
 
     @ExcelProperty("执行时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime executeTime;
 
     @ExcelProperty("生效日期")
+    @ColumnWidth(value = 22)
     private LocalDateTime activeDate;
 
     @ExcelProperty("申请时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime requestTime;
 
     @ExcelProperty("截止时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime dueTime;
 
     @ExcelProperty("部门")
@@ -62,13 +72,11 @@ public class CustomersettleRecordMainExcelVO {
     @ExcelProperty("代码")
     private String code;
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("业务类型")
     private String businessType;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者Id")
@@ -87,7 +95,86 @@ public class CustomersettleRecordMainExcelVO {
     @ExcelProperty("从库区代码范围")
     private String fromAreaCodes;
 
-    @ExcelProperty("是否可用")
+    @ExcelProperty(value = "是否可用", converter = DictConvert.class)
+    @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String available;
 
+    @ExcelProperty("销售订单号")
+    private String soNumber;
+
+    @ExcelProperty("销售订单行")
+    private String soLine;
+
+    @ExcelProperty("货主代码")
+    private String ownerCode;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty(value = "库存状态", converter = DictConvert.class)
+    @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String inventoryStatus;
+
+    @ExcelProperty("从库位代码")
+    private String fromLocationCode;
+
+    @ExcelProperty("从库位组代码")
+    private String fromLocationGroupCode;
+
+    @ExcelProperty("从库区代码")
+    private String fromAreaCode;
+
+    @ExcelProperty("单价")
+    private BigDecimal singlePrice;
+
+    @ExcelProperty("金额")
+    private BigDecimal amount;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private BigDecimal qty;
+
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
+    @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String uom;
+
+    @ExcelProperty(value = "接口类型", converter = DictConvert.class)
+    @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String interfaceTypeDetail;
+
+    @ExcelProperty("代码")
+    private String codeDetail;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("备注")
+    private String remarkDetail;
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
+    private LocalDateTime createTimeDetail;
+
+    @ExcelProperty("创建者Id")
+    private String creatorDetail;
+
+    @ExcelProperty("地点ID")
+    private String siteId;
+
+    @ExcelProperty("任务明细ID")
+    private String jobDetailId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java

@@ -1,10 +1,18 @@
 package com.win.module.wms.controller.customersettleRequest;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ConvertUtil;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO;
 import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO;
+import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert;
+import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO;
+import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO;
+import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO;
+import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.service.customersettleRequest.CustomersettleRequestDetailService;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -45,6 +53,8 @@ public class CustomersettleRequestMainController {
     @Resource
     private CustomersettleRequestMainService customersettleRequestMainService;
     @Resource
+    private CustomersettleRequestDetailService customersettleRequestDetailService;
+    @Resource
     private AdminUserApi userApi;
 
     @PostMapping("/create")
@@ -117,34 +127,64 @@ public class CustomersettleRequestMainController {
               HttpServletResponse response) throws IOException {
         List<CustomersettleRequestMainDO> list = customersettleRequestMainService.getCustomersettleRequestMainList(exportReqVO);
         // 导出 Excel
-        List<CustomersettleRequestMainExcelVO> datas = CustomersettleRequestMainConvert.INSTANCE.convertList02(list);
-        for(CustomersettleRequestMainExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CustomersettleRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "客户结算申请.xls", "数据", CustomersettleRequestMainExcelVO.class, resultList,mapDropDown);
+    }
+
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出客户结算申请主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportCustomersettleRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<CustomersettleRequestMainDO> list = customersettleRequestMainService.getCustomersettleRequestMainList(conditions);
+        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CustomersettleRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "客户结算申请.xls", "数据", CustomersettleRequestMainExcelVO.class, resultList,mapDropDown);
+    }
+
+    private List<CustomersettleRequestMainExcelVO> getExcelVo(List<CustomersettleRequestMainDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(5, locationType);
+        String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
+        mapDropDown.put(14, requestStatus);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(35, inventoryStatus);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(46, uom);
+        List<CustomersettleRequestMainExcelVO> resultList = new ArrayList<>();
+        // 导出
+        for(CustomersettleRequestMainDO mainDO : list) {
+            List<CustomersettleRequestDetailDO> subList = customersettleRequestDetailService.selectList(mainDO.getId());
+            for(CustomersettleRequestDetailDO detailDO : subList) {
+                CustomersettleRequestMainExcelVO vo = CustomersettleRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
+                vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+                vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+                vo.setUpdaterDetail(userApi.getUser(Long.valueOf(vo.getUpdaterDetail())).getNickname());
+                vo.setCreatorDetail(userApi.getUser(Long.valueOf(vo.getCreatorDetail())).getNickname());
+                resultList.add(vo);
             }
-        ExcelUtils.write(response, "客户结算申请主.xls", "数据", CustomersettleRequestMainExcelVO.class, datas);
+        }
+        return resultList;
     }
 
     @GetMapping("/get-import-template")
-    @Operation(summary = "获得导入制客户结算申请信息模板")
+    @Operation(summary = "获得导入客户结算申请信息模板")
     public void importTemplate(HttpServletResponse response) throws IOException {
         // 手动创建导出 demo
-        List<CustomersettleRequestMainImportVO> list = Arrays.asList(
-
-        );
-
+        List<CustomersettleRequestMainImportVO> list = Arrays.asList();
         // 输出
-        ExcelUtils.write(response, "客户退货申请信息导入模板.xls", "客户退货申请信息列表", CustomersettleRequestMainImportVO.class, list);
+        ExcelUtils.write(response, "客户结算申请信息导入模板.xls", "客户结算申请信息列表", CustomersettleRequestMainImportVO.class, list);
     }
     @PostMapping("/import")
-    @Operation(summary = "导入发料申请基本信息")
+    @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:inspect-request-main:import')")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:import')")
     public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
                                                          @RequestParam("file") MultipartFile file,
                                                          @RequestParam(value = "mode") Integer mode,
@@ -152,14 +192,67 @@ public class CustomersettleRequestMainController {
         List<CustomersettleRequestMainImportVO> list = ExcelUtils.read(file, CustomersettleRequestMainImportVO.class);
         ConvertUtil<CustomersettleRequestMainCreateReqVO> convertUtil = new ConvertUtil<>(CustomersettleRequestMainCreateReqVO.class);
         List<CustomersettleRequestMainCreateReqVO> createReqVOList = convertUtil.invoke(list).getDataList();
-        List<CustomersettleRequestImportErrorVO> errorList = customersettleRequestMainService.customersettleRequestMainService(createReqVOList, mode, updatePart);
+        List<CustomersettleRequestImportErrorVO> errorList = customersettleRequestMainService.customersettleRequestMainImport(createReqVOList, 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);
+            String url = ExcelUtils.writeLocalFile("客户结算申请基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
             returnMap.put("errorFile", url);
         }
         return success(returnMap);
     }
 
+    @PutMapping("/close")
+    @Operation(summary = "关闭客户结算申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:close')")
+    public CommonResult<Boolean> closeCustomersettleRequestMain(@RequestParam("id") Long id) {
+        Integer count = customersettleRequestMainService.closeCustomersettleRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/reAdd")
+    @Operation(summary = "重新添加客户结算申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:reAdd')")
+    public CommonResult<Boolean> reAddCustomersettleRequestMain(@RequestParam("id") Long id) {
+        Integer count = customersettleRequestMainService.reAddCustomersettleRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/submit")
+    @Operation(summary = "提交客户结算申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:submit')")
+    public CommonResult<Boolean> submitCustomersettleRequestMain(@RequestParam("id") Long id) {
+        Integer count = customersettleRequestMainService.submitCustomersettleRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/agree")
+    @Operation(summary = "审批通过客户结算申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:agree')")
+    public CommonResult<Boolean> agreeCustomersettleRequestMain(@RequestParam("id") Long id) {
+        Integer count = customersettleRequestMainService.agreeCustomersettleRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/handle")
+    @Operation(summary = "处理客户结算申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:handle')")
+    public CommonResult<Boolean> handleCustomersettleRequestMain(@RequestParam("id") Long id) {
+        Integer count = customersettleRequestMainService.handleCustomersettleRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/refused")
+    @Operation(summary = "审批拒绝客户结算申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:refused')")
+    public CommonResult<Boolean> abortCustomersettleRequestMain(@RequestParam("id") Long id) {
+        Integer count = customersettleRequestMainService.abortCustomersettleRequestMain(id);
+        return success(count > 0);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailBaseVO.java

@@ -83,4 +83,6 @@ public class CustomersettleRequestDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
+    @Schema(description = "主表id")
+    private String masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExportReqVO.java

@@ -77,4 +77,7 @@ public class CustomersettleRequestDetailExportReqVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
+    @Schema(description = "主表id")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailPageReqVO.java

@@ -79,4 +79,7 @@ public class CustomersettleRequestDetailPageReqVO extends PageParam {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
+    @Schema(description = "主表id")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.customersettleRequest.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -21,6 +24,9 @@ import com.win.framework.excel.core.convert.DictConvert;
 @Data
 public class CustomersettleRequestMainExcelVO {
 
+    @ExcelProperty("单据号")
+    private String number;
+
     @ExcelProperty("发货记录单号")
     private String deliverRecordNumber;
 
@@ -40,9 +46,6 @@ public class CustomersettleRequestMainExcelVO {
     @ExcelProperty("从库区代码范围")
     private String fromAreaCodes;
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("业务类型")
     private String businessType;
 
@@ -50,15 +53,18 @@ public class CustomersettleRequestMainExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者用户名")
     private String creator;
 
     @ExcelProperty("申请时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime requestTime;
 
     @ExcelProperty("截止时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime dueTime;
 
     @ExcelProperty("部门")
@@ -69,6 +75,7 @@ public class CustomersettleRequestMainExcelVO {
     private String status;
 
     @ExcelProperty("最后更新时间")
+    @ColumnWidth(value = 22)
     private LocalDateTime updateTime;
 
     @ExcelProperty("最后更新者用户名")
@@ -86,4 +93,66 @@ public class CustomersettleRequestMainExcelVO {
     @ExcelProperty("直接生成记录")
     private String directCreateRecord;
 
+    //子表字段
+    @ExcelProperty("销售订单号")
+    private String soNumber;
+
+    @ExcelProperty("销售订单行")
+    private String soLine;
+
+    @ExcelProperty("从货主代码")
+    private String fromOwnerCode;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty(value = "库存状态", converter = DictConvert.class)
+    @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String inventoryStatus;
+
+    @ExcelProperty("从库位代码")
+    private String fromLocationCode;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("备注")
+    private String remarkDetail;
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 22)
+    private LocalDateTime createTimeDetail;
+
+    @ExcelProperty("创建者用户名")
+    private String creatorDetail;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private BigDecimal qty;
+
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
+    @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String uom;
+
+    @ExcelProperty("最后更新时间")
+    @ColumnWidth(value = 22)
+    private LocalDateTime updateTimeDetail;
+
+    @ExcelProperty("最后更新者用户名")
+    private String updaterDetail;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainImportVO.java

@@ -8,24 +8,31 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+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;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class CustomersettleRequestMainImportVO {
+
+    @ExcelProperty("单据号")
+    private String number;
     //主表字段
     @ExcelProperty("发货记录单号")
     private String deliverRecordNumber;
 
     //子表字段
-    @ExcelProperty("销售订单号")
-    private String soNumber;
-
-    @ExcelProperty("销售订单行")
-    private String soLine;
+//    @ExcelProperty("销售订单号")
+//    private String soNumber;
+//
+//    @ExcelProperty("销售订单行")
+//    private String soLine;
 
     @ExcelProperty("物品代码")
     private String itemCode;
@@ -36,4 +43,8 @@ public class CustomersettleRequestMainImportVO {
     @ExcelProperty("批次")
     private String batch;
 
+    @ExcelProperty("截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime dueTime;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainPageReqVO.java

@@ -82,4 +82,9 @@ public class CustomersettleRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java

@@ -151,17 +151,6 @@ public class DeliverJobMainController {
         mapDropDown.put(26, locationType);
         mapDropDown.put(27, locationType);
         String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(35, trueFalse);
-        mapDropDown.put(36, trueFalse);
-        mapDropDown.put(37, trueFalse);
-        mapDropDown.put(38, trueFalse);
-        mapDropDown.put(39, trueFalse);
-        mapDropDown.put(40, trueFalse);
-        mapDropDown.put(41, trueFalse);
-        mapDropDown.put(42, trueFalse);
-        mapDropDown.put(43, trueFalse);
-        mapDropDown.put(44, trueFalse);
-        mapDropDown.put(45, trueFalse);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
         mapDropDown.put(50, inventoryStatus);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExportReqVO.java

@@ -157,9 +157,4 @@ public class DeliverJobMainExportReqVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
-    @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/deliverRequest/vo/DeliverRequestMainBaseVO.java

@@ -115,4 +115,9 @@ public class DeliverRequestMainBaseVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainPageReqVO.java

@@ -106,4 +106,9 @@ public class DeliverRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatus;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java

@@ -7,6 +7,7 @@ import com.win.framework.excel.core.util.ConvertUtil;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.convert.issueRequest.IssueRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
 import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
 import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
 import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
@@ -29,6 +30,7 @@ import io.swagger.v3.oas.annotations.Operation;
 
 import javax.validation.*;
 import javax.servlet.http.*;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
@@ -310,6 +312,8 @@ public class IssueRequestMainController {
                     Map<String,Object> mapWorkstation = new HashMap<>();
                     mapWorkstation.put("value", workstationItem.getCode());
                     mapWorkstation.put("label", workstationItem.getName());
+                    mapWorkstation.put("rawLocationCode", workstationItem.getRawLocationCode());
+                    mapWorkstation.put("fgLocationCode", workstationItem.getFgLocationCode());
                     workstationCodeList.add(mapWorkstation);
                 });
                 if (workstationCodeList != null && workstationCodeList.size() > 0) {
@@ -318,6 +322,8 @@ public class IssueRequestMainController {
                     Map<String,Object> mapworkstationNull = new HashMap<>();
                     mapworkstationNull.put("value", "");
                     mapworkstationNull.put("label", "");
+                    mapworkstationNull.put("rawLocationCode", "");
+                    mapworkstationNull.put("fgLocationCode", "");
                     List WorkstationListNUll = new ArrayList();
                     WorkstationListNUll.add(mapworkstationNull);
                     mapProductionline.put("children", WorkstationListNUll);
@@ -333,6 +339,8 @@ public class IssueRequestMainController {
                 Map<String,Object> workstationMapNull = new HashMap<>();
                 workstationMapNull.put("value", "");
                 workstationMapNull.put("label", "");
+                workstationMapNull.put("rawLocationCode", "");
+                workstationMapNull.put("fgLocationCode", "");
                 workstationListNUll.add(workstationMapNull);
 
                 productionlineMapNull.put("value", "");
@@ -365,4 +373,19 @@ public class IssueRequestMainController {
         result.setSubList(vos);
         return success(result);
     }
+
+    /**
+     * PDA 获取库存推荐
+     * @param itemCode
+     * @param qty
+     * @return
+     */
+    @GetMapping("/getBalanceByBatchOffShelf")
+    @Operation(summary = "获取库存推荐")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<List<IssueJobDetailDO>> getBalanceByBatchOffShelf(@RequestParam("itemCode") String itemCode,
+                                                                    @RequestParam("qty") BigDecimal qty) {
+        List<IssueJobDetailDO> issueJobDetailDOList = issueRequestMainService.getBalanceByBatchOffShelf(itemCode, qty);
+        return success(issueJobDetailDOList);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java

@@ -48,6 +48,13 @@ public class PackageController {
         return success(packageService.createPackage(createReqVO));
     }
 
+    @PostMapping("/createLabel")
+    @Operation(summary = "创建包装标签")
+    @PreAuthorize("@ss.hasPermission('wms:package:create')")
+    public CommonResult<PackageDO> createPackageLabel(@Valid @RequestBody PackageCreateReqVO createReqVO) {
+        return success(packageService.createPackageLabel(createReqVO));
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新包装")
     @PreAuthorize("@ss.hasPermission('wms:package:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java

@@ -151,4 +151,10 @@ public class PackageBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
+    /**
+     * 额外扩展的 区分出 是制造件的生产线
+     */
+    @Schema(description = "生产线")
+    private String productionLineCodePackage;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java

@@ -51,8 +51,8 @@ public class ProductionreturnRequestDetailController {
     @PutMapping("/update")
     @Operation(summary = "更新生产退料申请子")
     @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-detail:update')")
-    public CommonResult<Boolean> updateProductionreturnRequestDetail(@Valid @RequestBody ProductionreturnRequestDetailUpdateReqVO updateReqVO, @RequestBody RequestsettingDO requestsettingDO) {
-        productionreturnRequestDetailService.updateProductionreturnRequestDetail(updateReqVO,requestsettingDO);
+    public CommonResult<Boolean> updateProductionreturnRequestDetail(@Valid @RequestBody ProductionreturnRequestDetailUpdateReqVO updateReqVO) {
+        productionreturnRequestDetailService.updateProductionreturnRequestDetail(updateReqVO);
         return success(true);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java

@@ -9,13 +9,18 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainExcelVO;
 import com.win.module.wms.controller.productionreturnRequest.vo.*;
+import com.win.module.wms.convert.issueRequest.IssueRequestMainConvert;
 import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert;
 import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
+import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
+import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
+import com.win.module.wms.service.packageMassage.PackageService;
 import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService;
@@ -103,6 +108,48 @@ public class ProductionreturnRequestMainController {
         return success(ProductionreturnRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @GetMapping("/export-excel-senior")
+    @Operation(summary = "导出生产计划主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductionreturnRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ProductionreturnRequestMainDO> list = productionreturnRequestMainService.getProductionreturnRequestMainList(conditions);
+        //组装vo
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProductionreturnRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        resultList.forEach(item -> {
+            //后端创建个字段作为前端展示的虚拟字段
+            item.setCreator(userApi.getUser(Long.valueOf(item.getCreator())).getNickname());
+            item.setUpdater(userApi.getUser(Long.valueOf(item.getUpdater())).getNickname());
+        });
+        ExcelUtils.write(response, "生产退料申请.xlsx", "生产退料申请", ProductionreturnRequestMainExcelVO.class, resultList, mapDropDown);
+    }
+
+    private List<ProductionreturnRequestMainExcelVO> getExcelVo(List<ProductionreturnRequestMainDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] locationTypes = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(8, locationTypes);
+        mapDropDown.put(9, locationTypes);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(14, available);
+        mapDropDown.put(15, available);
+        mapDropDown.put(16, available);
+        mapDropDown.put(17, available);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(24, inventoryStatus);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(35, uom);
+        List<ProductionreturnRequestMainExcelVO> resultList = new ArrayList<>();
+        // 导出
+        for(ProductionreturnRequestMainDO mainDO : list) {
+            List<ProductionreturnRequestDetailDO> subList = productionreturnRequestDetailService.selectList(mainDO.getId());
+            for(ProductionreturnRequestDetailDO detailDO : subList) {
+                ProductionreturnRequestMainExcelVO vo = ProductionreturnRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
+                resultList.add(vo);
+            }
+        }
+        return resultList;
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出生产退料申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:export')")
@@ -110,14 +157,15 @@ public class ProductionreturnRequestMainController {
     public void exportProductionreturnRequestMainExcel(@Valid ProductionreturnRequestMainExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ProductionreturnRequestMainDO> list = productionreturnRequestMainService.getProductionreturnRequestMainList(exportReqVO);
-        // 导出 Excel
-        List<ProductionreturnRequestMainExcelVO> datas = ProductionreturnRequestMainConvert.INSTANCE.convertList02(list);
-        for(ProductionreturnRequestMainExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+        //组装vo
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProductionreturnRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        resultList.forEach(item -> {
             //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "生产退料申请主.xls", "数据", ProductionreturnRequestMainExcelVO.class, datas);
+            item.setCreator(userApi.getUser(Long.valueOf(item.getCreator())).getNickname());
+            item.setUpdater(userApi.getUser(Long.valueOf(item.getUpdater())).getNickname());
+        });
+        ExcelUtils.write(response, "生产退料申请.xls", "生产退料申请", ProductionreturnRequestMainExcelVO.class, resultList);
     }
 
     @PostMapping("/senior")
@@ -215,4 +263,58 @@ public class ProductionreturnRequestMainController {
         }
         return success(returnMap);
     }
+
+    @PutMapping("/close")
+    @Operation(summary = "关闭")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:close')")
+    public CommonResult<Boolean> closeProductionreturnRequestMain(@RequestParam("id") Long id) {
+        Integer count = productionreturnRequestMainService.closeProductionreturnRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/reAdd")
+    @Operation(summary = "重新添加")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:reAdd')")
+    public CommonResult<Boolean> reAddProductionreturnRequestMain(@RequestParam("id") Long id) {
+        Integer count = productionreturnRequestMainService.reAddProductionreturnRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/submit")
+    @Operation(summary = "提交审批")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:submit')")
+    public CommonResult<Boolean> submitProductionreturnRequestMain(@RequestParam("id") Long id) {
+        Integer count = productionreturnRequestMainService.submitProductionreturnRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/refused")
+    @Operation(summary = "驳回")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:refused')")
+    public CommonResult<Boolean> refusedProductionreturnRequestMain(@RequestParam("id") Long id) {
+        Integer count = productionreturnRequestMainService.refusedProductionreturnRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/agree")
+    @Operation(summary = "审批通过")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:agree')")
+    public CommonResult<Boolean> agreeProductionreturnRequestMain(@RequestParam("id") Long id) {
+        Integer count = productionreturnRequestMainService.agreeProductionreturnRequestMain(id);
+        return success(count > 0);
+    }
+
+    @PutMapping("/handle")
+    @Operation(summary = "处理")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:handle')")
+    public CommonResult<Boolean> handleProductionreturnRequestMain(@RequestParam("id") Long id) {
+        Integer count = productionreturnRequestMainService.handleProductionreturnRequestMain(id);
+        return success(count > 0);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java

@@ -89,4 +89,7 @@ public class ProductionreturnRequestDetailBaseVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailPageReqVO.java

@@ -85,4 +85,7 @@ public class ProductionreturnRequestDetailPageReqVO extends PageParam {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainExcelVO.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.productionreturnRequest.vo;
 
+import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.enums.job.JobStatusConverter;
+import com.win.module.wms.enums.request.RequestStatusConverter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -24,15 +27,6 @@ public class ProductionreturnRequestMainExcelVO {
     @ExcelProperty("车间代码")
     private String workshopCode;
 
-    @ExcelProperty("从仓库代码")
-    private String fromWarehouseCode;
-
-    @ExcelProperty("从库位类型范围")
-    private String fromLocationTypes;
-
-    @ExcelProperty("从库区代码范围")
-    private String fromAreaCodes;
-
     @ExcelProperty("单据号")
     private String number;
 
@@ -42,12 +36,6 @@ public class ProductionreturnRequestMainExcelVO {
     @ExcelProperty("备注")
     private String remark;
 
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ExcelProperty("创建者用户名")
-    private String creator;
-
     @ExcelProperty("申请时间")
     private LocalDateTime requestTime;
 
@@ -57,36 +45,101 @@ public class ProductionreturnRequestMainExcelVO {
     @ExcelProperty("部门")
     private String departmentCode;
 
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat("request_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @ExcelProperty(value = "状态", converter = RequestStatusConverter.class)
     private String status;
 
-    @ExcelProperty("最后更新时间")
-    private LocalDateTime updateTime;
-
-    @ExcelProperty("最后更新者用户名")
-    private String updater;
-
-    @ExcelProperty("到仓库代码")
-    private String toWarehouseCode;
-
+    @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.LOCATION_TYPE)
+    private String fromLocationTypes;
     @ExcelProperty(value = "到库位类型范围", converter = DictConvert.class)
-    @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.LOCATION_TYPE)
     private String toLocationTypes;
-
+    @ExcelProperty("从库区代码范围")
+    private String fromAreaCodes;
     @ExcelProperty("到库区代码范围")
     private String toAreaCodes;
+    @ExcelProperty("从仓库代码")
+    private String fromWarehouseCode;
+    @ExcelProperty("到仓库代码")
+    private String toWarehouseCode;
 
-    @ExcelProperty("自动提交")
+    @ExcelProperty(value = "自动提交", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String autoCommit;
 
-    @ExcelProperty("自动通过")
+    @ExcelProperty(value = "自动通过", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String autoAgree;
 
-    @ExcelProperty("自动执行")
+    @ExcelProperty(value = "自动执行", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String autoExecute;
 
-    @ExcelProperty("直接生成记录")
+    @ExcelProperty(value = "直接生成记录", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String directCreateRecord;
 
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者用户名")
+    private String creator;
+
+    @ExcelProperty("最后更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("最后更新者用户名")
+    private String updater;
+
+    // 子表数据
+    @ExcelProperty("生产线代码")
+    private String productionLineCode;
+
+    @ExcelProperty("工位代码")
+    private String workStationCode;
+
+    @ExcelProperty(value = "库存状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.INVENTORY_STATUS)
+    private String inventoryStatus;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("器具号")
+    private String containerNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty("从库位代码")
+    private String fromLocationCode;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private String qty;
+
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.UOM)
+    private String uom;
+
+    @ExcelProperty("从货主代码")
+    private String fromOwnerCode;
+
+    @ExcelProperty("到货主代码")
+    private String toOwnerCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainUpdateReqVO.java

@@ -8,5 +8,6 @@ import lombok.*;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductionreturnRequestMainUpdateReqVO extends ProductionreturnRequestMainBaseVO {
-
+    @Schema(description = "是否合格退料")
+    private Boolean isOK;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java

@@ -209,4 +209,12 @@ public class SupplierdeliverRequestMainController {
         return success(count > 0);
     }
 
+    @PostMapping("/genLabel")
+    @Operation(summary = "生成标签")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> genLabel(@RequestParam("id") String id) {
+        Integer count = supplierdeliverRequestMainService.genLabel(id);
+        return success(count > 0);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java

@@ -34,34 +34,34 @@ public class SupplierdeliverRequestDetailBaseVO {
     private String altBatch;
 
     @Schema(description = "到货日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到货日期不能为空")
+//    @NotNull(message = "到货日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime arriveDate;
 
     @Schema(description = "生产日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产日期不能为空")
+//    @NotNull(message = "生产日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime produceDate;
 
     @Schema(description = "过期日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "过期日期不能为空")
+//    @NotNull(message = "过期日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime expireDate;
 
     @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "订单号不能为空")
+//    @NotNull(message = "订单号不能为空")
     private String poNumber;
 
     @Schema(description = "订单行", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "订单行不能为空")
+//    @NotNull(message = "订单行不能为空")
     private String poLine;
 
     @Schema(description = "标包数量", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "标包数量不能为空")
+//    @NotNull(message = "标包数量不能为空")
     private BigDecimal stdPackQty;
 
     @Schema(description = "标包单位", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "标包单位不能为空")
+//    @NotNull(message = "标包单位不能为空")
     private String stdPackUnit;
 
     @Schema(description = "供应商计量数量")
@@ -71,14 +71,14 @@ public class SupplierdeliverRequestDetailBaseVO {
     private String supplierPackUnit;
 
     @Schema(description = "转换率", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "转换率不能为空")
+//    @NotNull(message = "转换率不能为空")
     private BigDecimal convertRate;
 
     @Schema(description = "单据号")
     private String number;
 
     @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物品代码不能为空")
+//    @NotNull(message = "物品代码不能为空")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -121,5 +121,9 @@ public class SupplierdeliverRequestDetailBaseVO {
 
     @Schema(description = "到货主代码")
     private String toOwnerCode;
+    /**
+     * 主表ID
+     */
+    private Long masterId;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java

@@ -102,5 +102,9 @@ public class SupplierdeliverRequestDetailPageReqVO extends PageParam {
 
     @Schema(description = "到货主代码")
     private String toOwnerCode;
+    /**
+     * 主表ID
+     */
+    private Long masterId;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreturnJob/CustomerreturnJobMainConvert.java

@@ -8,8 +8,11 @@ import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainC
 import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO;
 import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainRespVO;
 import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
 import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO;
 
@@ -36,4 +39,17 @@ public interface CustomerreturnJobMainConvert {
     List<CustomerreturnJobMainExcelVO> convertList02(List<CustomerreturnJobMainDO> list);
 
     CustomerreturnJobMainDO convert(CustomerreturnRequestMainDO mainDO);
+
+    @Mappings({
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+            @Mapping(source = "detailDO.remark", target = "remarkDetail"),
+            @Mapping(source = "detailDO.createTime", target = "createtimeDetail"),
+            @Mapping(source = "detailDO.creator", target = "creatorDetail"),
+    })
+    CustomerreturnJobMainExcelVO convert(CustomerreturnJobMainDO mainDO, CustomerreturnJobDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRecord/CustomersettleRecordDetailConvert.java

@@ -8,6 +8,7 @@ import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecor
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailExcelVO;
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailRespVO;
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailUpdateReqVO;
+import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordMainDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRecord/CustomersettleRecordMainConvert.java

@@ -8,7 +8,10 @@ import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecor
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainExcelVO;
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainRespVO;
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordMainDO;
 
@@ -33,5 +36,19 @@ public interface CustomersettleRecordMainConvert {
     PageResult<CustomersettleRecordMainRespVO> convertPage(PageResult<CustomersettleRecordMainDO> page);
 
     List<CustomersettleRecordMainExcelVO> convertList02(List<CustomersettleRecordMainDO> list);
-
+    @Mappings({
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.code", target = "code"),
+            @Mapping(source = "mainDO.interfaceType", target = "interfaceType"),
+            @Mapping(source = "detailDO.remark", target = "remarkDetail"),
+            @Mapping(source = "detailDO.createTime", target = "createTimeDetail"),
+            @Mapping(source = "detailDO.creator", target = "creatorDetail"),
+            @Mapping(source = "detailDO.code", target = "codeDetail"),
+            @Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"),
+            @Mapping(source = "detailDO.siteId", target = "siteId"),
+    })
+    CustomersettleRecordMainExcelVO convert(CustomersettleRecordMainDO mainDO, CustomersettleRecordDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRequest/CustomersettleRequestDetailConvert.java

@@ -44,6 +44,9 @@ public interface CustomersettleRequestDetailConvert {
     CustomersettleRequestDetailExcelVO convert(CustomersettleRequestMainDO mainDO, CustomersettleRequestDetailDO detailDO);
 
 
+    @Mappings({
+            @Mapping(source = "mainVo.number", target = "number"),
+    })
     CustomersettleRequestImportErrorVO convert(CustomersettleRequestMainCreateReqVO mainVo, CustomersettleRequestDetailCreateReqVO detailVo);
 
     CustomersettleRequestDetailCreateReqVO convert1(CustomersettleRequestDetailDO detailDO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRequest/CustomersettleRequestMainConvert.java

@@ -4,11 +4,11 @@ import java.util.*;
 
 import com.win.framework.common.pojo.PageResult;
 
-import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO;
-import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainExcelVO;
-import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainRespVO;
-import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainUpdateReqVO;
+import com.win.module.wms.controller.customersettleRequest.vo.*;
+import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestMainDO;
 
@@ -34,4 +34,22 @@ public interface CustomersettleRequestMainConvert {
 
     List<CustomersettleRequestMainExcelVO> convertList02(List<CustomersettleRequestMainDO> list);
 
+    @Mappings({
+            @Mapping(source = "mainDO.number", target = "number"),
+    })
+    CustomersettleRequestImportErrorVO convert(CustomersettleRequestMainCreateReqVO mainDO, CustomersettleRequestDetailDO detailDO);
+    @Mappings({
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+            @Mapping(source = "detailDO.remark", target = "remarkDetail"),
+            @Mapping(source = "detailDO.createTime", target = "createTimeDetail"),
+            @Mapping(source = "detailDO.creator", target = "creatorDetail"),
+            @Mapping(source = "detailDO.updateTime", target = "updateTimeDetail"),
+            @Mapping(source = "detailDO.updater", target = "updaterDetail"),
+    })
+    CustomersettleRequestMainExcelVO convert(CustomersettleRequestMainDO mainDO, CustomersettleRequestDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productionreturnRequest/ProductionreturnRequestMainConvert.java

@@ -35,4 +35,14 @@ public interface ProductionreturnRequestMainConvert {
             @Mapping(source = "createReqVO.number", target = "number"),
     })
     ProductionreturnRequestImportErrorVO convert(ProductionreturnRequestMainCreateReqVO createReqVO, ProductionreturnRequestDetailDO detailDO);
+
+    @Mappings({
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+    })
+    ProductionreturnRequestMainExcelVO convert(ProductionreturnRequestMainDO mainDO, ProductionreturnRequestDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.dal.dataobject.countRecord;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 盘点记录子 DO
@@ -121,7 +121,7 @@ public class CountRecordDetailDO extends BaseDO {
     /**
      * 主表ID
      */
-    private String masterId;
+    private Long masterId;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestDetailDO.java

@@ -1,15 +1,12 @@
 package com.win.module.wms.dal.dataobject.countadjustRequest;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 盘点调整申请子 DO
@@ -37,15 +34,15 @@ public class CountadjustRequestDetailDO extends BaseDO {
     /**
      * 货主代码
      */
-    private String ownerlCode;
+    private String ownerCode;
     /**
      * 包装号
      */
-    private String packinglNumber;
+    private String packingNumber;
     /**
      * 器具号
      */
-    private String containerlNumber;
+    private String containerNumber;
     /**
      * 批次
      */
@@ -53,25 +50,25 @@ public class CountadjustRequestDetailDO extends BaseDO {
     /**
      * 库位代码
      */
-    private String locationlCode;
+    private String locationCode;
     /**
      * 库存状态
      *
      * 枚举 {@link TODO inventory_status 对应的类}
      */
-    private String inventorylStatus;
+    private String inventoryStatus;
     /**
      * 库存数量
      */
-    private BigDecimal inventorylQty;
+    private BigDecimal inventoryQty;
     /**
      * 盘点数量
      */
-    private BigDecimal countlQty;
+    private BigDecimal countQty;
     /**
      * 调整数量
      */
-    private BigDecimal adjustlQty;
+    private BigDecimal adjustQty;
     /**
      * 主表ID
      */
@@ -87,23 +84,23 @@ public class CountadjustRequestDetailDO extends BaseDO {
     /**
      * 地点ID
      */
-    private Long sitelId;
+    private Long siteId;
     /**
      * 物品名称
      */
-    private String itemlName;
+    private String itemName;
     /**
      * 物品描述1
      */
-    private String itemlDesc1;
+    private String itemDesc1;
     /**
      * 物品描述2
      */
-    private String itemlDesc2;
+    private String itemDesc2;
     /**
      * 项目代码
      */
-    private String projectlCode;
+    private String projectCode;
     /**
      * 数量
      */
@@ -117,10 +114,10 @@ public class CountadjustRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencylStamp;
+    private String concurrencyStamp;
     /**
      * 物品代码
      */
-    private String itemlCode;
+    private String itemCode;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestMainDO.java

@@ -1,13 +1,12 @@
 package com.win.module.wms.dal.dataobject.countadjustRequest;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-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
@@ -28,10 +27,6 @@ public class CountadjustRequestMainDO extends BaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 申请单号
-     */
-    private String requestNumber;
     /**
      * 盘点记录单号
      */
@@ -40,10 +35,6 @@ public class CountadjustRequestMainDO extends BaseDO {
      * 仓库代码
      */
     private String warehouseCode;
-    /**
-     * details
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java

@@ -155,5 +155,13 @@ public class CustomerreceiptRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatus;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatus;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java

@@ -243,5 +243,12 @@ public class CustomerreturnJobMainDO extends BaseDO {
      * 允许修改箱码
      */
     private String allowModifyPackingNumber;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatus;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestDetailDO.java

@@ -30,7 +30,6 @@ public class CustomerreturnRequestDetailDO extends BaseDO {
     /**
      * 销售订单号
      */
-    @NotBlank
     private String soNumber;
     /**
      * 销售订单行

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.customerreturnRequest;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -178,5 +179,12 @@ public class CustomerreturnRequestMainDO extends BaseDO {
      */
     @NotBlank
     private String directCreateRecord;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatus;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRecord/CustomersettleRecordMainDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.customersettleRecord;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestDetailDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.customersettleRequest;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.customersettleRequest;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -41,12 +42,10 @@ public class CustomersettleRequestMainDO extends BaseDO {
     /**
      * 客户代码
      */
-    @NotBlank
     private String customerCode;
     /**
      * 从仓库代码
      */
-    @NotBlank
     private String fromWarehouseCode;
     /**
      * 从库位类型范围
@@ -96,14 +95,12 @@ public class CustomersettleRequestMainDO extends BaseDO {
     /**
      * 部门
      */
-    @NotBlank
     private String departmentCode;
     /**
      * 状态
      *
      * 枚举 {@link TODO request_status 对应的类}
      */
-    @NotBlank
     private String status;
     /**
      * 并发乐观锁
@@ -120,22 +117,25 @@ public class CustomersettleRequestMainDO extends BaseDO {
     /**
      * 自动提交
      */
-    @NotBlank
     private String autoCommit;
     /**
      * 自动通过
      */
-    @NotBlank
     private String autoAgree;
     /**
      * 自动执行
      */
-    @NotBlank
     private String autoExecute;
     /**
      * 直接生成记录
      */
-    @NotBlank
     private String directCreateRecord;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatus;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java

@@ -169,5 +169,13 @@ public class DeliverRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatus;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatus;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java

@@ -136,7 +136,7 @@ public class PackageDO{
     /**
      * 采购计划单号
      */
-    private String rpNumber;
+    private String ppNumber;
     /**
      * 发货单号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobMainDO.java

@@ -204,4 +204,13 @@ public class ProductionreturnJobMainDO extends BaseDO {
      */
     private String allowModifyPackingNumber;
 
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestDetailMapper.java

@@ -1,15 +1,15 @@
 package com.win.module.wms.dal.mysql.countadjustRequest;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailExportReqVO;
 import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 盘点调整申请子 Mapper
  *
@@ -21,56 +21,56 @@ public interface CountadjustRequestDetailMapper extends BaseMapperX<CountadjustR
     default PageResult<CountadjustRequestDetailDO> selectPage(CountadjustRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CountadjustRequestDetailDO>()
                 .eqIfPresent(CountadjustRequestDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
-                .eqIfPresent(CountadjustRequestDetailDO::getOwnerlCode, reqVO.getOwnerlCode())
-                .eqIfPresent(CountadjustRequestDetailDO::getPackinglNumber, reqVO.getPackinglNumber())
-                .eqIfPresent(CountadjustRequestDetailDO::getContainerlNumber, reqVO.getContainerlNumber())
+                .eqIfPresent(CountadjustRequestDetailDO::getOwnerCode, reqVO.getOwnerCode())
+                .eqIfPresent(CountadjustRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
+                .eqIfPresent(CountadjustRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(CountadjustRequestDetailDO::getBatch, reqVO.getBatch())
-                .eqIfPresent(CountadjustRequestDetailDO::getLocationlCode, reqVO.getLocationlCode())
-                .eqIfPresent(CountadjustRequestDetailDO::getInventorylStatus, reqVO.getInventorylStatus())
-                .eqIfPresent(CountadjustRequestDetailDO::getInventorylQty, reqVO.getInventorylQty())
-                .eqIfPresent(CountadjustRequestDetailDO::getCountlQty, reqVO.getCountlQty())
-                .eqIfPresent(CountadjustRequestDetailDO::getAdjustlQty, reqVO.getAdjustlQty())
+                .eqIfPresent(CountadjustRequestDetailDO::getLocationCode, reqVO.getLocationCode())
+                .eqIfPresent(CountadjustRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
+                .eqIfPresent(CountadjustRequestDetailDO::getInventoryQty, reqVO.getInventoryQty())
+                .eqIfPresent(CountadjustRequestDetailDO::getCountQty, reqVO.getCountQty())
+                .eqIfPresent(CountadjustRequestDetailDO::getAdjustQty, reqVO.getAdjustQty())
                 .eqIfPresent(CountadjustRequestDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountadjustRequestDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountadjustRequestDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountadjustRequestDetailDO::getCreator, reqVO.getCreator())
-                .likeIfPresent(CountadjustRequestDetailDO::getItemlName, reqVO.getItemlName())
-                .eqIfPresent(CountadjustRequestDetailDO::getItemlDesc1, reqVO.getItemlDesc1())
-                .eqIfPresent(CountadjustRequestDetailDO::getItemlDesc2, reqVO.getItemlDesc2())
-                .eqIfPresent(CountadjustRequestDetailDO::getProjectlCode, reqVO.getProjectlCode())
+                .likeIfPresent(CountadjustRequestDetailDO::getItemName, reqVO.getItemName())
+                .eqIfPresent(CountadjustRequestDetailDO::getItemDesc1, reqVO.getItemDesc1())
+                .eqIfPresent(CountadjustRequestDetailDO::getItemDesc2, reqVO.getItemDesc2())
+                .eqIfPresent(CountadjustRequestDetailDO::getProjectCode, reqVO.getProjectCode())
                 .eqIfPresent(CountadjustRequestDetailDO::getQty, reqVO.getQty())
                 .eqIfPresent(CountadjustRequestDetailDO::getUom, reqVO.getUom())
                 .betweenIfPresent(CountadjustRequestDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .eqIfPresent(CountadjustRequestDetailDO::getUpdater, reqVO.getUpdater())
-                .eqIfPresent(CountadjustRequestDetailDO::getItemlCode, reqVO.getItemlCode())
+                .eqIfPresent(CountadjustRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .orderByDesc(CountadjustRequestDetailDO::getId));
     }
 
     default List<CountadjustRequestDetailDO> selectList(CountadjustRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CountadjustRequestDetailDO>()
                 .eqIfPresent(CountadjustRequestDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
-                .eqIfPresent(CountadjustRequestDetailDO::getOwnerlCode, reqVO.getOwnerlCode())
-                .eqIfPresent(CountadjustRequestDetailDO::getPackinglNumber, reqVO.getPackinglNumber())
-                .eqIfPresent(CountadjustRequestDetailDO::getContainerlNumber, reqVO.getContainerlNumber())
+                .eqIfPresent(CountadjustRequestDetailDO::getOwnerCode, reqVO.getOwnerCode())
+                .eqIfPresent(CountadjustRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
+                .eqIfPresent(CountadjustRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(CountadjustRequestDetailDO::getBatch, reqVO.getBatch())
-                .eqIfPresent(CountadjustRequestDetailDO::getLocationlCode, reqVO.getLocationlCode())
-                .eqIfPresent(CountadjustRequestDetailDO::getInventorylStatus, reqVO.getInventorylStatus())
-                .eqIfPresent(CountadjustRequestDetailDO::getInventorylQty, reqVO.getInventorylQty())
-                .eqIfPresent(CountadjustRequestDetailDO::getCountlQty, reqVO.getCountlQty())
-                .eqIfPresent(CountadjustRequestDetailDO::getAdjustlQty, reqVO.getAdjustlQty())
+                .eqIfPresent(CountadjustRequestDetailDO::getLocationCode, reqVO.getLocationCode())
+                .eqIfPresent(CountadjustRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
+                .eqIfPresent(CountadjustRequestDetailDO::getInventoryQty, reqVO.getInventoryQty())
+                .eqIfPresent(CountadjustRequestDetailDO::getCountQty, reqVO.getCountQty())
+                .eqIfPresent(CountadjustRequestDetailDO::getAdjustQty, reqVO.getAdjustQty())
                 .eqIfPresent(CountadjustRequestDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountadjustRequestDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountadjustRequestDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountadjustRequestDetailDO::getCreator, reqVO.getCreator())
-                .likeIfPresent(CountadjustRequestDetailDO::getItemlName, reqVO.getItemlName())
-                .eqIfPresent(CountadjustRequestDetailDO::getItemlDesc1, reqVO.getItemlDesc1())
-                .eqIfPresent(CountadjustRequestDetailDO::getItemlDesc2, reqVO.getItemlDesc2())
-                .eqIfPresent(CountadjustRequestDetailDO::getProjectlCode, reqVO.getProjectlCode())
+                .likeIfPresent(CountadjustRequestDetailDO::getItemName, reqVO.getItemName())
+                .eqIfPresent(CountadjustRequestDetailDO::getItemDesc1, reqVO.getItemDesc1())
+                .eqIfPresent(CountadjustRequestDetailDO::getItemDesc2, reqVO.getItemDesc2())
+                .eqIfPresent(CountadjustRequestDetailDO::getProjectCode, reqVO.getProjectCode())
                 .eqIfPresent(CountadjustRequestDetailDO::getQty, reqVO.getQty())
                 .eqIfPresent(CountadjustRequestDetailDO::getUom, reqVO.getUom())
                 .betweenIfPresent(CountadjustRequestDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .eqIfPresent(CountadjustRequestDetailDO::getUpdater, reqVO.getUpdater())
-                .eqIfPresent(CountadjustRequestDetailDO::getItemlCode, reqVO.getItemlCode())
+                .eqIfPresent(CountadjustRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .orderByDesc(CountadjustRequestDetailDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRequest/CountadjustRequestMainMapper.java

@@ -22,7 +22,6 @@ public interface CountadjustRequestMainMapper extends BaseMapperX<CountadjustReq
 
     default PageResult<CountadjustRequestMainDO> selectPage(CountadjustRequestMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CountadjustRequestMainDO>()
-                .eqIfPresent(CountadjustRequestMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(CountadjustRequestMainDO::getCountRecordNumber, reqVO.getCountRecordNumber())
                 .eqIfPresent(CountadjustRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountadjustRequestMainDO::getNumber, reqVO.getNumber())
@@ -47,7 +46,6 @@ public interface CountadjustRequestMainMapper extends BaseMapperX<CountadjustReq
     }
     default List<CountadjustRequestMainDO> selectList(CountadjustRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CountadjustRequestMainDO>()
-                .eqIfPresent(CountadjustRequestMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(CountadjustRequestMainDO::getCountRecordNumber, reqVO.getCountRecordNumber())
                 .eqIfPresent(CountadjustRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountadjustRequestMainDO::getNumber, reqVO.getNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java

@@ -50,6 +50,8 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX<Customerre
                 .eqIfPresent(CustomerreceiptRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CustomerreceiptRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(CustomerreceiptRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(CustomerreceiptRequestMainDO::getInInventoryStatus, reqVO.getInInventoryStatus())
+                .eqIfPresent(CustomerreceiptRequestMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatus())
                 .orderByDesc(CustomerreceiptRequestMainDO::getId));
     }
     default PageResult<CustomerreceiptRequestMainDO> selectSenior(CustomConditions conditions) {
@@ -85,6 +87,8 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX<Customerre
                 .eqIfPresent(CustomerreceiptRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CustomerreceiptRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(CustomerreceiptRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(CustomerreceiptRequestMainDO::getInInventoryStatus, reqVO.getInInventoryStatus())
+                .eqIfPresent(CustomerreceiptRequestMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatus())
                 .orderByDesc(CustomerreceiptRequestMainDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobMainMapper.java

@@ -68,6 +68,8 @@ public interface CustomerreturnJobMainMapper extends BaseMapperX<CustomerreturnJ
                 .eqIfPresent(CustomerreturnJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
                 .eqIfPresent(CustomerreturnJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
                 .eqIfPresent(CustomerreturnJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
+                .eqIfPresent(CustomerreturnJobMainDO::getInInventoryStatus, reqVO.getInInventoryStatuses())
+                .eqIfPresent(CustomerreturnJobMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatuses())
                 .orderByDesc(CustomerreturnJobMainDO::getId));
     }
     default PageResult<CustomerreturnJobMainDO> selectSenior(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java

@@ -23,7 +23,7 @@ public interface CustomerreturnRequestDetailMapper extends BaseMapperX<Customerr
 
     default PageResult<CustomerreturnRequestDetailDO> selectPage(CustomerreturnRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CustomerreturnRequestDetailDO>()
-                .eq(CustomerreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(CustomerreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomerreturnRequestDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomerreturnRequestDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomerreturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java

@@ -53,6 +53,8 @@ public interface CustomerreturnRequestMainMapper extends BaseMapperX<Customerret
                 .eqIfPresent(CustomerreturnRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CustomerreturnRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(CustomerreturnRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(CustomerreturnRequestMainDO::getInInventoryStatus, reqVO.getInInventoryStatus())
+                .eqIfPresent(CustomerreturnRequestMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatus())
                 .orderByDesc(CustomerreturnRequestMainDO::getId));
     }
     default PageResult<CustomerreturnRequestMainDO> selectSenior(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordDetailMapper.java

@@ -10,6 +10,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailExportReqVO;
 import com.win.module.wms.controller.customersettleRecord.vo.CustomersettleRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO;
+import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -84,4 +85,8 @@ public interface CustomersettleRecordDetailMapper extends BaseMapperX<Customerse
                 .orderByDesc(CustomersettleRecordDetailDO::getId));
     }
 
+    default List<CustomersettleRecordDetailDO> selectList(Long masterId){
+        return selectList(new LambdaQueryWrapperX<CustomersettleRecordDetailDO>()
+                .eq(CustomersettleRecordDetailDO::getMasterId, masterId));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordMainMapper.java

@@ -75,5 +75,7 @@ public interface CustomersettleRecordMainMapper extends BaseMapperX<Customersett
                 .eqIfPresent(CustomersettleRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(CustomersettleRecordMainDO::getId));
     }
-
+    default List<CustomersettleRecordMainDO> selectSeniorList(CustomConditions conditions){
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestDetailMapper.java

@@ -22,6 +22,7 @@ public interface CustomersettleRequestDetailMapper extends BaseMapperX<Customers
 
     default PageResult<CustomersettleRequestDetailDO> selectPage(CustomersettleRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CustomersettleRequestDetailDO>()
+                .eqIfPresent(CustomersettleRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomersettleRequestDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomersettleRequestDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomersettleRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
@@ -49,6 +50,7 @@ public interface CustomersettleRequestDetailMapper extends BaseMapperX<Customers
     }
     default List<CustomersettleRequestDetailDO> selectList(CustomersettleRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CustomersettleRequestDetailDO>()
+                .eqIfPresent(CustomersettleRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomersettleRequestDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomersettleRequestDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomersettleRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
@@ -72,4 +74,8 @@ public interface CustomersettleRequestDetailMapper extends BaseMapperX<Customers
                 .orderByDesc(CustomersettleRequestDetailDO::getId));
     }
 
+    default List<CustomersettleRequestDetailDO> selectList(Long masterId){
+        return selectList(new LambdaQueryWrapperX<CustomersettleRequestDetailDO>()
+                .eq(CustomersettleRequestDetailDO::getMasterId, masterId));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java

@@ -44,6 +44,8 @@ public interface CustomersettleRequestMainMapper extends BaseMapperX<Customerset
                 .eqIfPresent(CustomersettleRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CustomersettleRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(CustomersettleRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(CustomersettleRequestMainDO::getInInventoryStatus, reqVO.getInInventoryStatus())
+                .eqIfPresent(CustomersettleRequestMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatus())
                 .orderByDesc(CustomersettleRequestMainDO::getId));
     }
     default PageResult<CustomersettleRequestMainDO> selectSenior(CustomConditions conditions) {
@@ -79,4 +81,7 @@ public interface CustomersettleRequestMainMapper extends BaseMapperX<Customerset
                 .orderByDesc(CustomersettleRequestMainDO::getId));
     }
 
+    default List<CustomersettleRequestMainDO> selectSeniorList(CustomConditions conditions){
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobMainMapper.java

@@ -125,8 +125,6 @@ public interface DeliverJobMainMapper extends BaseMapperX<DeliverJobMainDO> {
                 .eqIfPresent(DeliverJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
                 .eqIfPresent(DeliverJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
                 .eqIfPresent(DeliverJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
-                .eqIfPresent(DeliverJobMainDO::getInInventoryStatuses, reqVO.getInInventoryStatuses())
-                .eqIfPresent(DeliverJobMainDO::getOutInventoryStatuses, reqVO.getOutInventoryStatuses())
                 .orderByDesc(DeliverJobMainDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java

@@ -52,6 +52,8 @@ public interface DeliverRequestMainMapper extends BaseMapperX<DeliverRequestMain
                 .eqIfPresent(DeliverRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(DeliverRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(DeliverRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(DeliverRequestMainDO::getInInventoryStatus, reqVO.getInInventoryStatus())
+                .eqIfPresent(DeliverRequestMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatus())
                 .orderByDesc(DeliverRequestMainDO::getId));
     }
     default PageResult<DeliverRequestMainDO> selectSenior(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java

@@ -66,7 +66,7 @@ public interface PackageMapper extends BaseMapperX<PackageDO> {
                 .eqIfPresent(PackageDO::getSupplierItemCode, reqVO.getSupplierItemCode())
                 .eqIfPresent(PackageDO::getPoNumber, reqVO.getPoNumber())
                 .eqIfPresent(PackageDO::getPoLine, reqVO.getPoLine())
-                .eqIfPresent(PackageDO::getRpNumber, reqVO.getRpNumber())
+                .eqIfPresent(PackageDO::getPpNumber, reqVO.getRpNumber())
                 .eqIfPresent(PackageDO::getAsnNumber, reqVO.getAsnNumber())
                 .eqIfPresent(PackageDO::getWoNumber, reqVO.getWoNumber())
                 .eqIfPresent(PackageDO::getWoLine, reqVO.getWoLine())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java

@@ -7,8 +7,10 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO;
+import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
+import com.win.module.wms.enums.order.OrderStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;
@@ -122,4 +124,9 @@ public interface ProductionreturnJobMainMapper extends BaseMapperX<Productionret
 
     }
 
+    default Long selectByRequestNumber(String requestNumber) {
+        return selectCount(new LambdaQueryWrapperX<ProductionreturnJobMainDO>()
+                .eq(ProductionreturnJobMainDO::getRequestNumber, requestNumber)
+                .ne(ProductionreturnJobMainDO::getStatus, OrderStatusEnum.CLOSED.getCode()));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -22,6 +23,7 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX<Product
 
     default PageResult<ProductionreturnRequestDetailDO> selectPage(ProductionreturnRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductionreturnRequestDetailDO>()
+                .eqIfPresent(ProductionreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionreturnRequestDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductionreturnRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
@@ -51,6 +53,11 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX<Product
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
 
+    default List<ProductionreturnRequestDetailDO> selectList(Long masterId) {
+        return selectList(new LambdaQueryWrapperX<ProductionreturnRequestDetailDO>()
+                .eq(ProductionreturnRequestDetailDO::getMasterId, masterId));
+    }
+
     default List<ProductionreturnRequestDetailDO> selectList(ProductionreturnRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnRequestDetailDO>()
                 .eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO;
+import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -79,4 +80,8 @@ public interface ProductionreturnRequestMainMapper extends BaseMapperX<Productio
     default ProductionreturnRequestMainDO selectByNumber(String number){
         return selectOne(ProductionreturnRequestMainDO::getNumber,number);
     }
+
+    default List<ProductionreturnRequestMainDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java

@@ -22,6 +22,7 @@ public interface SupplierdeliverRequestDetailMapper extends BaseMapperX<Supplier
 
     default PageResult<SupplierdeliverRequestDetailDO> selectPage(SupplierdeliverRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<SupplierdeliverRequestDetailDO>()
+                .eqIfPresent(SupplierdeliverRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(SupplierdeliverRequestDetailDO::getBatch, reqVO.getBatch())
                 .eqIfPresent(SupplierdeliverRequestDetailDO::getAltBatch, reqVO.getAltBatch())
                 .betweenIfPresent(SupplierdeliverRequestDetailDO::getArriveDate, reqVO.getArriveDate())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeService.java

@@ -79,4 +79,11 @@ public interface BarcodeService {
     List<BarcodeDO> getBarcodeList(BarcodeExportReqVO exportReqVO);
 
     List<BarcodeImportExcelVo> importBarcodeList(List<BarcodeImportExcelVo> barcodes, Integer mode, Boolean updatePart);
+
+    /**
+     * 根据labelType 获取条码片段集合
+     * @param labelType
+     * @return
+     */
+    List<BarcodeDO> getBarcodeDoListByLabelType(String labelType);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeServiceImpl.java

@@ -2,6 +2,7 @@ package com.win.module.wms.service.barcode;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
@@ -124,6 +125,14 @@ public class BarcodeServiceImpl implements BarcodeService {
         }
         return errorList;
     }
+
+    @Override
+    public List<BarcodeDO> getBarcodeDoListByLabelType(String labelType) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("label_type",labelType);
+        return barcodeMapper.selectList(queryWrapper);
+    }
+
     private void validateBarcodeForCreateOrUpdate(Long id,String code,Integer order,Integer length,Integer prefixLenght,String entityProperties,String trimEnd,String isEncypt) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java

@@ -1,27 +1,41 @@
 package com.win.module.wms.service.countJob;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
+import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.system.enums.serialNumber.RuleCodeEnum;
+import com.win.module.wms.controller.countJob.vo.CountJobDetailUpdateReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO;
+import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
+import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO;
+import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO;
+import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
+import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
 import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper;
+import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper;
+import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper;
+import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper;
+import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestDetailMapper;
+import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestMainMapper;
+import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.job.JobStatusState;
+import com.win.module.wms.enums.request.RequestStatusEnum;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -39,9 +53,21 @@ public class CountJobMainServiceImpl implements CountJobMainService {
     @Resource
     private CountJobMainMapper countJobMainMapper;
     @Resource
+    private CountRecordMainMapper countRecordMainMapper;
+    @Resource
+    private CountRecordDetailMapper countRecordDetailMapper;
+    @Resource
     private AdminUserApi userApi;
     @Resource
     private TrendsApi trendsApi;
+    @Resource
+    private SerialNumberApi serialNumberApi;
+    @Resource
+    private CountRequestMainMapper countRequestMainMapper;
+    @Resource
+    private CountadjustRequestMainMapper countadjustRequestMainMapper;
+    @Resource
+    private CountadjustRequestDetailMapper countadjustRequestDetailMapper;
 
     @Override
     public CountJobMainDO getCountJobMain(Long id) {
@@ -123,7 +149,105 @@ public class CountJobMainServiceImpl implements CountJobMainService {
 
     @Override
     public String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO) {
-        return null;
+        //查询数据
+        CountJobMainDO countJobMainDO = this.validateCountJobMainExists(countJobMainUpdateReqVO.getId());
+        JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus());
+        boolean flag = jobStatusState.execute();
+        if(!flag) {
+            throw new ServiceException(INSPECT_JOB_MAIN_STATUS_ERROR);
+        }
+        //更新完成信息
+        Long userId = getLoginUserId();
+        AdminUserRespDTO userRespDTO = userApi.getUser(userId);
+        countJobMainDO.setStatus(jobStatusState.getState().getCode());
+        countJobMainDO.setCompleteTime(LocalDateTime.now());
+        countJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId()));
+        countJobMainDO.setCompleteUserName(userRespDTO.getNickname());
+        //更新任务表状态
+        countJobMainMapper.updateById(countJobMainDO);
+        //创建采购收货记录主表
+        CountRecordMainDO countRecordMainDO = new CountRecordMainDO();
+        BeanUtils.copyProperties(countJobMainDO, countRecordMainDO);
+        String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_RECORD.getCode());
+        countRecordMainDO.setNumber(number);
+        countRecordMainDO.setJobNumber(countJobMainDO.getNumber());
+        countRecordMainDO.setId(null);
+        countRecordMainDO.setCreator(null);
+        countRecordMainDO.setCreateTime(null);
+        countRecordMainDO.setUpdater(null);
+        countRecordMainDO.setUpdateTime(null);
+        countRecordMainMapper.insert(countRecordMainDO);
+        List<CountJobDetailUpdateReqVO> countJobDetailUpdateReqVOList = countJobMainUpdateReqVO.getSubList();
+        List<CountadjustRequestDetailDO> countadjustRequestDetailDOList = new ArrayList<>();
+        List<CountRecordDetailDO> countRecordDetailDOList = new ArrayList<>();
+        int countDetailNumber = 1;
+        for(CountJobDetailUpdateReqVO countJobDetailUpdateReqVO : countJobDetailUpdateReqVOList) {
+            CountRecordDetailDO countRecordDetailDO = new CountRecordDetailDO();
+            BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRecordDetailDO);
+            countRecordDetailDO.setMasterId(countRecordMainDO.getId());
+            countRecordDetailDO.setNumber(number);
+            countRecordDetailDO.setJobDetailId(String.valueOf(countJobDetailUpdateReqVO.getId()));
+            countRecordDetailDO.setId(null);
+            countRecordDetailDO.setCreator(null);
+            countRecordDetailDO.setCreateTime(null);
+            countRecordDetailDO.setUpdater(null);
+            countRecordDetailDO.setUpdateTime(null);
+            countRecordDetailDOList.add(countRecordDetailDO);
+            //盘点记录数量不一致时生成盘点调整申请
+            if(countRecordDetailDO.getCountQty().compareTo(countRecordDetailDO.getQty()) != 0) {
+                CountadjustRequestDetailDO countadjustRequestDetailDO = new CountadjustRequestDetailDO();
+                BeanUtils.copyProperties(countRecordDetailDO, countadjustRequestDetailDO);
+                countadjustRequestDetailDO.setCountDetailNumber(String.valueOf(countDetailNumber));
+                countadjustRequestDetailDO.setInventoryQty(countRecordDetailDO.getQty());
+                countadjustRequestDetailDO.setCountQty(countRecordDetailDO.getCountQty());
+                //库存数量减盘点数量等于调整数量
+                countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getQty().subtract(countRecordDetailDO.getCountQty()));
+                //调整数量的绝对值
+                countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs());
+                countadjustRequestDetailDO.setId(null);
+                countadjustRequestDetailDO.setCreator(null);
+                countadjustRequestDetailDO.setCreateTime(null);
+                countadjustRequestDetailDO.setUpdater(null);
+                countadjustRequestDetailDO.setUpdateTime(null);
+                countadjustRequestDetailDOList.add(countadjustRequestDetailDO);
+                countDetailNumber++;
+            }
+        }
+        countRecordDetailMapper.insertBatch(countRecordDetailDOList);
+        //增加库存跳转
+        if(!countadjustRequestDetailDOList.isEmpty()) {
+            CountadjustRequestMainDO countadjustRequestMainDO = new CountadjustRequestMainDO();
+            BeanUtils.copyProperties(countRecordMainDO, countadjustRequestMainDO);
+            String adjustNumber = serialNumberApi.generateCode(RuleCodeEnum.COUNT_ADJUST_REQUEST.getCode());
+            countadjustRequestMainDO.setNumber(adjustNumber);
+            countadjustRequestMainDO.setCountRecordNumber(number);
+            countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode());
+            countadjustRequestMainDO.setId(null);
+            countadjustRequestMainDO.setCreator(null);
+            countadjustRequestMainDO.setCreateTime(null);
+            countadjustRequestMainDO.setUpdater(null);
+            countadjustRequestMainDO.setUpdateTime(null);
+            countadjustRequestMainMapper.insert(countadjustRequestMainDO);
+            for(CountadjustRequestDetailDO countadjustRequestDetailDO : countadjustRequestDetailDOList) {
+                countadjustRequestDetailDO.setMasterId(countadjustRequestMainDO.getId());
+                countadjustRequestDetailDO.setNumber(adjustNumber);
+            }
+            countadjustRequestDetailMapper.insertBatch(countadjustRequestDetailDOList);
+        }
+        List<String> typeList = new ArrayList<>();
+        typeList.add(JobStatusEnum.PENDING.getCode());
+        typeList.add(JobStatusEnum.PROCESSING.getCode());
+        Long count = countJobMainMapper.selectListCount(typeList, countJobMainDO.getRequestNumber());
+        CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectByNumber(countJobMainDO.getRequestNumber());
+        //申请单下所有任务全部完成
+        if(count == 0) {
+            countRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+            countRequestMainMapper.updateById(countRequestMainDO);
+        } else if(countRequestMainDO.getStatus().equals(RequestStatusEnum.HANDLING.getCode())) {//部分完成
+            countRequestMainDO.setStatus(RequestStatusEnum.PARTIAL.getCode());
+            countRequestMainMapper.updateById(countRequestMainDO);
+        }
+        return number;
     }
 
     private CountJobMainDO validateCountJobMainExists(Long id) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java

@@ -15,6 +15,7 @@ import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO;
 import com.win.module.wms.controller.countPlan.vo.CountPlanMainUpdateReqVO;
 import com.win.module.wms.controller.countRequest.vo.CountRequestDetailCreateReqVO;
 import com.win.module.wms.controller.countRequest.vo.CountRequestMainCreateReqVO;
+import com.win.module.wms.controller.location.vo.LocationExportReqVO;
 import com.win.module.wms.convert.countPlan.CountPlanDetailConvert;
 import com.win.module.wms.convert.countPlan.CountPlanMainConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
@@ -22,6 +23,7 @@ import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO;
 import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.countPlan.CountPlanDetailMapper;
 import com.win.module.wms.dal.mysql.countPlan.CountPlanMainMapper;
@@ -29,6 +31,7 @@ import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper;
 import com.win.module.wms.enums.plan.PlanStatusState;
 import com.win.module.wms.service.countRequest.CountRequestMainService;
 import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -71,6 +75,8 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
     private ItembasicService itembasicService;
     @Resource
     private CountRequestMainService countRequestMainService;
+    @Resource
+    private LocationService locationService;
 
     @Override
     public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) {
@@ -293,16 +299,68 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
         countRequestMainCreateReqVO.setRequestTime(LocalDateTime.now());
         countRequestMainCreateReqVO.setDueTime(LocalDateTime.now());
         List<CountRequestDetailCreateReqVO> subList = new ArrayList<>();
-        for (int i = 0; i< balanceDOList.size(); i++) {
-            BalanceDO balanceDO = balanceDOList.get(i);
+        int countDetailNumber = 1;
+        for (BalanceDO balanceDO : balanceDOList) {
+            //忽略物品或者忽略库位直接continue
+            if(mainDO.getIgnoreListOfItem().contains(balanceDO.getItemCode()) || mainDO.getIgnoreListOfLocation().contains(balanceDO.getLocationCode())) {
+                continue;
+            }
+            //维度，按照库存扩大范围，比如维度是库位时，盘点库位上某一个物品，那要扩大到这个物品所在库位的所有物品，BY_INVENTORY，按库存 BY_ITEM，按物品 BY_BATCH，按批次 BY_LOCATION，按库位
+            //if(mainDO.getDimension().equals("BY_INVENTORY")) {
+
+            //}
             CountRequestDetailCreateReqVO countRequestDetailCreateReqVO = new CountRequestDetailCreateReqVO();
             BeanUtils.copyProperties(balanceDO, countRequestDetailCreateReqVO);
             ItembasicDO itembasicDO = itembasicService.selectItembasic(balanceDO.getItemCode());
             countRequestDetailCreateReqVO.setItemName(itembasicDO.getName());
             countRequestDetailCreateReqVO.setItemDesc1(itembasicDO.getDesc1());
             countRequestDetailCreateReqVO.setItemDesc2(itembasicDO.getDesc2());
-            countRequestDetailCreateReqVO.setCountDetailNumber(String.valueOf(i + 1));
+            countRequestDetailCreateReqVO.setCountDetailNumber(String.valueOf(countDetailNumber));
+            int listSize1 = subList.size();
+            if(countRequestDetailCreateReqVO.getQty().compareTo(BigDecimal.ZERO) == 0) {
+                if ("TRUE".equals(mainDO.getIsCountZeroInventory())) {//盘点零库存
+                    subList.add(countRequestDetailCreateReqVO);
+                }
+            } else if (countRequestDetailCreateReqVO.getQty().compareTo(BigDecimal.ZERO) < 0) {
+                if ("TRUE".equals(mainDO.getIsCountNegativeInventory())) {//盘点负库存
+                    subList.add(countRequestDetailCreateReqVO);
+                }
+            } else {
+                subList.add(countRequestDetailCreateReqVO);
+            }
+            //增加了数据并且冻结盘点时，冻结库存余额
+            if(subList.size() > listSize1 && "TRUE".equals(mainDO.getIsFreeze())) {
+                balanceDO.setFrozen("TRUE");
+                balanceDO.setFrozenReason("冻结盘点");
+                balanceMapper.updateById(balanceDO);
+            }
+            countDetailNumber++;
+        }
+        //盘点空库位,补齐空库位，在生成任务时拆分为只有主的盘点任务
+        if("TRUE".equals(mainDO.getIsCountEmptyLocation())) {
+            LocationExportReqVO locationExportReqVO = new LocationExportReqVO();
+            locationExportReqVO.setAvailable("TRUE");
+            List<LocationDO> locationDOList = locationService.getLocationList(new LocationExportReqVO());
+            for(LocationDO locationDO : locationDOList) {
+                //忽略库位直接continue
+                if(mainDO.getIgnoreListOfLocation().contains(locationDO.getCode())) {
+                    continue;
+                }
+                boolean flag = false;
+                for(CountRequestDetailCreateReqVO countRequestDetailCreateReqVO : subList) {
+                    if(countRequestDetailCreateReqVO.getLocationCode().equals(locationDO.getCode())) {
+                        flag = true;
+                        break;
+                    }
+                }
+                if(!flag) {
+                    CountRequestDetailCreateReqVO countRequestDetailCreateReqVO = new CountRequestDetailCreateReqVO();
+                    countRequestDetailCreateReqVO.setCountDetailNumber(String.valueOf(countDetailNumber));
+                    countRequestDetailCreateReqVO.setLocationCode(locationDO.getCode());
                     subList.add(countRequestDetailCreateReqVO);
+                    countDetailNumber++;
+                }
+            }
         }
         countRequestMainCreateReqVO.setSubList(subList);
         countRequestMainService.createCountRequestMain(countRequestMainCreateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -37,6 +37,7 @@ import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper;
 import com.win.module.wms.dal.mysql.countRequest.CountRequestDetailMapper;
 import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper;
+import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.itembasic.ItembasicService;
@@ -371,10 +372,9 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             list.add(detailDO);
             listMap.put(detailDO.getLocationCode(), list);
         }
-        JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("PurchaseReceiptJob");
+        JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("CountJob");
         //组装任务数据
         for(String mapKey : listMap.keySet()) {
-            List<CountRequestDetailDO> countRequestDetailDOList = listMap.get(mapKey);
             CountJobMainDO countJobMainDO = CountJobMainConvert.INSTANCE.convert(mainDO);
             countJobMainDO.setRequestNumber(mainDO.getNumber());
             countJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
@@ -391,16 +391,34 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainDO.setBusinessType(businesstypeDO.getCode());
             countJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
             countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
+            countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
+            String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode());
+            countJobMainDO.setNumber(number);
+            countJobMainDO.setId(null);
+            countJobMainDO.setCreateTime(null);
+            countJobMainDO.setCreator(null);
+            countJobMainDO.setUpdateTime(null);
+            countJobMainDO.setUpdater(null);
             countJobMainMapper.insert(countJobMainDO);
             List<CountJobDetailDO> countJobDetailDOList = new ArrayList<>();
-            for (int i = 0; i< countRequestDetailDOList.size(); i++) {
-                CountRequestDetailDO countRequestDetailDO = countRequestDetailDOList.get(i);
+            List<CountRequestDetailDO> countRequestDetailDOList = listMap.get(mapKey);
+            int countDetailNumber = 1;
+            for (CountRequestDetailDO countRequestDetailDO : countRequestDetailDOList) {
+                //空库位时itemCode为空，不加入子表
+                if(countRequestDetailDO.getItemCode() != null && !countRequestDetailDO.getItemCode().isEmpty()) {
                     CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO);
-                countJobDetailDO.setCountDetailNumber(String.valueOf(i + 1));
+                    countJobDetailDO.setCountDetailNumber(String.valueOf(countDetailNumber));
+                    countJobDetailDO.setNumber(number);
+                    countJobDetailDO.setMasterId(countJobMainDO.getId());
                     countJobDetailDOList.add(countJobDetailDO);
+                    countDetailNumber++;
                 }
+            }
+            if(!countJobDetailDOList.isEmpty()) {
                 countJobDetailMapper.insertBatch(countJobDetailDOList);
             }
+            trendsApi.createTrends(countJobMainDO.getId(), "countJob", "盘点申请生成盘点任务", TrendsTypeEnum.CREATE);
+        }
     }
 
     /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java

@@ -101,6 +101,8 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
         customerreceiptRequestMain.setToLocationTypes(businesstypeDO.getInLocationTypes());
         customerreceiptRequestMain.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         customerreceiptRequestMain.setToAreaCodes(businesstypeDO.getInAreaCodes());
+        customerreceiptRequestMain.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+        customerreceiptRequestMain.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
         customerreceiptRequestMain.setRequestTime(LocalDateTime.now());
         //调用自动执行方法
         if(RequestStatusEnum.HANDLING.getCode().equals(customerreceiptRequestMain.getStatus())) {