Merge remote-tracking branch 'origin/master'

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java

@@ -42,6 +42,8 @@ public class SecurityConfiguration {
                 // magic-api 允许匿名访问
                 registry.antMatchers("/magic/web/**").anonymous()
                         .antMatchers("/magic-api/**").anonymous();
+                //静态资源
+                registry.antMatchers("/admin-api/profile/**").anonymous();
                 // 文件读取
                 registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll();
             }

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

@@ -63,6 +63,7 @@ public interface DictTypeConstants {
     String INTERFACE_TYPE = "interface_type";//接口类型
     String REQUEST_MODE = "reqeust_mode";//申请模式
     String LABEL_TYPE = "label_type";//标签类型
+    String LABEL_STATUS = "label_status";//标签状态
     String CARRIER_TYPE = "carrier_type";//承运商类型
     String INVENTORY_STATUS = "inventory_status";//库存状态
     String REQUEST_STATUS = "request_status";//请求状态

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

@@ -476,6 +476,7 @@ public interface ErrorCodeConstants {
     ErrorCode INSPECT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "到货检验申请状态不支持审批同意");
     ErrorCode INSPECT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "到货检验申请状态不支持处理");
     ErrorCode INSPECT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝");
+    ErrorCode INSPECT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_073_010, "到货检验状态不支持重新添加");
     //检验任务主ErrorCode
     ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在");
     //检验任务子ErrorCode
@@ -944,6 +945,7 @@ public interface ErrorCodeConstants {
     ErrorCode COUNT_PLAN_CANNOT_PUBLISH = new ErrorCode(1_000_152_008, "盘点计划状态不支持发布");
     ErrorCode COUNT_PLAN_CANNOT_OPEN = new ErrorCode(1_000_152_009, "盘点计划状态不支持打开");
     ErrorCode COUNT_PLAN_CANNOT_RESETTING = new ErrorCode(1_000_152_010, "盘点计划状态不支持重置");
+    ErrorCode COUNT_PLAN_CRON_ERROR = new ErrorCode(1_000_152_010, "盘点计划加入定时任务失败");
     //盘点申请ErrorCode
     ErrorCode COUNT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_153_000, "盘点申请主不存在");
     ErrorCode COUNT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_153_001, "盘点申请子不存在");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java

