客户结算后端代码修改

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

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

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

@@ -104,8 +104,8 @@ public class CustomerreceiptRequestMainPageReqVO extends PageParam {
     private String directCreateRecord;
 
     @Schema(description = "入库库存状态范围")
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
 
     @Schema(description = "出库库存状态范围")
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 }

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

@@ -187,11 +187,13 @@ public class CustomerreturnJobMainController {
         if(result==null) {
             return success(result);
         };
-        CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO();
+//        CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO();
-        reqVO.setMasterId(result.getId());
+//        reqVO.setMasterId(result.getId());
-        List<CustomerreturnJobDetailDO> customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO);
+//        List<CustomerreturnJobDetailDO> customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO);
-        List<CustomerreturnJobDetailExcelVO> customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList);
+//        List<CustomerreturnJobDetailExcelVO> customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList);
-        result.setSubList(customerreturnJobDetailExcelVOS);
+//        result.setSubList(customerreturnJobDetailExcelVOS);
+        List<CustomerreturnJobDetailDO> subList = customerreturnJobDetailService.selectList(id);
+        result.setSubList(subList);
         return success(result);
     }
 
@@ -241,8 +243,8 @@ public class CustomerreturnJobMainController {
     @Operation(summary = "执行客户退货任务主")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:execute')")
-    public CommonResult<Boolean> closeCustomerreturnRequestMain(@Valid @RequestBody CustomerreturnJobMainUpdateReqVO updateReqVO) {
+    public CommonResult<String> closeCustomerreturnRequestMain(@Valid @RequestBody CustomerreturnJobMainUpdateReqVO updateReqVO) {
-        Integer count = customerreturnJobMainService.executeCustomerreturnJobMain(updateReqVO);
+        String number = customerreturnJobMainService.executeCustomerreturnJobMain(updateReqVO);
-        return success(count > 0);
+        return success(number);
     }
 }

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

@@ -83,8 +83,8 @@ public class CustomersettleRequestMainPageReqVO extends PageParam {
     private String directCreateRecord;
 
     @Schema(description = "入库库存状态范围")
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
 
     @Schema(description = "出库库存状态范围")
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 }

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

@@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverPlan;
 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.deliverRequest.DeliverRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -122,4 +125,12 @@ public class DeliverPlanDetailController {
         ExcelUtils.write(response, "发货计划子.xls", "数据", DeliverPlanDetailExcelVO.class, datas);
     }
 
+    @GetMapping("/detailList")
+    @Operation(summary = "根据主表id查询子表")
+    @Parameter(name = "masterId", description = "主表id", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:detailList')")
+    public CommonResult<List<DeliverPlanDetailRespVO>> selectDetailByMasterID(@RequestParam("id") Long masterId) {
+        List<DeliverPlanDetailDO> list = deliverPlanDetailService.selectListByMasterID(masterId);
+        return success(DeliverPlanDetailConvert.INSTANCE.convertList(list));
+    }
 }

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

@@ -52,4 +52,6 @@ public interface CustomersettleRequestDetailConvert {
     CustomersettleRequestDetailCreateReqVO convert1(CustomersettleRequestDetailDO detailDO);
 
     List<CustomersettleRequestDetailDO> convertList03(List<CustomersettleRequestDetailCreateReqVO> list);
+
+    CustomersettleRequestDetailCreateReqVO convertDoToVo(CustomersettleRequestDetailDO customersettleRequestDetailDO);
 }

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

@@ -158,10 +158,10 @@ public class CustomerreceiptRequestMainDO extends BaseDO {
     /**
      * 入库库存状态范围
      */
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
     /**
      * 出库库存状态范围
      */
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 
 }

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

@@ -246,9 +246,9 @@ public class CustomerreturnJobMainDO extends BaseDO {
     /**
      * 入库库存状态范围
      */
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
     /**
      * 出库库存状态范围
      */
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 }

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

@@ -182,9 +182,9 @@ public class CustomerreturnRequestMainDO extends BaseDO {
     /**
      * 入库库存状态范围
      */
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
     /**
      * 出库库存状态范围
      */
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 }

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

@@ -133,9 +133,9 @@ public class CustomersettleRequestMainDO extends BaseDO {
     /**
      * 入库库存状态范围
      */
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
     /**
      * 出库库存状态范围
      */
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 }

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

@@ -172,10 +172,10 @@ public class DeliverRequestMainDO extends BaseDO {
     /**
      * 入库库存状态范围
      */
-    private String inInventoryStatus;
+    private String inInventoryStatuses;
     /**
      * 出库库存状态范围
      */
-    private String outInventoryStatus;
+    private String outInventoryStatuses;
 
 }

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

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

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

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

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

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

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

@@ -44,8 +44,8 @@ public interface CustomersettleRequestMainMapper extends BaseMapperX<Customerset
                 .eqIfPresent(CustomersettleRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(CustomersettleRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(CustomersettleRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
-                .eqIfPresent(CustomersettleRequestMainDO::getInInventoryStatus, reqVO.getInInventoryStatus())
+                .eqIfPresent(CustomersettleRequestMainDO::getInInventoryStatuses, reqVO.getInInventoryStatuses())
-                .eqIfPresent(CustomersettleRequestMainDO::getOutInventoryStatus, reqVO.getOutInventoryStatus())
+                .eqIfPresent(CustomersettleRequestMainDO::getOutInventoryStatuses, reqVO.getOutInventoryStatuses())
                 .orderByDesc(CustomersettleRequestMainDO::getId));
     }
     default PageResult<CustomersettleRequestMainDO> selectSenior(CustomConditions conditions) {

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

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

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

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java

@@ -141,5 +141,5 @@ public interface CustomerreturnJobMainService {
      * @param customerreturnJobMainUpdateReqVO
      * @return
      */
-    Integer executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO);
+    String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java

@@ -233,7 +233,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
 
     @Override
     @Transactional
-    public Integer executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO) {
+    public String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO) {
         //查询数据
         CustomerreturnJobMainDO customerreturnJobMainDO = this.validateCustomerreturnJobMainExists(customerreturnJobMainUpdateReqVO.getId());
         List<CustomerreturnJobDetailDO> subList = customerreturnJobDetailService.selectList(customerreturnJobMainDO.getId());
@@ -350,6 +350,6 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
         expectoutService.deleteExpectoutByJobNumber(customerreturnJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(customerreturnJobMainDO.getId(), "customerreturnJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE);
-        return result;
+        return number;
     }
 }

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

@@ -340,8 +340,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
         //增加业务类型
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectJob");
         customerreturnJobMainDO.setBusinessType(businesstypeDO.getCode());
-        customerreturnJobMainDO.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+        customerreturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
-        customerreturnJobMainDO.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+        customerreturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         customerreturnJobMainMapper.insert(customerreturnJobMainDO);
         List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
         List<CustomerreturnJobDetailDO> customerreturnJobDetailDOList = new ArrayList<>();
@@ -638,8 +638,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
             mainDo.setToLocationTypes(businesstypeDO.getInLocationTypes());
             mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
             mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes());
-            mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+            mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
-            mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+            mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         }
 
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java

@@ -259,25 +259,24 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
      * @param detailDOList 客户收货子
      */
     private void generateRecord(CustomersettleRequestMainDO mainDO, List<CustomersettleRequestDetailDO> detailDOList) {
-        if ("TRUE".equals(mainDO.getDirectCreateRecord())) {
+        CustomersettleRecordMainCreateReqVO customersettleRecordMainCreateReqVO = new CustomersettleRecordMainCreateReqVO();
-            CustomersettleRecordMainCreateReqVO customersettleRecordMainCreateReqVO = new CustomersettleRecordMainCreateReqVO();
+        BeanUtils.copyProperties(mainDO, customersettleRecordMainCreateReqVO);
-            BeanUtils.copyProperties(mainDO, customersettleRecordMainCreateReqVO);
+        customersettleRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
-            customersettleRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
+
-            String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_REQUEST.getCode());
+        String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_REQUEST.getCode());
-            customersettleRecordMainCreateReqVO.setNumber(number);
+        customersettleRecordMainCreateReqVO.setNumber(number);
-            //增加业务类型
+        //增加业务类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomersettleRecord");
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomersettleRecord");
-            customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
+        customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
-            CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO);
+        CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO);
-            customersettleRecordMainMapper.insert(convert);
+        customersettleRecordMainMapper.insert(convert);
-            for (CustomersettleRequestDetailDO customersettleRequestDetailDO : detailDOList) {
+        for (CustomersettleRequestDetailDO customersettleRequestDetailDO : detailDOList) {
-                CustomersettleRecordDetailCreateReqVO customersettleRecordDetailCreateReqVO = new CustomersettleRecordDetailCreateReqVO();
+            CustomersettleRecordDetailCreateReqVO customersettleRecordDetailCreateReqVO = new CustomersettleRecordDetailCreateReqVO();
-                BeanUtils.copyProperties(customersettleRequestDetailDO, customersettleRecordDetailCreateReqVO);
+            BeanUtils.copyProperties(customersettleRequestDetailDO, customersettleRecordDetailCreateReqVO);
-                customersettleRecordDetailCreateReqVO.setNumber(number);
+            customersettleRecordDetailCreateReqVO.setNumber(number);
-                customersettleRecordDetailCreateReqVO.setMasterId(convert.getId().toString());
+            customersettleRecordDetailCreateReqVO.setMasterId(convert.getId().toString());
-                customersettleRecordDetailMapper.insert(CustomersettleRecordDetailConvert.INSTANCE.convert(customersettleRecordDetailCreateReqVO));
+            customersettleRecordDetailMapper.insert(CustomersettleRecordDetailConvert.INSTANCE.convert(customersettleRecordDetailCreateReqVO));
-                trendsApi.createTrends(mainDO.getId(), "CustomersettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE);
+            trendsApi.createTrends(mainDO.getId(), "CustomersettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE);
-            }
         }
     }
 
@@ -457,8 +456,8 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerSettleRequest");
         mainDo.setBusinessType(businesstypeDO.getCode());
         mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
-        mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+        mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
-        mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+        mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
     }
 
     /**
@@ -507,7 +506,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
         mainDo.setBusinessType(businesstypeDO.getCode());
         mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
         mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
-        mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+        mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
-        mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+        mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
     }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java

@@ -11,6 +11,8 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailCreateReqVO;
 import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO;
+import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO;
+import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO;
 import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailUpdateReqVO;
 import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO;
 import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO;
@@ -18,8 +20,10 @@ import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO;
 import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert;
+import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO;
+import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO;
 import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
 import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
@@ -37,6 +41,7 @@ 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.service.customerreceiptRequest.CustomerreceiptRequestMainService;
+import com.win.module.wms.service.customersettleRequest.CustomersettleRequestMainService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.purchase.PurchaseMainService;
@@ -107,6 +112,8 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
     @Resource
     private CustomerreceiptRequestMainService customerreceiptRequestMainService;
     @Resource
+    private CustomersettleRequestMainService customersettleRequestMainService;
+    @Resource
     private CustomerreceiptRequestDetailMapper customerreceiptRequestDetailMapper;
     
     @Override
@@ -279,6 +286,16 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverJob");
         deliverRecordMainDO.setBusinessType(businesstypeDO.getCode());
         deliverRecordMainMapper.insert(deliverRecordMainDO);
+        //添加客户结算申请主表
+        CustomersettleRequestMainCreateReqVO customersettleRequestMainCreateReqVO = new CustomersettleRequestMainCreateReqVO();
+        BeanUtils.copyProperties(deliverJobMainDO, customersettleRequestMainCreateReqVO);
+        customersettleRequestMainCreateReqVO.setId(null);
+        customersettleRequestMainCreateReqVO.setCreator(null);
+        customersettleRequestMainCreateReqVO.setCreateTime(null);
+        customersettleRequestMainCreateReqVO.setUpdater(null);
+        customersettleRequestMainCreateReqVO.setUpdateTime(null);
+        customersettleRequestMainCreateReqVO.setDeliverRecordNumber(number);
+        ArrayList<CustomersettleRequestDetailCreateReqVO> customersettleRequestDetailCreateReqVOS = new ArrayList<>();
         //添加客户收货申请主表
         CustomerreceiptRequestMainCreateReqVO customerreceiptRequestMainCreateReqVO = new CustomerreceiptRequestMainCreateReqVO();
         BeanUtils.copyProperties(deliverJobMainDO, customerreceiptRequestMainCreateReqVO);
@@ -307,7 +324,6 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
                     List<Map<String,String>> recordList = DetailUpdateItem.getRecordList();
                     recordList.forEach(recordListItem -> {
                         DeliverRecordDetailDO deliverRecordDetailDO = new DeliverRecordDetailDO();
-                        CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO = new CustomerreceiptRequestDetailDO();
                         BeanUtils.copyProperties(DetailUpdateItem, deliverRecordDetailDO);
                         deliverRecordDetailDO.setJobDetailId(DetailUpdateItem.getId().toString());
                         deliverRecordDetailDO.setId(null);
@@ -335,6 +351,18 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
                         deliverRecordDetailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode());
                         deliverRecordDetailDO.setFromAreaCode(locationDOFrom.getAreaCode());
                         deliverRecordDetailDOList.add(deliverRecordDetailDO);
+                        //根据发货记录子表赋值给客户结算申请子表
+                        CustomersettleRequestDetailDO customersettleRequestDetailDO = new CustomersettleRequestDetailDO();
+                        BeanUtils.copyProperties(deliverRecordDetailDO, customersettleRequestDetailDO);
+                        customersettleRequestDetailDO.setId(null);
+                        customersettleRequestDetailDO.setCreator(null);
+                        customersettleRequestDetailDO.setCreateTime(null);
+                        customersettleRequestDetailDO.setUpdater(null);
+                        customersettleRequestDetailDO.setUpdateTime(null);
+                        CustomersettleRequestDetailCreateReqVO customersettleRequestDetailCreateReqVO = CustomersettleRequestDetailConvert.INSTANCE.convertDoToVo(customersettleRequestDetailDO);
+                        customersettleRequestDetailCreateReqVOS.add(customersettleRequestDetailCreateReqVO);
+                        //根据发货记录子表赋值给客户收货申请子表
+                        CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO = new CustomerreceiptRequestDetailDO();
                         BeanUtils.copyProperties(deliverRecordDetailDO, customerreceiptRequestDetailDO);
                         customerreceiptRequestDetailDO.setId(null);
                         customerreceiptRequestDetailDO.setCreator(null);
@@ -367,6 +395,8 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
         });
         deliverRecordDetailMapper.insertBatch(deliverRecordDetailDOList);
         customerreceiptRequestMainCreateReqVO.setSubList(customerreceiptRequestDetailCreateReqVOS);
+        customersettleRequestMainCreateReqVO.setSubList(customersettleRequestDetailCreateReqVOS);
+        customersettleRequestMainService.createCustomersettleRequestMain(customersettleRequestMainCreateReqVO);
         customerreceiptRequestMainService.createCustomerreceiptRequestMain(customerreceiptRequestMainCreateReqVO);
         List<String> typeList = new ArrayList<>();
         typeList.add(JobStatusEnum.PENDING.getCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java

@@ -8,6 +8,7 @@ import com.win.module.wms.controller.deliverRequest.vo.*;
 import com.win.module.wms.controller.issueRequest.vo.IssueRequestImportErrorVO;
 import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO;
 import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
 import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
 import com.win.framework.common.pojo.PageResult;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java

@@ -378,8 +378,8 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
             mainDo.setToLocationTypes(businesstypeDO.getInLocationTypes());
             mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
             mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes());
-            mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+            mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
-            mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+            mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         }
         try {
             ValidationUtils.validate(validator, mainDo);
@@ -528,8 +528,8 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
         deliverRequestMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
-        deliverRequestMainDO.setInInventoryStatus(businesstypeDO.getInInventoryStatuses());
+        deliverRequestMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
-        deliverRequestMainDO.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses());
+        deliverRequestMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         String customerDeliverNumber = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_DELIVER_NUMBER.getCode());
         deliverRequestMainDO.setCustomerDeliverNumber(customerDeliverNumber);
         return deliverRequestMainDO;