@@ -45,7 +45,12 @@ public class BalanceController {
     @PreAuthorize("@ss.hasPermission('wms:balance:query')")
     public CommonResult<PageResult<BalanceRespVO>> getBalancePage(@Valid BalancePageReqVO pageVO) {
         PageResult<BalanceDO> pageResult = balanceService.getBalancePage(pageVO);
-        return success(BalanceConvert.INSTANCE.convertPage(pageResult));
+        PageResult<BalanceRespVO> result = BalanceConvert.INSTANCE.convertPage(pageResult);
+        for (BalanceRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

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

@@ -27,6 +27,9 @@ public class CountJobMainBaseVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

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

@@ -5,6 +5,7 @@ import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.request.RequestStatusConverter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -29,6 +30,9 @@ public class CountJobMainExcelVO {
     @DictFormat(DictTypeConstants.COUNT_STAGE)
     private String stage;
 
+    @ExcelProperty("明盘")
+    private String isOpenCount;
+
     @ExcelProperty("仓库代码")
     private String warehouseCode;
 

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

@@ -21,6 +21,9 @@ public class CountJobMainExportReqVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

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

@@ -26,6 +26,9 @@ public class CountJobMainPageReqVO extends PageParam {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java

@@ -86,7 +86,7 @@ public class CountPlanMainBaseVO {
     @Schema(description = "盘点负库存")
     private String isCountNegativeInventory;
 
-    @Schema(description = "明盘", example = "2367")
+    @Schema(description = "明盘", example = "TRUE")
     private String isOpenCount;
 
     @Schema(description = "是否可用")

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

@@ -1,16 +1,11 @@
 package com.win.module.wms.controller.countRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
+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;
 
 /**
@@ -35,6 +30,9 @@ public class CountRecordMainBaseVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

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

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -32,6 +33,9 @@ public class CountRecordMainExcelVO {
     @DictFormat(DictTypeConstants.COUNT_STAGE)
     private String stage;
 
+    @ExcelProperty("明盘")
+    private String isOpenCount;
+
     @ExcelProperty("仓库代码")
     private String warehouseCode;
 

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

@@ -1,12 +1,11 @@
 package com.win.module.wms.controller.countRecord.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，参数和 CountRecordMainPageReqVO 是一致的")
@@ -25,6 +24,9 @@ public class CountRecordMainExportReqVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

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

@@ -1,10 +1,12 @@
 package com.win.module.wms.controller.countRecord.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;
@@ -30,6 +32,9 @@ public class CountRecordMainPageReqVO extends PageParam {
     @Schema(description = "仓库代码")
     private String warehouseCode;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "出库事务类型")
     private String outTransactionType;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java

@@ -26,6 +26,9 @@ public class CountRequestMainBaseVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -25,6 +26,9 @@ public class CountRequestMainExcelVO {
     @DictFormat(DictTypeConstants.COUNT_STAGE)
     private String stage;
 
+    @ExcelProperty("明盘")
+    private String isOpenCount;
+
     @ExcelProperty("仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExportReqVO.java

@@ -18,6 +18,9 @@ public class CountRequestMainExportReqVO {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainPageReqVO.java

@@ -23,6 +23,9 @@ public class CountRequestMainPageReqVO extends PageParam {
     @Schema(description = "阶段")
     private String stage;
 
+    @Schema(description = "明盘")
+    private String isOpenCount;
+
     @Schema(description = "仓库代码")
     private String warehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreceiptRecord.vo.*;
+import com.win.module.wms.convert.customerreceiptRecord.CustomerreceiptRecordMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +91,12 @@ public class CustomerreceiptRecordDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:query')")
     public CommonResult<PageResult<CustomerreceiptRecordDetailRespVO>> getCustomerreceiptRecordDetailPage(@Valid CustomerreceiptRecordDetailPageReqVO pageVO) {
         PageResult<CustomerreceiptRecordDetailDO> pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailPage(pageVO);
-        return success(CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreceiptRecordDetailRespVO> result = CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRecordDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得账期日历分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java

@@ -7,7 +7,9 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreceiptRecord.vo.*;
 import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO;
 import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
 import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO;
@@ -100,7 +102,12 @@ public class CustomerreceiptRecordMainController {
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:query')")
     public CommonResult<PageResult<CustomerreceiptRecordMainRespVO>> getCustomerreceiptRecordMainPage(@Valid CustomerreceiptRecordMainPageReqVO pageVO) {
         PageResult<CustomerreceiptRecordMainDO> pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainPage(pageVO);
-        return success(CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreceiptRecordMainRespVO> result = CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRecordMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户收货记录主分页")

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

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreceiptRequest.vo.*;
+import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +91,13 @@ public class CustomerreceiptRequestDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:query')")
     public CommonResult<PageResult<CustomerreceiptRequestDetailRespVO>> getCustomerreceiptRequestDetailPage(@Valid CustomerreceiptRequestDetailPageReqVO pageVO) {
         PageResult<CustomerreceiptRequestDetailDO> pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailPage(pageVO);
-        return success(CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreceiptRequestDetailRespVO> result = CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRequestDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户收货申请子分页")

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

@@ -5,6 +5,8 @@ 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.customerreceiptRequest.vo.*;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.customerreceiptRequest.CustomerreceiptRequestDetailService;
@@ -95,7 +97,13 @@ public class CustomerreceiptRequestMainController {
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:query')")
     public CommonResult<PageResult<CustomerreceiptRequestMainRespVO>> getCustomerreceiptRequestMainPage(@Valid CustomerreceiptRequestMainPageReqVO pageVO) {
         PageResult<CustomerreceiptRequestMainDO> pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainPage(pageVO);
-        return success(CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreceiptRequestMainRespVO> result = CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRequestMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户收货申请主分页")

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

@@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions;
 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.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,8 +92,12 @@ public class CustomerreturnJobDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')")
     public CommonResult<PageResult<CustomerreturnJobDetailRespVO>> getCustomerreturnJobDetailPage(@Valid CustomerreturnJobDetailPageReqVO pageVO) {
         PageResult<CustomerreturnJobDetailDO> pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailPage(pageVO);
-        return success(CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreturnJobDetailRespVO> result = CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnJobDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
         }
+        return success(result);    }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户退货任务子分页")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')")

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

@@ -7,8 +7,10 @@ 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.controller.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConvert;
 import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 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;
@@ -104,7 +106,13 @@ public class CustomerreturnJobMainController {
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')")
     public CommonResult<PageResult<CustomerreturnJobMainRespVO>> getCustomerreturnJobMainPage(@Valid CustomerreturnJobMainPageReqVO pageVO) {
         PageResult<CustomerreturnJobMainDO> pageResult = customerreturnJobMainService.getCustomerreturnJobMainPage(pageVO);
-        return success(CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreturnJobMainRespVO> result = CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnJobMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

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

@@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreturnRecord.vo.*;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,8 +92,12 @@ public class CustomerreturnRecordDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')")
     public CommonResult<PageResult<CustomerreturnRecordDetailRespVO>> getCustomerreturnRecordDetailPage(@Valid CustomerreturnRecordDetailPageReqVO pageVO) {
         PageResult<CustomerreturnRecordDetailDO> pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailPage(pageVO);
-        return success(CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreturnRecordDetailRespVO> result = CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRecordDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
         }
+        return success(result);    }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户退货记录子分页")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')")

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

@@ -8,7 +8,9 @@ import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRe
 import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO;
 import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExportReqVO;
 import com.win.module.wms.controller.customerreturnRecord.vo.*;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.convert.customerreturnRecord.CustomerreturnRecordMainConvert;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO;
 import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -98,8 +100,12 @@ public class CustomerreturnRecordMainController {
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:query')")
     public CommonResult<PageResult<CustomerreturnRecordMainRespVO>> getCustomerreturnRecordMainPage(@Valid CustomerreturnRecordMainPageReqVO pageVO) {
         PageResult<CustomerreturnRecordMainDO> pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainPage(pageVO);
-        return success(CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreturnRecordMainRespVO> result = CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRecordMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
         }
+        return success(result);    }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户退货记录主分页")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:query')")

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

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 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.*;
+import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +91,13 @@ public class CustomerreturnRequestDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:query')")
     public CommonResult<PageResult<CustomerreturnRequestDetailRespVO>> getCustomerreturnRequestDetailPage(@Valid CustomerreturnRequestDetailPageReqVO pageVO) {
         PageResult<CustomerreturnRequestDetailDO> pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailPage(pageVO);
-        return success(CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreturnRequestDetailRespVO> result = CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRequestDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户退货申请子分页")

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

@@ -6,7 +6,9 @@ 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.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestDetailConvert;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.customerreturnRequest.CustomerreturnRequestDetailService;
@@ -103,7 +105,13 @@ public class CustomerreturnRequestMainController {
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')")
     public CommonResult<PageResult<CustomerreturnRequestMainRespVO>> getCustomerreturnRequestMainPage(@Valid CustomerreturnRequestMainPageReqVO pageVO) {
         PageResult<CustomerreturnRequestMainDO> pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainPage(pageVO);
-        return success(CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomerreturnRequestMainRespVO> result = CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRequestMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户退货申请主分页")

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

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.customersettleRecord;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -89,7 +91,12 @@ public class CustomersettleRecordDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:query')")
     public CommonResult<PageResult<CustomersettleRecordDetailRespVO>> getCustomersettleRecordDetailPage(@Valid CustomersettleRecordDetailPageReqVO pageVO) {
         PageResult<CustomersettleRecordDetailDO> pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailPage(pageVO);
-        return success(CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomersettleRecordDetailRespVO> result = CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRecordDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户结算记录子分页")

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

@@ -4,6 +4,8 @@ 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.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.customersettleRecord.CustomersettleRecordDetailService;
@@ -94,7 +96,12 @@ public class CustomersettleRecordMainController {
     @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:query')")
     public CommonResult<PageResult<CustomersettleRecordMainRespVO>> getCustomersettleRecordMainPage(@Valid CustomersettleRecordMainPageReqVO pageVO) {
         PageResult<CustomersettleRecordMainDO> pageResult = customersettleRecordMainService.getCustomersettleRecordMainPage(pageVO);
-        return success(CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomersettleRecordMainRespVO> result = CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRecordMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户结算记录主分页")

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

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.customersettleRequest;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -89,7 +91,13 @@ public class CustomersettleRequestDetailController {
     @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:query')")
     public CommonResult<PageResult<CustomersettleRequestDetailRespVO>> getCustomersettleRequestDetailPage(@Valid CustomersettleRequestDetailPageReqVO pageVO) {
         PageResult<CustomersettleRequestDetailDO> pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailPage(pageVO);
-        return success(CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomersettleRequestDetailRespVO> result = CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRequestDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户结算申请子分页")

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

@@ -7,7 +7,10 @@ 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.controller.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert;
+import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 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;
@@ -104,7 +107,13 @@ public class CustomersettleRequestMainController {
     @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:query')")
     public CommonResult<PageResult<CustomersettleRequestMainRespVO>> getCustomersettleRequestMainPage(@Valid CustomersettleRequestMainPageReqVO pageVO) {
         PageResult<CustomersettleRequestMainDO> pageResult = customersettleRequestMainService.getCustomersettleRequestMainPage(pageVO);
-        return success(CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<CustomersettleRequestMainRespVO> result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRequestMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得客户结算申请主分页")
@@ -113,9 +122,9 @@ public class CustomersettleRequestMainController {
         PageResult<CustomersettleRequestMainDO> pageResult = customersettleRequestMainService.getCustomersettleRequestMainSenior(conditions);
         PageResult<CustomersettleRequestMainRespVO> result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult);
         for(CustomersettleRequestMainRespVO vo : result.getList()) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
         }
         return success(result);
     }

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

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.deliverJob;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -89,7 +91,12 @@ public class DeliverJobDetailController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:query')")
     public CommonResult<PageResult<DeliverJobDetailRespVO>> getDeliverJobDetailPage(@Valid DeliverJobDetailPageReqVO pageVO) {
         PageResult<DeliverJobDetailDO> pageResult = deliverJobDetailService.getDeliverJobDetailPage(pageVO);
-        return success(DeliverJobDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverJobDetailRespVO> result = DeliverJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverJobDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得发货任务子分页")

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

@@ -4,7 +4,9 @@ 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.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.convert.deliverJob.DeliverJobDetailConvert;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
 import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -99,7 +101,13 @@ public class DeliverJobMainController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')")
     public CommonResult<PageResult<DeliverJobMainRespVO>> getDeliverJobMainPage(@Valid DeliverJobMainPageReqVO pageVO) {
         PageResult<DeliverJobMainDO> pageResult = deliverJobMainService.getDeliverJobMainPage(pageVO);
-        return success(DeliverJobMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverJobMainRespVO> result = DeliverJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverJobMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得发货任务主分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
 import org.springframework.web.bind.annotation.*;
@@ -92,7 +93,13 @@ public class DeliverPlanDetailController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:query')")
     public CommonResult<PageResult<DeliverPlanDetailRespVO>> getDeliverPlanDetailPage(@Valid DeliverPlanDetailPageReqVO pageVO) {
         PageResult<DeliverPlanDetailDO> pageResult = deliverPlanDetailService.getDeliverPlanDetailPage(pageVO);
-        return success(DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverPlanDetailRespVO> result = DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverPlanDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得发货计划子分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java

@@ -158,7 +158,7 @@ public class DeliverPlanMainController {
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
         }
-        return success(DeliverPlanMainConvert.INSTANCE.convertPage(pageResult));
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得发货计划主分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java

@@ -3,7 +3,9 @@ package com.win.module.wms.controller.deliverRecord;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.controller.deliverRecord.vo.*;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -87,7 +89,12 @@ public class DeliverRecordDetailController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:query')")
     public CommonResult<PageResult<DeliverRecordDetailRespVO>> getDeliverRecordDetailPage(@Valid DeliverRecordDetailPageReqVO pageVO) {
         PageResult<DeliverRecordDetailDO> pageResult = deliverRecordDetailService.getDeliverRecordDetailPage(pageVO);
-        return success(DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverRecordDetailRespVO> result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRecordDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java

@@ -4,9 +4,11 @@ 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.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExcelVO;
 import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO;
 import com.win.module.wms.controller.deliverRecord.vo.*;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
@@ -97,7 +99,12 @@ public class DeliverRecordMainController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:query')")
     public CommonResult<PageResult<DeliverRecordMainRespVO>> getDeliverRecordMainPage(@Valid DeliverRecordMainPageReqVO pageVO) {
         PageResult<DeliverRecordMainDO> pageResult = deliverRecordMainService.getDeliverRecordMainPage(pageVO);
-        return success(DeliverRecordMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverRecordMainRespVO> result = DeliverRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRecordMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

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

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.deliverRequest;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
+import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -89,7 +91,13 @@ public class DeliverRequestDetailController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:query')")
     public CommonResult<PageResult<DeliverRequestDetailRespVO>> getDeliverRequestDetailPage(@Valid DeliverRequestDetailPageReqVO pageVO) {
         PageResult<DeliverRequestDetailDO> pageResult = deliverRequestDetailService.getDeliverRequestDetailPage(pageVO);
-        return success(DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverRequestDetailRespVO> result = DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRequestDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

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

@@ -6,6 +6,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.controller.deliverPlan.vo.DeliverPlanMainExcelVO;
+import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO;
 import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert;
 import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert;
@@ -107,7 +108,13 @@ public class DeliverRequestMainController {
     @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')")
     public CommonResult<PageResult<DeliverRequestMainRespVO>> getDeliverRequestMainPage(@Valid DeliverRequestMainPageReqVO pageVO) {
         PageResult<DeliverRequestMainDO> pageResult = deliverRequestMainService.getDeliverRequestMainPage(pageVO);
-        return success(DeliverRequestMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<DeliverRequestMainRespVO> result = DeliverRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRequestMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@@ -207,6 +207,14 @@ public class InspectJobMainController {
         return success(result > 0);
     }
 
+    @PutMapping(value = "/close")
+    @Operation(summary = "关闭任务")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:close')")
+    public CommonResult<Boolean> closeInspectJobMain(@RequestParam("id") Long id) {
+        int result = inspectJobMainService.closeInspectJobMain(id);
+        return success(result > 0);
+    }
+
     @PutMapping("/execute")
     @Operation(summary = "执行任务")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java

@@ -227,6 +227,15 @@ public class InspectRequestMainController {
         return success(count > 0);
     }
 
+    @PutMapping("/reAdd")
+    @Operation(summary = "重新添加到货检验申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:reAdd')")
+    public CommonResult<Boolean> openInspectRequestMain(@RequestParam("id") Long id) {
+        Integer count = inspectRequestMainService.reAddInspectRequestMain(id);
+        return success(count > 0);
+    }
+
     @PutMapping("/agree")
     @Operation(summary = "审批通过到货检验申请主")
     @Parameter(name = "id", description = "编号", required = true)
@@ -245,12 +254,12 @@ public class InspectRequestMainController {
         return success(count > 0);
     }
 
-    @PutMapping("/abort")
+    @PutMapping("/refused")
     @Operation(summary = "审批拒绝到货检验申请主")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:abort')")
-    public CommonResult<Boolean> abortInspectRequestMain(@RequestParam("id") Long id) {
-        Integer count = inspectRequestMainService.abortInspectRequestMain(id);
+    public CommonResult<Boolean> refusedInspectRequestMain(@RequestParam("id") Long id) {
+        Integer count = inspectRequestMainService.refusedInspectRequestMain(id);
         return success(count > 0);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java

@@ -1,5 +1,13 @@
 package com.win.module.wms.controller.labelBarbasic;
 
+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.itembasic.vo.ItembasicExcelVO;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.enums.DictTypeConstants;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -32,6 +40,9 @@ public class BarbasicController {
     @Resource
     private BarbasicService barbasicService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建条码实体基类")
     @PreAuthorize("@ss.hasPermission('wms:barbasic:create')")
@@ -79,9 +90,29 @@ public class BarbasicController {
     @PreAuthorize("@ss.hasPermission('wms:barbasic:query')")
     public CommonResult<PageResult<BarbasicRespVO>> getBarbasicPage(@Valid BarbasicPageReqVO pageVO) {
         PageResult<BarbasicDO> pageResult = barbasicService.getBarbasicPage(pageVO);
+        PageResult<BarbasicRespVO> result = BarbasicConvert.INSTANCE.convertPage(pageResult);
+        for(BarbasicRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         return success(BarbasicConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索条码实体基类分页")
+    @PreAuthorize("@ss.hasPermission('wms:barbasic:query')")
+    public CommonResult<PageResult<BarbasicRespVO>> getBarbasicSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<BarbasicDO> pageResult = barbasicService.getBarbasicSenior(conditions);
+        PageResult<BarbasicRespVO> result = BarbasicConvert.INSTANCE.convertPage(pageResult);
+        for(BarbasicRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出条码实体基类 Excel")
     @PreAuthorize("@ss.hasPermission('wms:barbasic:export')")
@@ -94,6 +125,26 @@ public class BarbasicController {
         ExcelUtils.write(response, "条码实体基类.xls", "数据", BarbasicExcelVO.class, datas);
     }
 
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出物品基本信息 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
+    @OperateLog(type = EXPORT)
+    public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<BarbasicDO> list = barbasicService.getBarbasicList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<BarbasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BarbasicExcelVO.class, resultList, mapDropDown);
+    }
+    private List<BarbasicExcelVO> getExcelVo(List<BarbasicDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] labelType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_TYPE);
+        mapDropDown.put(1, labelType);
+        String[] labelStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_STATUS);
+        mapDropDown.put(3, labelStatus);
+        // 导出 Excel
+        List<BarbasicExcelVO> resultList = BarbasicConvert.INSTANCE.convertList02(list);
+        return resultList;
+    }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入条码实体基类模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.labelBarbasic.vo;
 
+import com.win.framework.excel.core.annotations.DictFormat;
+import com.win.framework.excel.core.convert.DictConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -14,19 +16,21 @@ import com.alibaba.excel.annotation.ExcelProperty;
 @Data
 public class BarbasicExcelVO {
 
-    @ExcelProperty("id")
-    private Long id;
+//    @ExcelProperty("id")
+//    private Long id;
 
     @ExcelProperty("标签号")
     private String number;
 
-    @ExcelProperty("标签类型")
+    @ExcelProperty(value = "标签类型", converter = DictConvert.class)
+    @DictFormat("label_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String type;
 
     @ExcelProperty("标签模板")
     private String template;
 
-    @ExcelProperty("标签状态")
+    @ExcelProperty(value = "标签状态", converter = DictConvert.class)
+    @DictFormat("label_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String status;
 
     @ExcelProperty("关联号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.labelBarbasic.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 条码实体基类 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -12,4 +14,9 @@ public class BarbasicRespVO extends BarbasicBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29175")
     private Long id;
 
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID")
+    private String creator;
 }

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

@@ -3,14 +3,17 @@ package com.win.module.wms.controller.packageMassage;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
+import com.win.framework.dict.core.util.DictFrameworkUtils;
 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.packageMassage.vo.*;
 import com.win.module.wms.convert.packageMassage.PackageConvert;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
 import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import com.win.module.wms.dal.mysql.packageMassage.PackageMapper;
+import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.packageMassage.PackageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -23,8 +26,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -104,17 +106,39 @@ public class PackageController {
     public void exportPackageExcel(@Valid PackageExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<PackageDO> list = packageService.getPackageList(exportReqVO);
-
         // 导出 Excel
-        List<PackageExcelVO> datas = PackageConvert.INSTANCE.convertList02(list);
-        for(PackageExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<PackageExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        // 导出 Excel
+        ExcelUtils.write(response, "发货申请.xlsx", "数据", PackageExcelVO.class, resultList, mapDropDown);
     }
-        ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas);
+
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出包装 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportPackageSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<PackageDO> list = packageService.getPackageList(conditions);
+        //组装vo
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<PackageExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        // 导出 Excel
+        ExcelUtils.write(response, "发货申请.xlsx", "数据", PackageExcelVO.class, resultList, mapDropDown);
     }
 
+    private List<PackageExcelVO> getExcelVo(List<PackageDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(10, uom);
+        mapDropDown.put(12, uom);
+        String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(16, packUnit);
+        List<PackageExcelVO> resultList = PackageConvert.INSTANCE.convertList02(list);
+        // 导出
+        for (PackageExcelVO vo : resultList) {
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return resultList;
+    }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得包装分页")
     @PreAuthorize("@ss.hasPermission('wms:package:query')")

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

@@ -46,12 +46,15 @@ public class PackageExcelVO {
     private String altBatch;
 
     @ExcelProperty("生产日期")
+    @ColumnWidth(value = 22)
     private LocalDateTime produceDate;
 
     @ExcelProperty("有效期(日)")
     private Integer validityDays;
 
     @ExcelProperty("失效日期")
+    @ColumnWidth(value = 22)
+
     private LocalDateTime expireDate;
 
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)

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

@@ -138,4 +138,10 @@ public class PackageExportReqVO {
     @Schema(description = "体积")
     private String volume;
 
+    @Schema(description = "创建者id")
+    private String creator;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTime;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java

@@ -8,6 +8,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageExcelVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageRespVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
@@ -33,5 +34,4 @@ public interface PackageConvert {
     PageResult<PackageRespVO> convertPage(PageResult<PackageDO> page);
 
     List<PackageExcelVO> convertList02(List<PackageDO> list);
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java

@@ -41,6 +41,10 @@ public class CountJobMainDO extends BaseDO {
      * 枚举 {@link TODO count_stage 对应的类}
      */
     private String stage;
+    /**
+     * 明盘
+     */
+    private String isOpenCount;
     /**
      * 仓库代码
      */

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

@@ -1,14 +1,12 @@
 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.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 盘点记录主 DO
@@ -47,6 +45,10 @@ public class CountRecordMainDO extends BaseDO {
      * 枚举 {@link TODO count_stage 对应的类}
      */
     private String stage;
+    /**
+     * 明盘
+     */
+    private String isOpenCount;
     /**
      * 仓库代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java

@@ -37,6 +37,10 @@ public class CountRequestMainDO extends BaseDO {
      * 枚举 {@link TODO count_stage 对应的类}
      */
     private String stage;
+    /**
+     * 明盘
+     */
+    private String isOpenCount;
     /**
      * 仓库代码
      */

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

@@ -24,7 +24,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PackageDO{
+public class PackageDO extends BaseDO {
 
     /**
      * id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java

@@ -27,6 +27,7 @@ public interface CountJobMainMapper extends BaseMapperX<CountJobMainDO> {
                 .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountJobMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountJobMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountJobMainDO::getLocationCode, reqVO.getLocationCode())
                 .betweenIfPresent(CountJobMainDO::getRequestTime, reqVO.getRequestTime())
@@ -79,6 +80,7 @@ public interface CountJobMainMapper extends BaseMapperX<CountJobMainDO> {
                 .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountJobMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountJobMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountJobMainDO::getLocationCode, reqVO.getLocationCode())
                 .betweenIfPresent(CountJobMainDO::getRequestTime, reqVO.getRequestTime())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java

@@ -26,6 +26,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getJobNumber, reqVO.getJobNumber())
                 .eqIfPresent(CountRecordMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRecordMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRecordMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRecordMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
                 .eqIfPresent(CountRecordMainDO::getInTransactionType, reqVO.getInTransactionType())
@@ -41,8 +42,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountRecordMainDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountRecordMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable())
-                .orderByDesc(CountRecordMainDO::getId));
+                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()));
     }
     default PageResult<CountRecordMainDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
@@ -53,6 +53,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getJobNumber, reqVO.getJobNumber())
                 .eqIfPresent(CountRecordMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRecordMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRecordMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRecordMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
                 .eqIfPresent(CountRecordMainDO::getInTransactionType, reqVO.getInTransactionType())
@@ -68,8 +69,7 @@ public interface CountRecordMainMapper extends BaseMapperX<CountRecordMainDO> {
                 .eqIfPresent(CountRecordMainDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountRecordMainDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountRecordMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable())
-                .orderByDesc(CountRecordMainDO::getId));
+                .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()));
     }
 
     default List<CountRecordMainDO> selectList(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java

@@ -25,6 +25,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
         return selectPage(reqVO, new LambdaQueryWrapperX<CountRequestMainDO>()
                 .eqIfPresent(CountRequestMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRequestMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRequestMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRequestMainDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountRequestMainDO::getBusinessType, reqVO.getBusinessType())
@@ -40,8 +41,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
                 .eqIfPresent(CountRequestMainDO::getAutoCommit, reqVO.getAutoCommit())
                 .eqIfPresent(CountRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CountRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
-                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
-                .orderByDesc(CountRequestMainDO::getId));
+                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()));
     }
 
     default CountRequestMainDO selectByPlanNumber(String planNumber) {
@@ -65,6 +65,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
         return selectList(new LambdaQueryWrapperX<CountRequestMainDO>()
                 .eqIfPresent(CountRequestMainDO::getPlanNumber, reqVO.getPlanNumber())
                 .eqIfPresent(CountRequestMainDO::getStage, reqVO.getStage())
+                .eqIfPresent(CountRequestMainDO::getIsOpenCount, reqVO.getIsOpenCount())
                 .eqIfPresent(CountRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())
                 .eqIfPresent(CountRequestMainDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountRequestMainDO::getBusinessType, reqVO.getBusinessType())
@@ -80,8 +81,7 @@ public interface CountRequestMainMapper extends BaseMapperX<CountRequestMainDO>
                 .eqIfPresent(CountRequestMainDO::getAutoCommit, reqVO.getAutoCommit())
                 .eqIfPresent(CountRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CountRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
-                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
-                .orderByDesc(CountRequestMainDO::getId));
+                .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()));
     }
 
     default List<CountRequestMainDO> selectList(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.labelBarbasic;
 
 import java.util.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.labelBarbasic.vo.BarbasicExportReqVO;
 import com.win.module.wms.controller.labelBarbasic.vo.BarbasicPageReqVO;
 import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO;
@@ -48,4 +50,11 @@ public interface BarbasicMapper extends BaseMapperX<BarbasicDO> {
                 .orderByDesc(BarbasicDO::getId));
     }
 
+    default PageResult<BarbasicDO> selectSenior(CustomConditions conditions){
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
+    default List<BarbasicDO> selectSeniorList(CustomConditions conditions){
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.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.packageMassage.vo.PackageExportReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
 import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -83,7 +84,12 @@ public interface PackageMapper extends BaseMapperX<PackageDO> {
                 .eqIfPresent(PackageDO::getWeight, reqVO.getWeight())
                 .eqIfPresent(PackageDO::getArea, reqVO.getArea())
                 .eqIfPresent(PackageDO::getVolume, reqVO.getVolume())
+                .eqIfPresent(PackageDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(PackageDO::getCreator, reqVO.getCreator())
                 .orderByDesc(PackageDO::getId));
     }
 
+    default List<PackageDO> selectSeniorList(CustomConditions conditions){
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java

@@ -0,0 +1,23 @@
+package com.win.module.wms.job;
+
+import com.win.framework.quartz.core.handler.JobHandler;
+import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO;
+import com.win.module.wms.service.countPlan.CountPlanMainService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class CountPlanJob implements JobHandler {
+
+    @Resource
+    private CountPlanMainService countPlanMainService;
+
+    @Override
+    public String execute(String param) {
+        CountPlanMainDO countPlanMainDO = countPlanMainService.getCountPlanMain(Long.parseLong(param));
+        countPlanMainService.generateRequest(countPlanMainDO);
+        return "盘点计划 " + countPlanMainDO.getNumber()+ " 生成了盘点申请";
+    }
+
+}

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

@@ -14,10 +14,13 @@ 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.convert.countJob.CountJobDetailConvert;
+import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 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.mysql.countJob.CountJobDetailMapper;
 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;
@@ -25,6 +28,7 @@ import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper;
 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 com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

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

@@ -139,4 +139,9 @@ public interface CountPlanMainService {
      */
     Integer resettingCountPlanMain(Long id);
 
+    /**
+     * 生成盘点申请
+     * @param mainDO 盘点申请主
+     */
+    void generateRequest(CountPlanMainDO mainDO);
 }

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

@@ -5,6 +5,8 @@ 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.framework.quartz.core.scheduler.SchedulerManager;
+import com.win.framework.quartz.core.util.CronUtils;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
@@ -33,6 +35,7 @@ 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.quartz.SchedulerException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,6 +47,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.infra.enums.ErrorCodeConstants.JOB_CRON_EXPRESSION_VALID;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
 
 /**
@@ -75,9 +79,16 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
     private CountRequestMainService countRequestMainService;
     @Resource
     private LocationService locationService;
+    @Resource
+    private SchedulerManager schedulerManager;
 
     @Override
     public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) {
+        if(!createReqVO.getType().equals("MANUAL")) {
+            if (!CronUtils.isValid(createReqVO.getCrontab())) {
+                throw exception(JOB_CRON_EXPRESSION_VALID);
+            }
+        }
         // 插入
         CountPlanMainDO countPlanMain = CountPlanMainConvert.INSTANCE.convert(createReqVO);
         String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_PLAN.getCode());
@@ -262,7 +273,16 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
         }
         mainDO.setStatus(planStatusState.getState().getCode());//增加操作记录
         trendsApi.createTrends(id, "countPlan", "发布了盘点计划", TrendsTypeEnum.UPDATE);
+        if(mainDO.getType().equals("MANUAL")) {//指定盘点
             this.generateRequest(mainDO);
+        } else if (mainDO.getType().equals("CYCLE")) {//循环盘点
+            // 添加 Job 到 Quartz 中
+            try {
+                schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob", String.valueOf(mainDO.getId()), mainDO.getCrontab(), 3, 60*10);
+            } catch (SchedulerException e) {
+                throw new ServiceException(COUNT_PLAN_CRON_ERROR);
+            }
+        }
         return countPlanMainMapper.updateById(mainDO);
     }
 
@@ -285,7 +305,8 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
      * 生成盘点申请
      * @param mainDO 盘点申请主
      */
-    private void generateRequest(CountPlanMainDO mainDO) {
+    @Override
+    public void generateRequest(CountPlanMainDO mainDO) {
         List<CountPlanDetailDO> detailDOList = countPlanDetailMapper.selectList(mainDO.getId());
         List<BalanceDO> balanceDOList = this.getBalanceDOList(detailDOList);
         CountRequestMainCreateReqVO countRequestMainCreateReqVO = new CountRequestMainCreateReqVO();

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

@@ -402,16 +402,13 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainMapper.insert(countJobMainDO);
             List<CountJobDetailDO> countJobDetailDOList = new ArrayList<>();
             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(countDetailNumber));
                     countJobDetailDO.setNumber(number);
                     countJobDetailDO.setMasterId(countJobMainDO.getId());
                     countJobDetailDOList.add(countJobDetailDO);
-                    countDetailNumber++;
                 }
             }
             if(!countJobDetailDOList.isEmpty()) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java

@@ -324,6 +324,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
         customerreturnJobMainDO.setCreateTime(null);
         customerreturnJobMainDO.setUpdater(null);
         customerreturnJobMainDO.setUpdateTime(null);
+        customerreturnJobMainDO.setInInventoryStatuses(mainDO.getInInventoryStatuses());
+        customerreturnJobMainDO.setOutInventoryStatuses(mainDO.getOutInventoryStatuses());
         // 获取任务单据设置
         JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("CustomerRejectJob");
         customerreturnJobMainDO.setRequestDueTime(mainDO.getDueTime());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java

@@ -98,6 +98,13 @@ public interface InspectJobMainService {
      */
     Integer abandonInspectJobMain(Long id);
 
+    /**
+     * 关闭任务
+     * @param id
+     * @return
+     */
+    Integer closeInspectJobMain(Long id);
+
     /**
      * 执行任务
      * @param inspectJobMainUpdateReqVO

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -181,6 +181,19 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         return inspectJobMainMapper.updateById(inspectJobMainDO);
     }
 
+    @Override
+    @Transactional
+    public Integer closeInspectJobMain(Long id) {
+        InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id);
+        JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus());
+        if(!jobStatusState.close()) {
+            throw exception(INSPECT_JOB_MAIN_STATUS_ERROR);
+        }
+        inspectJobMainDO.setStatus(jobStatusState.getState().getCode());
+        trendsApi.createTrends(id, "inspectJob", "关闭了到货检验任务", TrendsTypeEnum.UPDATE);
+        return inspectJobMainMapper.updateById(inspectJobMainDO);
+    }
+
     @Override
     @Transactional
     public String executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) {
@@ -195,6 +208,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         Long userId = getLoginUserId();
         AdminUserRespDTO userRespDTO = userApi.getUser(userId);
         inspectJobMainDO.setStatus(jobStatusState.getState().getCode());
+        inspectJobMainDO.setNextAction(inspectJobMainUpdateReqVO.getNextAction());
         inspectJobMainDO.setCompleteTime(LocalDateTime.now());
         inspectJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId()));
         inspectJobMainDO.setCompleteUserName(userRespDTO.getNickname());
@@ -217,6 +231,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         BigDecimal failedQty = BigDecimal.ZERO;
         BigDecimal crackQty = BigDecimal.ZERO;
         BigDecimal notPassedQty = BigDecimal.ZERO;
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob");
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
         List<InspectJobDetailUpdateReqVO> inspectJobDetailUpdateReqVOList = inspectJobMainUpdateReqVO.getSubList();
@@ -228,6 +243,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             failedQty = failedQty.add(inspectRecordDetailDO.getFailedQty());
             crackQty = crackQty.add(inspectRecordDetailDO.getCrackQty());
             notPassedQty = notPassedQty.add(inspectRecordDetailDO.getNotPassedQty());
+            inspectRecordDetailDO.setNotPassedQty(inspectJobDetailUpdateReqVO.getNotPassedQty());
             inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId());
             inspectRecordDetailDO.setNumber(number);
             inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId()));
@@ -243,7 +259,6 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
             BeanUtils.copyProperties(inspectRecordDetailDO, transactionCreateReqVOIn);
             //增加业务入类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob");
             transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
             TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
             transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
@@ -362,7 +377,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         //上架申请子
         SwitchDO switchDO = switchService.selectSwitchExist("CreatePutawayRequestAfterInspectRecordCreated");
         //检验合格生成上架申请
-        if(switchDO.getEffectiveSetValue().equals("TRUE")) {
+        if(switchDO.getEffectiveSetValue().equals("TRUE") && !inspectJobMainUpdateReqVO.getNextAction().equals("FULL_INSPECT")) {
             PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO();
             BeanUtils.copyProperties(inspectRecordMainDO, putawayRequestMainCreateReqVO);
             List<PutawayRequestDetailCreateReqVO> putawayRequestDetailCreateReqVOList = new ArrayList<>();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java

@@ -111,6 +111,14 @@ public interface InspectRequestMainService {
      */
     Integer submitInspectRequestMain(Long id);
 
+    /**
+     * 重新添加到货检验申请主
+     *
+     * @param id 到货检验申请主ID
+     * @return 更新数量
+     */
+    Integer reAddInspectRequestMain(Long id);
+
     /**
      * 审批通过到货检验申请主
      *
@@ -131,6 +139,6 @@ public interface InspectRequestMainService {
      * @param id 到货检验申请主ID
      * @return 更新数量
      */
-    Integer abortInspectRequestMain(Long id);
+    Integer refusedInspectRequestMain(Long id);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -295,6 +295,25 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         return inspectRequestMainMapper.updateById(mainDO);
     }
 
+    @Override
+    @Transactional
+    public Integer reAddInspectRequestMain(Long id) {
+        // 校验存在存在下级单据
+        InspectRequestMainDO mainDO = validateInspectRequestMainExists(id);
+        Long count = inspectJobMainMapper.selectByRequestNumber(mainDO.getNumber());
+        if(count > 0) {
+            throw new ServiceException(INSPECT_REQUEST_JOB_EXISTS);
+        }
+        RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
+        boolean flag = requestStatusState.reAdd();
+        if(!flag) {
+            throw new ServiceException(INSPECT_REQUEST_CANNOT_RE_ADD);
+        }
+        mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
+        trendsApi.createTrends(id, "inspectRequest", "打开了到货校验申请", TrendsTypeEnum.UPDATE);
+        return inspectRequestMainMapper.updateById(mainDO);
+    }
+
     @Override
     @Transactional
     public Integer agreeInspectRequestMain(Long id) {
@@ -333,7 +352,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
 
     @Override
     @Transactional
-    public Integer abortInspectRequestMain(Long id) {
+    public Integer refusedInspectRequestMain(Long id) {
         // 校验存在
         InspectRequestMainDO mainDO = validateInspectRequestMainExists(id);
         RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java

@@ -2,6 +2,8 @@ package com.win.module.wms.service.labelBarbasic;
 
 import java.util.*;
 import javax.validation.*;
+
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.wms.controller.labelBarbasic.vo.*;
 import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO;
 import com.win.framework.common.pojo.PageResult;
@@ -51,6 +53,14 @@ public interface BarbasicService {
      */
     List<BarbasicDO> getBarbasicList(Collection<Long> ids);
 
+    /**
+     * 获得条码实体基类列表
+     *
+     * @param ids 编号
+     * @return 条码实体基类列表
+     */
+    List<BarbasicDO> getBarbasicList(CustomConditions conditions);
+
     /**
      * 获得条码实体基类分页
      *
@@ -68,4 +78,5 @@ public interface BarbasicService {
     List<BarbasicDO> getBarbasicList(BarbasicExportReqVO exportReqVO);
 
 
+    PageResult<BarbasicDO> getBarbasicSenior(CustomConditions conditions);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java

@@ -1,6 +1,8 @@
 package com.win.module.wms.service.labelBarbasic;
 
 
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -70,6 +72,11 @@ public class BarbasicServiceImpl implements BarbasicService {
         return barbasicMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<BarbasicDO> getBarbasicList(CustomConditions conditions) {
+        return barbasicMapper.selectSeniorList(conditions);
+    }
+
     @Override
     public PageResult<BarbasicDO> getBarbasicPage(BarbasicPageReqVO pageReqVO) {
         return barbasicMapper.selectPage(pageReqVO);
@@ -80,5 +87,8 @@ public class BarbasicServiceImpl implements BarbasicService {
         return barbasicMapper.selectList(exportReqVO);
     }
 
-
+    @Override
+    public PageResult<BarbasicDO> getBarbasicSenior(CustomConditions conditions) {
+        return barbasicMapper.selectSenior(conditions);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java

@@ -6,6 +6,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
 import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 
 import javax.validation.Valid;
@@ -95,4 +96,12 @@ public interface PackageService {
      * @param packageDO
      */
    void generateLabel(PackageDO packageDO);
+
+    /**
+     * 获得包装列表, 用于 Excel 导出
+     *
+     * @param conditions 查询条件
+     * @return 包装列表
+     */
+    List<PackageDO> getPackageList(CustomConditions conditions);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java

@@ -12,6 +12,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
 import com.win.module.wms.convert.packageMassage.PackageConvert;
 import com.win.module.wms.dal.dataobject.barcode.BarcodeDO;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
 import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
 import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO;
 import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO;
@@ -231,4 +232,9 @@ public class PackageServiceImpl implements PackageService {
         barbasicDO.setBarcodeString(headerStr + contentStr);
         barbasicMapper.insert(barbasicDO);
     }
+
+    @Override
+    public List<PackageDO> getPackageList(CustomConditions conditions) {
+        return packageMapper.selectSeniorList(conditions);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

@@ -26,7 +26,6 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
 import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO;
 import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
 import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO;
-import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.dataobject.shift.ShiftDO;
 import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO;
 import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
@@ -197,7 +196,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
                 queryWrapper1.eq("line_number", poLine);
                 queryWrapper1.eq("item_code", pitemCode);
                 PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1);
-                if (purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())) {
+                //if (purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())) {
+                if (purchaseDetailDO != null) {
                     return purchaseDetailDO;
                 } else {
                     throw new UtilException("采购订单明细:订单号" + pnumber + "、订单行" + poLine + "、零件号" + pitemCode + "、无效");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -34,6 +34,7 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchaseshortageD
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
+import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper;
 import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper;
 import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper;
@@ -122,6 +123,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
     private PutawayRequestMainService putawayRequestMainService;
     @Resource
     private RequestsettingService requestsettingService;
+    @Resource
+    private PurchasereceiptJobDetailMapper purchasereceiptJobDetailMapper;
 
     @Override
     public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(CustomConditions conditions) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

@@ -15,10 +15,8 @@ import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainE
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
-import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
-import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
 import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO;
@@ -26,6 +24,7 @@ import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnReq
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
+import com.win.module.wms.dal.mysql.purchasereturnJob.PurchasereturnJobDetailMapper;
 import com.win.module.wms.dal.mysql.purchasereturnJob.PurchasereturnJobMainMapper;
 import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordDetailMapper;
 import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordMainMapper;
@@ -91,6 +90,8 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
     private JobUtils jobUtils;
     @Resource
     private BalanceMapper balanceMapper;
+    @Resource
+    private PurchasereturnJobDetailMapper purchasereturnJobDetailMapper;
 
     @Override
     public PageResult<PurchasereturnJobMainDO> getPurchasereturnJobMainSenior(CustomConditions conditions) {
@@ -235,24 +236,24 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
         purchasereturnRecordMainDO.setUpdateTime(null);
         purchasereturnRecordMainDO.setUpdater(null);
         purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO);
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
         List<PurchasereturnJobDetailUpdateReqVO> purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList();
         //退货记录子
         List<PurchasereturnRecordDetailDO> purchasereturnRecordDetailDOList = new ArrayList<>();
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
         for(PurchasereturnJobDetailUpdateReqVO purchasereturnJobDetailUpdateReqVO : purchasereturnJobDetailUpdateReqVOList) {
-            PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnJobDetailUpdateReqVO);
             PurchasereturnRecordDetailDO purchasereturnRecordDetailDO = new PurchasereturnRecordDetailDO();
-            BeanUtils.copyProperties(purchasereturnJobDetailDO, purchasereturnRecordDetailDO);
+            BeanUtils.copyProperties(purchasereturnJobDetailUpdateReqVO, purchasereturnRecordDetailDO);
             purchasereturnRecordDetailDO.setMasterId(purchasereturnRecordMainDO.getId());
             purchasereturnRecordDetailDO.setNumber(number);
-            purchasereturnRecordDetailDO.setJobDetailId(String.valueOf(purchasereturnJobDetailDO.getId()));
-            purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailDO.getPackingNumber());
+            purchasereturnRecordDetailDO.setJobDetailId(String.valueOf(purchasereturnJobDetailUpdateReqVO.getId()));
+            purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailUpdateReqVO.getPackingNumber());
             purchasereturnRecordDetailDO.setToPackingNumber(purchasereturnJobDetailUpdateReqVO.getToPackingNumber());
-            purchasereturnRecordDetailDO.setFromContainerNumber(purchasereturnJobDetailDO.getContainerNumber());
+            purchasereturnRecordDetailDO.setFromContainerNumber(purchasereturnJobDetailUpdateReqVO.getContainerNumber());
             purchasereturnRecordDetailDO.setToContainerNumber(purchasereturnJobDetailUpdateReqVO.getToContainerNumber());
             purchasereturnRecordDetailDO.setQty(purchasereturnJobDetailUpdateReqVO.getHandleQty());
-            purchasereturnRecordDetailDO.setFromBatch(purchasereturnJobDetailDO.getBatch());
+            purchasereturnRecordDetailDO.setFromBatch(purchasereturnJobDetailUpdateReqVO.getBatch());
             purchasereturnRecordDetailDO.setToBatch(purchasereturnJobDetailUpdateReqVO.getToBatch());
             purchasereturnRecordDetailDO.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus());
             purchasereturnRecordDetailDO.setToLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode());
@@ -270,13 +271,12 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
             TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO();
             BeanUtils.copyProperties(purchasereturnRecordDetailDO, transactionCreateReqVOOut);
             //增加业务类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
             transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
             TransactiontypeDO transactionTypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
             transactionCreateReqVOOut.setInventoryAction(transactionTypeDOOut.getInventoryAction());
             transactionCreateReqVOOut.setTransactionType(transactionTypeDOOut.getCode());
             transactionCreateReqVOOut.setBusinessType(purchasereturnRecordMainDO.getBusinessType());
-            transactionCreateReqVOOut.setLocationCode(purchasereturnJobDetailDO.getFromLocationCode());
+            transactionCreateReqVOOut.setLocationCode(purchasereturnJobDetailUpdateReqVO.getFromLocationCode());
             transactionCreateReqVOOut.setOwnerCode(purchasereturnRecordDetailDO.getFromOwnerCode());
             transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice());
             transactionCreateReqVOOut.setAmount(balanceDO.getAmount());
@@ -301,7 +301,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
                 transactionCreateReqVOIn.setInventoryAction(transactionTypeDOIn.getInventoryAction());
                 transactionCreateReqVOIn.setTransactionType(transactionTypeDOIn.getCode());
                 transactionCreateReqVOIn.setBusinessType(purchasereturnRecordMainDO.getBusinessType());
-                transactionCreateReqVOIn.setLocationCode(purchasereturnJobDetailDO.getToLocationCode());
+                transactionCreateReqVOIn.setLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode());
                 transactionCreateReqVOIn.setOwnerCode(purchasereturnRecordDetailDO.getToOwnerCode());
                 transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
                 transactionCreateReqVOIn.setAmount(balanceDO.getAmount());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java

@@ -15,12 +15,14 @@ import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO;
 import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
+import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
+import com.win.module.wms.dal.mysql.putawayJob.PutawayJobDetailMapper;
 import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper;
 import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper;
 import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper;
@@ -186,6 +188,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
         putawayRecordMainDO.setUpdater(null);
         putawayRecordMainDO.setUpdateTime(null);
         putawayRecordMainMapper.insert(putawayRecordMainDO);
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob");
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
         List<PutawayJobDetailUpdateReqVO> putawayJobDetailUpdateReqVOList = putawayJobMainUpdateReqVO.getSubList();
@@ -214,7 +217,6 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
             TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
             BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVOIn);
             //增加业务入类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob");
             transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
             TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
             transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());

win-server/src/main/resources/application.yaml

@@ -148,6 +148,7 @@ win:
       - /admin-api/infra/file/*/get/** # 获取图片，和租户无关
       - /magic/web/* # magic-api 和租户无关
       - /magic-api/* # magic-api 和租户无关
+      - /admin-api/profile/* # 静态资源 和租户无关
     ignore-tables:
       - system_tenant
       - system_tenant_package