Merge remote-tracking branch 'origin/master'

# Conflicts:
#	win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java

win-module-infra/win-module-infra-api/src/main/java/com/win/module/infra/api/trends/TrendsApi.java

@@ -1,15 +1,16 @@
 package com.win.module.infra.api.trends;
 
-import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO;
+import com.win.module.infra.enums.TrendsTypeEnum;
-
-import javax.validation.Valid;
 
 public interface TrendsApi {
 
     /**
      * 创建动态记录
-     * @param createDTO
+     * @param tableId 表数据id
+     * @param tableName 表名
+     * @param content 内容
+     * @param trendsTypeEnum com.win.module.infra.enums.TrendsTypeEnum枚举
      */
-    void createTrends(@Valid TrendsCreateReqDTO createDTO);
+    void createTrends(Long tableId, String tableName, String content, TrendsTypeEnum trendsTypeEnum);
 
 }

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java

@@ -1,6 +1,7 @@
 package com.win.module.infra.api.trends;
 
 import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO;
+import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.infra.mq.producer.trends.TrendsProducer;
 import com.win.module.infra.service.trends.TrendsService;
 import org.springframework.stereotype.Service;
@@ -24,7 +25,12 @@ public class TrendsApiImpl implements TrendsApi {
     private TrendsService trendsService;
 
     @Override
-    public void createTrends(TrendsCreateReqDTO createDTO) {
+    public void createTrends(Long tableId, String tableName, String content, TrendsTypeEnum trendsTypeEnum) {
+        TrendsCreateReqDTO createDTO = new TrendsCreateReqDTO();
+        createDTO.setTableId(tableId);
+        createDTO.setTableName(tableName);
+        createDTO.setType(trendsTypeEnum.getType());
+        createDTO.setContent(content);
         trendsService.createTrends(createDTO);
         //TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO);
         //trendsProducer.sendMessage(trendsMessage);

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

@@ -1,9 +1,17 @@
 package com.win.module.wms.controller.countJob;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.security.core.util.SecurityFrameworkUtils;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countJob.vo.*;
+import com.win.module.wms.controller.rule.vo.RuleRespVO;
+import com.win.module.wms.convert.countJob.CountJobDetailConvert;
+import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO;
+
+import com.win.module.wms.service.countJob.CountJobDetailService;
+import com.win.module.wms.service.rule.RuleService;
+import io.swagger.v3.core.util.Json;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +34,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
 
-import com.win.module.wms.controller.countJob.vo.*;
 import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO;
 import com.win.module.wms.convert.countJob.CountJobMainConvert;
 import com.win.module.wms.service.countJob.CountJobMainService;
@@ -40,6 +47,12 @@ public class CountJobMainController {
     @Resource
     private CountJobMainService countJobMainService;
 
+    @Resource
+    private CountJobDetailService countJobDetailService;
+
+    @Resource
+    private RuleService ruleService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +135,22 @@ public class CountJobMainController {
         ExcelUtils.write(response, "盘点任务主.xls", "数据", CountJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getCountJobById")
+    @Operation(summary = "APP获得盘点主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:count-job-main:query')")
+    public CommonResult<CountJobMainRespVO> getCountJobById(@RequestParam("id") Long id) {
+        CountJobMainDO countJobMain = countJobMainService.getCountJobMain(id);
+        CountJobMainRespVO result = CountJobMainConvert.INSTANCE.convert(countJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        CountJobDetailExportReqVO reqVO = new CountJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<CountJobDetailDO> countJobDetailList = countJobDetailService.getCountJobDetailList(reqVO);
+        List<CountJobDetailExcelVO> vos = CountJobDetailConvert.INSTANCE.convertList02(countJobDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

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

@@ -67,4 +67,7 @@ public class CountJobDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

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

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.countJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 盘点任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CountJobMainRespVO extends CountJobMainBaseVO {
 
+    @Schema(description = "盘点任务子表job_count_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

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

@@ -4,6 +4,9 @@ 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.convert.customerreturnJob.CustomerreturnJobDetailConvert;
+import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
+import com.win.module.wms.service.customerreturnJob.CustomerreturnJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +43,9 @@ public class CustomerreturnJobMainController {
     @Resource
     private CustomerreturnJobMainService customerreturnJobMainService;
 
+    @Resource
+    private CustomerreturnJobDetailService customerreturnJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -123,4 +129,22 @@ public class CustomerreturnJobMainController {
         ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getCustomerreturnJobById")
+    @Operation(summary = "APP获得客户退货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')")
+    public CommonResult<CustomerreturnJobMainRespVO> getCustomerreturnJobById(@RequestParam("id") Long id) {
+        CustomerreturnJobMainDO customerreturnJobMain = customerreturnJobMainService.getCustomerreturnJobMain(id);
+        CustomerreturnJobMainRespVO result = CustomerreturnJobMainConvert.INSTANCE.convert(customerreturnJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<CustomerreturnJobDetailDO> customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO);
+        List<CustomerreturnJobDetailExcelVO> customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList);
+        result.setSubList(customerreturnJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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

@@ -71,9 +71,12 @@ public class CustomerreturnJobDetailExportReqVO {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createtime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

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

@@ -73,7 +73,7 @@ public class CustomerreturnJobDetailPageReqVO extends PageParam {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createtime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
     private String creator;

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

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.customerreturnJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 客户退货任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CustomerreturnJobMainRespVO extends CustomerreturnJobMainBaseVO {
 
+    @Schema(description = "客户退货任务子表job_customerreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

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

@@ -3,6 +3,9 @@ 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.convert.deliverJob.DeliverJobDetailConvert;
+import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
+import com.win.module.wms.service.deliverJob.DeliverJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,9 @@ public class DeliverJobMainController {
 
     @Resource
     private DeliverJobMainService deliverJobMainService;
+    
+    @Resource
+    private DeliverJobDetailService deliverJobDetailService;
 
     @Resource
     private AdminUserApi userApi;
@@ -121,4 +127,22 @@ public class DeliverJobMainController {
         ExcelUtils.write(response, "发货任务主.xls", "数据", DeliverJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getDeliverJobById")
+    @Operation(summary = "APP获得发货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')")
+    public CommonResult<DeliverJobMainRespVO> getDeliverJobById(@RequestParam("id") Long id) {
+        DeliverJobMainDO deliverJobMain = deliverJobMainService.getDeliverJobMain(id);
+        DeliverJobMainRespVO result = DeliverJobMainConvert.INSTANCE.convert(deliverJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        DeliverJobDetailExportReqVO exportReqVO = new DeliverJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<DeliverJobDetailDO> deliverJobDetailList = deliverJobDetailService.getDeliverJobDetailList(exportReqVO);
+        List<DeliverJobDetailExcelVO> deliverJobDetailExcelVOS = DeliverJobDetailConvert.INSTANCE.convertList02(deliverJobDetailList);
+        result.setSubList(deliverJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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

@@ -74,4 +74,9 @@ public class DeliverJobDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
+
+
 }

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

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.deliverJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 发货任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class DeliverJobMainRespVO extends DeliverJobMainBaseVO {
 
+    @Schema(description = "发货任务子表job_deliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java

@@ -3,6 +3,9 @@ package com.win.module.wms.controller.inventorymoveJob;
 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.convert.inventorymoveJob.InventorymoveJobDetailConvert;
+import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO;
+import com.win.module.wms.service.inventorymoveJob.InventorymoveJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@ public class InventorymoveJobMainController {
     @Resource
     private InventorymoveJobMainService inventorymoveJobMainService;
 
+    @Resource
+    private InventorymoveJobDetailService inventorymoveJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -123,4 +129,22 @@ public class InventorymoveJobMainController {
         ExcelUtils.write(response, "库存转移任务主.xls", "数据", InventorymoveJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getInventorymoveJobById")
+    @Operation(summary = "APP获得库存转移主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')")
+    public CommonResult<InventorymoveJobMainRespVO> getInventorymoveJobById(@RequestParam("id") Long id) {
+        InventorymoveJobMainDO inventorymoveJobMain = inventorymoveJobMainService.getInventorymoveJobMain(id);
+        InventorymoveJobMainRespVO result = InventorymoveJobMainConvert.INSTANCE.convert(inventorymoveJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        InventorymoveJobDetailExportReqVO exportReqVO = new InventorymoveJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<InventorymoveJobDetailDO> inventorymoveJobDetailList = inventorymoveJobDetailService.getInventorymoveJobDetailList(exportReqVO);
+        List<InventorymoveJobDetailExcelVO> inventorymoveJobDetailExcelVOS = InventorymoveJobDetailConvert.INSTANCE.convertList02(inventorymoveJobDetailList);
+        result.setSubList(inventorymoveJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java

@@ -44,7 +44,7 @@ public class InventorymoveJobDetailExportReqVO {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createtime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
     private String creator;
@@ -79,4 +79,7 @@ public class InventorymoveJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java

@@ -46,7 +46,7 @@ public class InventorymoveJobDetailPageReqVO extends PageParam {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createtime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
     private String creator;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.inventorymoveJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 库存转移任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class InventorymoveJobMainRespVO extends InventorymoveJobMainBaseVO {
 
+    @Schema(description = "库存转移任务子表job_inventorymove_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java

@@ -8,8 +8,11 @@ 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.productdismantleJob.vo.*;
+import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert;
 import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert;
+import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO;
 import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO;
+import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService;
 import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductdismantleJobMainController {
     @Resource
     private ProductdismantleJobMainService productdismantleJobMainService;
 
+    @Resource
+    private ProductdismantleJobDetailService productdismantleJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class ProductdismantleJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductdismantleJobById")
+    @Operation(summary = "APP获得制品收货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')")
+    public CommonResult<ProductdismantleJobMainRespVO> getProductdismantleJobById(@RequestParam("id") Long id) {
+        ProductdismantleJobMainDO productdismantleJobMain = productdismantleJobMainService.getProductdismantleJobMain(id);
+        ProductdismantleJobMainRespVO result = ProductdismantleJobMainConvert.INSTANCE.convert(productdismantleJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductdismantleJobDetailExportReqVO exportReqVO = new ProductdismantleJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<ProductdismantleJobDetailDO> productdismantleJobDetailList = productdismantleJobDetailService.getProductdismantleJobDetailList(exportReqVO);
+        List<ProductdismantleJobDetailExcelVO> productdismantleJobDetailExcelVOS = ProductdismantleJobDetailConvert.INSTANCE.convertList02(productdismantleJobDetailList);
+        result.setSubList(productdismantleJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java

@@ -93,4 +93,7 @@ public class ProductdismantleJobDetailExportReqVO {
     @Schema(description = "从货主代码")
     private String fromOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.productdismantleJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 制品拆解任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductdismantleJobMainRespVO extends ProductdismantleJobMainBaseVO {
 
+    @Schema(description = "制品拆解任务子表job_productdismantle_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java

@@ -126,11 +126,11 @@ public class ProductionreceiptJobMainController {
         return success(result);
     }
 
-    @GetMapping("/gettProductionreceiptJobById")
+    @GetMapping("/getProductionreceiptJobById")
     @Operation(summary = "APP获得生产发料主子表明细列表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')")
-    public CommonResult<ProductionreceiptJobMainRespVO> gettProductionreceiptJobById(@RequestParam("id") Long id) {
+    public CommonResult<ProductionreceiptJobMainRespVO> getProductionreceiptJobById(@RequestParam("id") Long id) {
         ProductionreceiptJobMainDO productionreceiptJobMain = productionreceiptJobMainService.getProductionreceiptJobMain(id);
         ProductionreceiptJobMainRespVO result = ProductionreceiptJobMainConvert.INSTANCE.convert(productionreceiptJobMain);
         if(result==null) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java

@@ -8,8 +8,11 @@ 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.productreceiptJob.vo.*;
+import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert;
 import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO;
+import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService;
 import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductreceiptJobMainController {
     @Resource
     private ProductreceiptJobMainService productreceiptJobMainService;
 
+    @Resource
+    private ProductreceiptJobDetailService productreceiptJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,22 @@ public class ProductreceiptJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductreceiptJobById")
+    @Operation(summary = "APP获得制品收货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-main:query')")
+    public CommonResult<ProductreceiptJobMainRespVO> getProductreceiptJobById(@RequestParam("id") Long id) {
+        ProductreceiptJobMainDO productreceiptJobMain = productreceiptJobMainService.getProductreceiptJobMain(id);
+        ProductreceiptJobMainRespVO result = ProductreceiptJobMainConvert.INSTANCE.convert(productreceiptJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductreceiptJobDetailExportReqVO rxportReqVO = new ProductreceiptJobDetailExportReqVO();
+        rxportReqVO.setMasterId(result.getId());
+        List<ProductreceiptJobDetailDO> productreceiptJobDetailList = productreceiptJobDetailService.getProductreceiptJobDetailList(rxportReqVO);
+        List<ProductreceiptJobDetailExcelVO> productreceiptJobDetailExcelVOS = ProductreceiptJobDetailConvert.INSTANCE.convertList02(productreceiptJobDetailList);
+        result.setSubList(productreceiptJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java

@@ -96,4 +96,7 @@ public class ProductreceiptJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.productreceiptJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 制品收货任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -12,4 +14,7 @@ public class ProductreceiptJobMainRespVO extends ProductreceiptJobMainBaseVO {
     @Schema(description = "并发乐观锁")
     private String concurrencyStamp;
 
+    @Schema(description = "制品收货任务子表job_productreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailBaseVO.java

@@ -1,19 +1,13 @@
 package com.win.module.wms.controller.purchasereceiptRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+
-import java.time.LocalDateTime;
+import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -35,49 +29,42 @@ public class PurchasereceiptRequestDetailBaseVO {
     private String containerNumber;
 
     @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "批次不能为空")
+    @NotBlank(message = "批次不能为空")
     private String batch;
 
     @Schema(description = "替代批次")
     private String altBatch;
 
     @Schema(description = "到货日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到货日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime arriveDate;
 
     @Schema(description = "生产日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime produceDate;
 
     @Schema(description = "过期日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "过期日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime expireDate;
 
     @Schema(description = "库存状态", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "库存状态不能为空")
     private String inventoryStatus;
 
     @Schema(description = "从库位代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从库位代码不能为空")
     private String fromLocationCode;
 
     @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "订单号不能为空")
+    @NotBlank(message = "订单号不能为空")
     private String poNumber;
 
     @Schema(description = "订单行", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "订单行不能为空")
+    @NotBlank(message = "订单行不能为空")
     private String poLine;
 
     @Schema(description = "标包数量", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "标包数量不能为空")
     private BigDecimal stdPackQty;
 
     @Schema(description = "标包单位", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "标包单位不能为空")
     private String stdPackUnit;
 
     @Schema(description = "供应商计量数量")
@@ -87,14 +74,13 @@ public class PurchasereceiptRequestDetailBaseVO {
     private String supplierPackUnit;
 
     @Schema(description = "转换率", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "转换率不能为空")
     private BigDecimal convertRate;
 
     @Schema(description = "单据号")
     private String number;
 
     @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物品代码不能为空")
+    @NotBlank(message = "物品代码不能为空")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -113,9 +99,11 @@ public class PurchasereceiptRequestDetailBaseVO {
     private String projectCode;
 
     @Schema(description = "数量")
+    @NotBlank(message = "数量不能为空")
     private BigDecimal qty;
 
     @Schema(description = "计量单位")
+    @NotBlank(message = "计量单位不能为空")
     private String uom;
 
     @Schema(description = "最后更新时间")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainBaseVO.java

@@ -1,15 +1,13 @@
 package com.win.module.wms.controller.purchasereceiptRequest.vo;
 
+import com.win.framework.excel.core.annotations.OnlyOne;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -22,15 +20,15 @@ public class PurchasereceiptRequestMainBaseVO {
     @Schema(description = "id", example = "id")
     private Long id;
 
-
     @Schema(description = "发货单号")
     private String asnNumber;
 
     @Schema(description = "要货计划单号")
     private String ppNumber;
 
+    @OnlyOne
     @Schema(description = "供应商代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "供应商代码不能为空")
+    @NotBlank(message = "供应商代码不能为空")
     private String supplierCode;
 
     @Schema(description = "承运商")
@@ -40,11 +38,9 @@ public class PurchasereceiptRequestMainBaseVO {
     private String transferMode;
 
     @Schema(description = "从仓库代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从仓库代码不能为空")
     private String fromWarehouseCode;
 
     @Schema(description = "到仓库代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到仓库代码不能为空")
     private String toWarehouseCode;
 
     @Schema(description = "从库位类型范围")
@@ -63,11 +59,9 @@ public class PurchasereceiptRequestMainBaseVO {
     private String toDockCode;
 
     @Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "单据号不能为空")
     private String number;
 
     @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "业务类型不能为空")
     private String businessType;
 
     @Schema(description = "备注")
@@ -89,7 +83,6 @@ public class PurchasereceiptRequestMainBaseVO {
     private LocalDateTime dueTime;
 
     @Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "部门不能为空")
     private String departmentCode;
 
     @Schema(description = "最后更新时间")
@@ -103,19 +96,15 @@ public class PurchasereceiptRequestMainBaseVO {
     private String status;
 
     @Schema(description = "自动提交", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "自动提交不能为空")
     private String autoCommit;
 
     @Schema(description = "自动通过", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "自动通过不能为空")
     private String autoAgree;
 
     @Schema(description = "自动执行", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "自动执行不能为空")
     private String autoExecute;
 
     @Schema(description = "直接生成记录", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "直接生成记录不能为空")
     private String directCreateRecord;
 
     @Schema(description = "车牌号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainCreateReqVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Schema(description = "管理后台 - 采购收货申请主创建 Request VO")
@@ -16,5 +17,5 @@ public class PurchasereceiptRequestMainCreateReqVO extends PurchasereceiptReques
 
     @SubObject
     @Schema(description = "子表数据")
-    private List<PurchasereceiptRequestDetailCreateReqVO> subList;
+    private List<@Valid PurchasereceiptRequestDetailCreateReqVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainImportVO.java

@@ -1,12 +1,12 @@
 package com.win.module.wms.controller.purchasereceiptRequest.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -24,41 +24,48 @@ public class PurchasereceiptRequestMainImportVO {
 
     //主表数据
     @ExcelProperty("供应商代码")
-    private String supplier_code;
+    private String supplierCode;
 
+    @NotBlank(message="订单号不能为空")
     @ExcelProperty("订单号")
-    private String po_number;
+    private String poNumber;
 
+    @NotBlank(message="订单行不能为空")
     @ExcelProperty("订单行")
-    private String po_line;
+    private String poLine;
 
+    @NotBlank(message="物品代码不能为空")
     @ExcelProperty("物品代码")
-    private String item_code;
+    private String itemCode;
 
+    @NotBlank(message="批次不能为空")
     @ExcelProperty("批次")
     private String batch;
 
+    @NotBlank(message="数量不能为空")
     @ExcelProperty("数量")
-    @ColumnWidth(value = 16)
     private String qty;
 
+    @NotBlank(message="计量单位不能为空")
     @ExcelProperty("计量单位")
-    @ColumnWidth(value = 16)
     private String uom;
 
     @ExcelProperty("到货日期")
-    private String isConsignment;
+    private LocalDateTime arriveDate;
 
     @ExcelProperty("生产日期")
-    private LocalDateTime dueDate;
+    private LocalDateTime produceDate;
 
     //子表数据
     @ExcelProperty("过期日期")
-    private String itemCode;
+    private LocalDateTime expireDate;
+
     @ExcelProperty("承运商")
-    private String orderQty;
+    private String carrierCode;
+
     @ExcelProperty("运输方式")
-    private String aa;
+    private String transferMode;
+
     @ExcelProperty("车牌号")
-    private BigDecimal overReceivingPercent;
+    private BigDecimal vehiclePlateNumber;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java

@@ -1,9 +1,10 @@
 package com.win.module.wms.controller.scrapJob;
-
 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.convert.scrapJob.ScrapJobDetailConvert;
+import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO;
+import com.win.module.wms.service.scrapJob.ScrapJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +41,9 @@ public class ScrapJobMainController {
     @Resource
     private ScrapJobMainService scrapJobMainService;
 
+    @Resource
+    private ScrapJobDetailService scrapJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +126,22 @@ public class ScrapJobMainController {
         ExcelUtils.write(response, "报废出库任务主.xls", "数据", ScrapJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getScrapJobById")
+    @Operation(summary = "APP获得报废出库任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:scrap-job-main:query')")
+    public CommonResult<ScrapJobMainRespVO> getScrapJobById(@RequestParam("id") Long id) {
+        ScrapJobMainDO scrapJobMain = scrapJobMainService.getScrapJobMain(id);
+        ScrapJobMainRespVO result = ScrapJobMainConvert.INSTANCE.convert(scrapJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ScrapJobDetailExportReqVO reqVO = new ScrapJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<ScrapJobDetailDO> scrapJobDetailList = scrapJobDetailService.getScrapJobDetailList(reqVO);
+        List<ScrapJobDetailExcelVO> vos = ScrapJobDetailConvert.INSTANCE.convertList02(scrapJobDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java

@@ -70,4 +70,7 @@ public class ScrapJobDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.scrapJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 报废出库任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ScrapJobMainRespVO extends ScrapJobMainBaseVO {
 
+    @Schema(description = "报废出库任务子表job_scrap_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java

@@ -4,6 +4,9 @@ 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.transferissueJob.vo.*;
+import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
+import com.win.module.wms.service.transferissueJob.TransferissueJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +29,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
 
-import com.win.module.wms.controller.transferissueJob.vo.*;
 import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO;
 import com.win.module.wms.convert.transferissueJob.TransferissueJobMainConvert;
 import com.win.module.wms.service.transferissueJob.TransferissueJobMainService;
@@ -40,6 +42,9 @@ public class TransferissueJobMainController {
     @Resource
     private TransferissueJobMainService transferissueJobMainService;
 
+    @Resource
+    private TransferissueJobDetailService transferissueJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +127,22 @@ public class TransferissueJobMainController {
         ExcelUtils.write(response, "调拨出库任务主.xls", "数据", TransferissueJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getTransferissueJobById")
+    @Operation(summary = "APP获得调拨出库主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')")
+    public CommonResult<TransferissueJobMainRespVO> getTransferissueJobById(@RequestParam("id") Long id) {
+        TransferissueJobMainDO transferissueJobMain = transferissueJobMainService.getTransferissueJobMain(id);
+        TransferissueJobMainRespVO result = TransferissueJobMainConvert.INSTANCE.convert(transferissueJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        TransferissueJobDetailExportReqVO exportReqVO = new TransferissueJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<TransferissueJobDetailDO> transferissueJobDetailList = transferissueJobDetailService.getTransferissueJobDetailList(exportReqVO);
+        List<TransferissueJobDetailExcelVO> transferissueJobDetailExcelVOS = TransferissueJobDetailConvert.INSTANCE.convertList02(transferissueJobDetailList);
+        result.setSubList(transferissueJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java

@@ -73,4 +73,8 @@ public class TransferissueJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.transferissueJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 调拨出库任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class TransferissueJobMainRespVO extends TransferissueJobMainBaseVO {
 
+    @Schema(description = "调拨出库任务子表job_transferissue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java

@@ -4,6 +4,9 @@ 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.transferreceiptJob.vo.*;
+import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
+import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +37,9 @@ public class TransferreceiptJobMainController {
     @Resource
     private TransferreceiptJobMainService transferreceiptJobMainService;
 
+    @Resource
+    private TransferreceiptJobDetailService transferreceiptJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -118,4 +124,22 @@ public class TransferreceiptJobMainController {
         ExcelUtils.write(response, "调拨入库任务主.xls", "数据", TransferreceiptJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getTransferreceiptJobById")
+    @Operation(summary = "APP获得调拨入库主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:query')")
+    public CommonResult<TransferreceiptJobMainRespVO> getTransferreceiptJobById(@RequestParam("id") Long id) {
+        TransferreceiptJobMainDO transferreceiptJobMain = transferreceiptJobMainService.getTransferreceiptJobMain(id);
+        TransferreceiptJobMainRespVO result = TransferreceiptJobMainConvert.INSTANCE.convert(transferreceiptJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        TransferreceiptJobDetailExportReqVO exportReqVO = new TransferreceiptJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<TransferreceiptJobDetailDO> transferreceiptJobDetailList = transferreceiptJobDetailService.getTransferreceiptJobDetailList(exportReqVO);
+        List<TransferreceiptJobDetailExcelVO> transferreceiptJobDetailExcelVOS = TransferreceiptJobDetailConvert.INSTANCE.convertList02(transferreceiptJobDetailList);
+        result.setSubList(transferreceiptJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java

@@ -46,7 +46,7 @@ public class TransferreceiptJobDetailExportReqVO {
     private String itemDesc2;
 
     @Schema(description = "项目代码")
-    private String projectCode;
+    private Long projectCode;
 
     @Schema(description = "数量")
     private BigDecimal qty;
@@ -73,4 +73,7 @@ public class TransferreceiptJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.transferreceiptJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 调拨入库任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class TransferreceiptJobMainRespVO extends TransferreceiptJobMainBaseVO {
 
+    @Schema(description = "调拨入库任务子表job_transferreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java

@@ -4,6 +4,9 @@ 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.unplannedissueJob.vo.*;
+import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO;
+import com.win.module.wms.service.unplannedissueJob.UnplannedissueJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +43,9 @@ public class UnplannedissueJobMainController {
     @Resource
     private UnplannedissueJobMainService unplannedissueJobMainService;
 
+    @Resource
+    private UnplannedissueJobDetailService unplannedissueJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,22 @@ public class UnplannedissueJobMainController {
         ExcelUtils.write(response, "计划外出库任务主.xls", "数据", UnplannedissueJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getUnplannedissueJobById")
+    @Operation(summary = "APP获得计划外出库任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedissue-job-main:query')")
+    public CommonResult<UnplannedissueJobMainRespVO> getUnplannedissueJobById(@RequestParam("id") Long id) {
+        UnplannedissueJobMainDO unplannedissueJobMain = unplannedissueJobMainService.getUnplannedissueJobMain(id);
+        UnplannedissueJobMainRespVO result = UnplannedissueJobMainConvert.INSTANCE.convert(unplannedissueJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        UnplannedissueJobDetailExportReqVO reqVO = new UnplannedissueJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<UnplannedissueJobDetailDO> list = unplannedissueJobDetailService.getUnplannedissueJobDetailList(reqVO);
+        List<UnplannedissueJobDetailExcelVO> vos = UnplannedissueJobDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java

@@ -70,4 +70,7 @@ public class UnplannedissueJobDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.unplannedissueJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 计划外出库任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class UnplannedissueJobMainRespVO extends UnplannedissueJobMainBaseVO {
 
+    @Schema(description = "计划外出库任务子表job_unplannedissue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java

@@ -3,6 +3,9 @@ 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.unplannedreceiptJob.vo.*;
+import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO;
+import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +36,9 @@ public class UnplannedreceiptJobMainController {
     @Resource
     private UnplannedreceiptJobMainService unplannedreceiptJobMainService;
 
+    @Resource
+    private UnplannedreceiptJobDetailService unplannedreceiptJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -115,4 +121,22 @@ public class UnplannedreceiptJobMainController {
         ExcelUtils.write(response, "计划外入库任务主.xls", "数据", UnplannedreceiptJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getUnplannedreceiptJobById")
+    @Operation(summary = "APP获得计划外入库任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')")
+    public CommonResult<UnplannedreceiptJobMainRespVO> getUnplannedreceiptJobById(@RequestParam("id") Long id) {
+        UnplannedreceiptJobMainDO unplannedreceiptJobMain = unplannedreceiptJobMainService.getUnplannedreceiptJobMain(id);
+        UnplannedreceiptJobMainRespVO result = UnplannedreceiptJobMainConvert.INSTANCE.convert(unplannedreceiptJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        UnplannedreceiptJobDetailExportReqVO exportReqVO = new UnplannedreceiptJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<UnplannedreceiptJobDetailDO> unplannedreceiptJobDetailList = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailList(exportReqVO);
+        List<UnplannedreceiptJobDetailExcelVO> vos = UnplannedreceiptJobDetailConvert.INSTANCE.convertList02(unplannedreceiptJobDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java

@@ -85,4 +85,7 @@ public class UnplannedreceiptJobDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.unplannedreceiptJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 计划外入库任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class UnplannedreceiptJobMainRespVO extends UnplannedreceiptJobMainBaseVO {
 
+    @Schema(description = "计划外入库任务主子表job_unplannedreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRequest/PurchasereceiptRequestMainConvert.java

@@ -1,16 +1,13 @@
 package com.win.module.wms.convert.purchasereceiptRequest;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-
+import com.win.module.wms.controller.purchasereceiptRequest.vo.*;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainRespVO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainUpdateReqVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
+
+import java.util.List;
 
 /**
  * 采购收货申请主 Convert
@@ -34,4 +31,6 @@ public interface PurchasereceiptRequestMainConvert {
 
     List<PurchasereceiptRequestMainExcelVO> convertList02(List<PurchasereceiptRequestMainDO> list);
 
+    PurchasereceiptRequestMainImportErrorVO convert(PurchasereceiptRequestMainCreateReqVO mainVo, PurchasereceiptRequestDetailDO detailDo);
+
 }

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

@@ -109,7 +109,7 @@ public class CustomerreturnJobDetailDO extends BaseDO {
     /**
      * 创建时间
      */
-    private LocalDateTime createtime;
+   //private LocalDateTime createtime;
     /**
      * 地点ID
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java

@@ -71,7 +71,7 @@ public class InventorymoveJobDetailDO extends BaseDO {
     /**
      * 创建时间
      */
-    private LocalDateTime createtime;
+    private LocalDateTime createTime;
     /**
      * 创建者用户名
      */

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

@@ -46,6 +46,7 @@ public interface CountJobDetailMapper extends BaseMapperX<CountJobDetailDO> {
     }
     default List<CountJobDetailDO> selectList(CountJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CountJobDetailDO>()
+                .eqIfPresent(CountJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CountJobDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())
                 .eqIfPresent(CountJobDetailDO::getOwnerCode, reqVO.getOwnerCode())
                 .eqIfPresent(CountJobDetailDO::getPackingNumber, reqVO.getPackingNumber())

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

@@ -40,7 +40,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX<Customerretur
                 .eqIfPresent(CustomerreturnJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(CustomerreturnJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CustomerreturnJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(CustomerreturnJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(CustomerreturnJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CustomerreturnJobDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(CustomerreturnJobDetailDO::getId));
     }
@@ -49,6 +49,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX<Customerretur
     }
     default List<CustomerreturnJobDetailDO> selectList(CustomerreturnJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CustomerreturnJobDetailDO>()
+                .eqIfPresent(CustomerreturnJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomerreturnJobDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomerreturnJobDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomerreturnJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
@@ -67,7 +68,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX<Customerretur
                 .eqIfPresent(CustomerreturnJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(CustomerreturnJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CustomerreturnJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(CustomerreturnJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(CustomerreturnJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CustomerreturnJobDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(CustomerreturnJobDetailDO::getId));
     }

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

@@ -49,6 +49,7 @@ public interface DeliverJobDetailMapper extends BaseMapperX<DeliverJobDetailDO>
     }
     default List<DeliverJobDetailDO> selectList(DeliverJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeliverJobDetailDO>()
+                .eqIfPresent(DeliverJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(DeliverJobDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(DeliverJobDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(DeliverJobDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java

@@ -44,6 +44,7 @@ public interface InspectJobDetailMapper extends BaseMapperX<InspectJobDetailDO>
     }
     default List<InspectJobDetailDO> selectList(InspectJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectJobDetailDO>()
+                .eqIfPresent(InspectJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InspectJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InspectJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(InspectJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java

@@ -31,7 +31,7 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX<InventorymoveJ
                 .eqIfPresent(InventorymoveJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(InventorymoveJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(InventorymoveJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(InventorymoveJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(InventorymoveJobDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(InventorymoveJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
@@ -50,6 +50,7 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX<InventorymoveJ
     }
     default List<InventorymoveJobDetailDO> selectList(InventorymoveJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveJobDetailDO>()
+                .eqIfPresent(InventorymoveJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InventorymoveJobDetailDO::getItemCode, reqVO.getItemCode())
                 .likeIfPresent(InventorymoveJobDetailDO::getItemName, reqVO.getItemName())
                 .eqIfPresent(InventorymoveJobDetailDO::getItemDesc1, reqVO.getItemDesc1())
@@ -59,7 +60,7 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX<InventorymoveJ
                 .eqIfPresent(InventorymoveJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(InventorymoveJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(InventorymoveJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(InventorymoveJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(InventorymoveJobDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(InventorymoveJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java

@@ -56,6 +56,7 @@ public interface IssueJobDetailMapper extends BaseMapperX<IssueJobDetailDO> {
     }
     default List<IssueJobDetailDO> selectList(IssueJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueJobDetailDO>()
+                .eqIfPresent(IssueJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(IssueJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(IssueJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(IssueJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java

@@ -50,6 +50,7 @@ public interface PickJobDetailMapper extends BaseMapperX<PickJobDetailDO> {
 
     default List<PickJobDetailDO> selectList(PickJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickJobDetailDO>()
+                .eqIfPresent(PickJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PickJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PickJobDetailDO::getBatch, reqVO.getBatch())
                 .eqIfPresent(PickJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java

@@ -56,6 +56,7 @@ public interface ProductdismantleJobDetailMapper extends BaseMapperX<Productdism
 
     default List<ProductdismantleJobDetailDO> selectList(ProductdismantleJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleJobDetailDO>()
+                .eqIfPresent(ProductdismantleJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductdismantleJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductdismantleJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductdismantleJobDetailDO::getProcessCode, reqVO.getProcessCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java

@@ -53,6 +53,7 @@ public interface ProductionreceiptJobDetailMapper extends BaseMapperX<Production
 
     default List<ProductionreceiptJobDetailDO> selectList(ProductionreceiptJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreceiptJobDetailDO>()
+                .eqIfPresent(ProductionreceiptJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductionreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionreceiptJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductionreceiptJobDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())

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

@@ -52,6 +52,7 @@ public interface ProductionreturnJobDetailMapper extends BaseMapperX<Productionr
 
     default List<ProductionreturnJobDetailDO> selectList(ProductionreturnJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnJobDetailDO>()
+                .eqIfPresent(ProductionreturnJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductionreturnJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionreturnJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductionreturnJobDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java

@@ -57,6 +57,7 @@ public interface ProductreceiptJobDetailMapper extends BaseMapperX<Productreceip
 
     default List<ProductreceiptJobDetailDO> selectList(ProductreceiptJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptJobDetailDO>()
+                .eqIfPresent(ProductreceiptJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductreceiptJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductreceiptJobDetailDO::getProcessCode, reqVO.getProcessCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java

@@ -54,6 +54,7 @@ public interface PurchasereturnJobDetailMapper extends BaseMapperX<Purchaseretur
 
     default List<PurchasereturnJobDetailDO> selectList(PurchasereturnJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PurchasereturnJobDetailDO>()
+                .eqIfPresent(PurchasereturnJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(PurchasereturnJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereturnJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java

@@ -50,6 +50,7 @@ public interface PutawayJobDetailMapper extends BaseMapperX<PutawayJobDetailDO>
     }
     default List<PutawayJobDetailDO> selectList(PutawayJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PutawayJobDetailDO>()
+                .eqIfPresent(PutawayJobDetailDO::getMasterId, reqVO.getMasterid())
                 .eqIfPresent(PutawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PutawayJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PutawayJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java

@@ -48,6 +48,7 @@ public interface RepleinshJobDetailMapper extends BaseMapperX<RepleinshJobDetail
     }
     default List<RepleinshJobDetailDO> selectList(RepleinshJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<RepleinshJobDetailDO>()
+                .eqIfPresent(RepleinshJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(RepleinshJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(RepleinshJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(RepleinshJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java

@@ -47,6 +47,7 @@ public interface ScrapJobDetailMapper extends BaseMapperX<ScrapJobDetailDO> {
     }
     default List<ScrapJobDetailDO> selectList(ScrapJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ScrapJobDetailDO>()
+                .eqIfPresent(ScrapJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ScrapJobDetailDO::getOwnerCode, reqVO.getOwnerCode())
                 .eqIfPresent(ScrapJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(ScrapJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java

@@ -48,6 +48,7 @@ public interface TransferissueJobDetailMapper extends BaseMapperX<TransferissueJ
     }
     default List<TransferissueJobDetailDO> selectList(TransferissueJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<TransferissueJobDetailDO>()
+                .eqIfPresent(TransferissueJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(TransferissueJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(TransferissueJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(TransferissueJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java

@@ -50,6 +50,7 @@ public interface TransferreceiptJobDetailMapper extends BaseMapperX<Transferrece
 
     default List<TransferreceiptJobDetailDO> selectList(TransferreceiptJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<TransferreceiptJobDetailDO>()
+                .eqIfPresent(TransferreceiptJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(TransferreceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(TransferreceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(TransferreceiptJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java

@@ -49,6 +49,7 @@ public interface UnplannedissueJobDetailMapper extends BaseMapperX<Unplannedissu
 
     default List<UnplannedissueJobDetailDO> selectList(UnplannedissueJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<UnplannedissueJobDetailDO>()
+                .eqIfPresent(UnplannedissueJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(UnplannedissueJobDetailDO::getOwnerCode, reqVO.getOwnerCode())
                 .eqIfPresent(UnplannedissueJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(UnplannedissueJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java

@@ -54,6 +54,7 @@ public interface UnplannedreceiptJobDetailMapper extends BaseMapperX<Unplannedre
 
     default List<UnplannedreceiptJobDetailDO> selectList(UnplannedreceiptJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<UnplannedreceiptJobDetailDO>()
+                .eqIfPresent(UnplannedreceiptJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(UnplannedreceiptJobDetailDO::getOwnerCode, reqVO.getOwnerCode())
                 .eqIfPresent(UnplannedreceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(UnplannedreceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java

@@ -263,6 +263,11 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
                 } catch (Exception ex) {
                     messageDetail += ex.getMessage() + ",";
                 }
+                try {
+                    ValidationUtils.validate(validator, createReqVO);
+                } catch (Exception ex) {
+                    messageMain += ex.getMessage() + ",";
+                }
                 IssueRequestDetailCreateReqVO purchaseturnRequestDetailCreateReqVO = IssueRequestDetailConvert.INSTANCE.convert1(detailDO);
                 IssueRequestImportErrorVO importVO = IssueRequestDetailConvert.INSTANCE.convert(createReqVO, purchaseturnRequestDetailCreateReqVO);
                 if (!messageMain.equals("") || !messageDetail.equals("")) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java

@@ -8,7 +8,6 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.datapermission.core.util.DataPermissionUtils;
 import com.win.module.infra.api.trends.TrendsApi;
-import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.convert.itembasic.ItembasicConvert;
@@ -46,7 +45,7 @@ public class ItembasicServiceImpl implements ItembasicService {
         // 插入
         ItembasicDO itembasic = ItembasicConvert.INSTANCE.convert(createReqVO);
         itembasicMapper.insert(itembasic);
-        trendsApi.createTrends(this.newTrendsCreateReqDTO(itembasic.getId(), "增加了物品基本信息", TrendsTypeEnum.CREATE));
+        trendsApi.createTrends(itembasic.getId(), "basicItembasic", "增加了物品基本信息", TrendsTypeEnum.CREATE);
         // 返回
         return itembasic.getId();
     }
@@ -59,7 +58,7 @@ public class ItembasicServiceImpl implements ItembasicService {
                 ,updateReqVO.getValidityDays(),updateReqVO.getAvailable());
         // 更新
         ItembasicDO itembasic = this.getItembasic(updateReqVO.getId());
-        trendsApi.createTrends(this.newTrendsCreateReqDTO(updateReqVO.getId(), itembasic.toString(), TrendsTypeEnum.UPDATE));
+        trendsApi.createTrends(updateReqVO.getId(), "basicItembasic", itembasic.toString(), TrendsTypeEnum.UPDATE);
         ItembasicDO updateObj = ItembasicConvert.INSTANCE.convert(updateReqVO);
         itembasicMapper.updateById(updateObj);
     }
@@ -68,7 +67,7 @@ public class ItembasicServiceImpl implements ItembasicService {
     public void updateItembasicStatus(ItembasicUpdateReqVO updateReqVO) {
         // 校验存在
         ItembasicDO updateObj = validateItembasicExists(updateReqVO.getId());
-        trendsApi.createTrends(this.newTrendsCreateReqDTO(updateObj.getId(), "状态由" + updateObj.getStatus() + "改为" + updateReqVO.getStatus(), TrendsTypeEnum.UPDATE_STATUS));
+        trendsApi.createTrends(updateObj.getId(), "basicItembasic", "状态由" + updateObj.getStatus() + "改为" + updateReqVO.getStatus(), TrendsTypeEnum.UPDATE_STATUS);
         // 更新
         updateObj.setId(updateReqVO.getId());
         updateObj.setStatus(updateReqVO.getStatus());
@@ -81,7 +80,7 @@ public class ItembasicServiceImpl implements ItembasicService {
         ItembasicDO itembasic = validateItembasicExists(id);
         // 删除
         itembasicMapper.deleteById(id);
-        trendsApi.createTrends(this.newTrendsCreateReqDTO(id, itembasic.toString(), TrendsTypeEnum.DELETE));
+        trendsApi.createTrends(id, "basicItembasic", itembasic.toString(), TrendsTypeEnum.DELETE);
     }
 
     @Override
@@ -354,20 +353,4 @@ public class ItembasicServiceImpl implements ItembasicService {
         }
     }
 
-    /**
-     * 构建操作流水对象
-     * @param id
-     * @param content
-     * @param trendsTypeEnum
-     * @return
-     */
-    private TrendsCreateReqDTO newTrendsCreateReqDTO(Long id, String content, TrendsTypeEnum trendsTypeEnum) {
-        TrendsCreateReqDTO trendsCreateReqDTO = new TrendsCreateReqDTO();
-        trendsCreateReqDTO.setTableName("basicItembasic");
-        trendsCreateReqDTO.setTableId(id);
-        trendsCreateReqDTO.setType(trendsTypeEnum.getType());
-        trendsCreateReqDTO.setContent(content);
-        return trendsCreateReqDTO;
-    }
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java

@@ -37,14 +37,14 @@ public interface PurchasereceiptRequestMainService {
      *
      * @param updateReqVO 更新信息
      */
-    void updatePurchasereceiptRequestMain(@Valid PurchasereceiptRequestMainUpdateReqVO updateReqVO);
+    Integer updatePurchasereceiptRequestMain(@Valid PurchasereceiptRequestMainUpdateReqVO updateReqVO);
 
     /**
      * 删除采购收货申请主
      *
      * @param id 编号
      */
-    void deletePurchasereceiptRequestMain(Long id);
+    Integer deletePurchasereceiptRequestMain(Long id);
 
     /**
      * 获得采购收货申请主

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -1,10 +1,18 @@
 package com.win.module.wms.service.purchasereceiptRequest;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+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.common.util.validation.ValidationUtils;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
+import com.win.module.system.api.serialnumber.SerialNumberApi;
+import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.purchasereceiptRequest.vo.*;
+import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert;
 import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert;
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
@@ -12,17 +20,19 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptR
 import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestDetailMapper;
 import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestMainMapper;
 import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.rule.RuleService;
+import com.win.module.wms.service.supplier.SupplierService;
+import com.win.module.wms.service.supplieritem.SupplieritemService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import javax.validation.Validator;
-import java.util.Collection;
+import java.util.*;
-import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_REQUEST_IMPORT_LIST_IS_EMPTY;
+import static com.win.module.wms.enums.ErrorCodeConstants.*;
-import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_REQUEST_MAIN_NOT_EXISTS;
 
 /**
  * 采购收货申请主 Service 实现类
@@ -35,37 +45,66 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
 
     @Resource
     private PurchasereceiptRequestMainMapper purchasereceiptRequestMainMapper;
-
     @Resource
     private PurchasereceiptRequestDetailMapper purchasereceiptRequestDetailMapper;
+    @Resource
+    private ItembasicService itembasicService;
+    @Resource
+    private SupplierService supplierService;
+    @Resource
+    private SupplieritemService supplieritemService;
+    @Resource
+    private RuleService ruleService;
+    @Resource
+    private SerialNumberApi serialNumberApi;
+    @Resource
+    private Validator validator;
 
     @Override
     public Long createPurchasereceiptRequestMain(PurchasereceiptRequestMainCreateReqVO createReqVO) {
         // 插入
-        PurchasereceiptRequestMainDO purchasereceiptRequestMain = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO);
+        PurchasereceiptRequestMainDO mainDo = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO);
-        purchasereceiptRequestMainMapper.insert(purchasereceiptRequestMain);
+        this.validatePurchasereceiptRequestMainCreate(mainDo);
+        List<PurchasereceiptRequestDetailDO> subDOList = PurchasereceiptRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
+        for (PurchasereceiptRequestDetailDO detailDO : subDOList) {
+            this.validatePurchasereceiptRequestDetailCreate(detailDO);
+        }
+        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode());
+        mainDo.setNumber(number);
+        mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
+        purchasereceiptRequestMainMapper.insert(mainDo);
+        for (PurchasereceiptRequestDetailDO detailDO : subDOList) {
+            detailDO.setMasterId(mainDo.getId());
+            detailDO.setNumber(number);
+        }
+        purchasereceiptRequestDetailMapper.insertBatch(subDOList);
         // 返回
-        return purchasereceiptRequestMain.getId();
+        return mainDo.getId();
     }
 
     @Override
-    public void updatePurchasereceiptRequestMain(PurchasereceiptRequestMainUpdateReqVO updateReqVO) {
+    public Integer updatePurchasereceiptRequestMain(PurchasereceiptRequestMainUpdateReqVO updateReqVO) {
         // 校验存在
         validatePurchasereceiptRequestMainExists(updateReqVO.getId());
         // 更新
         PurchasereceiptRequestMainDO updateObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(updateReqVO);
-        purchasereceiptRequestMainMapper.updateById(updateObj);
+        return purchasereceiptRequestMainMapper.updateById(updateObj);
     }
     @Override
     public PageResult<PurchasereceiptRequestMainDO> getPurchasereceiptRequestMainSenior(CustomConditions conditions) {
         return purchasereceiptRequestMainMapper.selectSenior(conditions);
     }
     @Override
-    public void deletePurchasereceiptRequestMain(Long id) {
+    public Integer deletePurchasereceiptRequestMain(Long id) {
         // 校验存在
         validatePurchasereceiptRequestMainExists(id);
-        // 删除
+        // 删除子表数据
-        purchasereceiptRequestMainMapper.deleteById(id);
+        Map<String, Object> map = new HashMap<>();
+        map.put("master_id", id);
+        //删除子表
+        purchasereceiptRequestDetailMapper.deleteByMap(map);
+        // 删除主表
+        return purchasereceiptRequestMainMapper.deleteById(id);
     }
 
     private void validatePurchasereceiptRequestMainExists(Long id) {
@@ -101,30 +140,126 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
         }
         List<PurchasereceiptRequestMainImportErrorVO> errorList = new ArrayList<>();
         datas.forEach(createReqVO -> {
-            // 校验，判断是否有不符合的原因，并加入errorList,如果主表则所有子表都加入errorList
+            PurchasereceiptRequestMainDO mainDo = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO);
-            boolean isError = false;
+            String messageMain = this.validatePurchasereceiptRequestMainImport(mainDo);
-//            try {
-//                if(mode != null){
-//                    validatePurchaseclaimRequestMainExists(null);
-//                }
-//            } catch (ServiceException ex) {
-//                isError = true;
-//                importRemark += ex.getMessage() + ",";
-//            }
-
-            createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
-            PurchasereceiptRequestMainDO createObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO);
-            purchasereceiptRequestMainMapper.insert(createObj);
             List<PurchasereceiptRequestDetailCreateReqVO> subList = createReqVO.getSubList();
             List<PurchasereceiptRequestDetailDO> subDOList = PurchasereceiptRequestDetailConvert.INSTANCE.convertList03(subList);
-            // 新增子表数据
+            // 是否有错误数据
+            boolean flag = true;
             for (PurchasereceiptRequestDetailDO detailDO : subDOList) {
-                // 校验，判断是否有不符合的原因，并加入errorList,同主表,只把有错误的子表加入errorList
+                String messageDetail = this.validatePurchasereceiptRequestDetailImport(detailDO);
-                detailDO.setNumber(createReqVO.getNumber());
+                if(!messageMain.isEmpty() || messageDetail.isEmpty()) {
+                    PurchasereceiptRequestMainImportErrorVO importErrorVO = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO, detailDO);
+                    importErrorVO.setImportStatus("失败");
+                    messageMain = messageMain + messageDetail;
+                    importErrorVO.setImportRemark(messageMain.substring(0, messageMain.length() - 1));
+                    errorList.add(importErrorVO);
+                    flag = false;
+                }
+            }
+            //写入数据
+            if(flag) {
+                String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode());
+                mainDo.setNumber(number);
+                mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
+                purchasereceiptRequestMainMapper.insert(mainDo);
+                for (PurchasereceiptRequestDetailDO detailDO : subDOList) {
+                    detailDO.setMasterId(mainDo.getId());
+                    detailDO.setNumber(number);
+                }
+                purchasereceiptRequestDetailMapper.insertBatch(subDOList);
             }
-            purchasereceiptRequestDetailMapper.insertBatch(subDOList);
         });
         return errorList;
     }
 
+    /**
+     * 校验导入，并赋值一些参数，未完全实现
+     * @param mainDo
+     * @return
+     */
+    private void validatePurchasereceiptRequestMainCreate(PurchasereceiptRequestMainDO mainDo) {
+        supplierService.selectSupplier(mainDo.getSupplierCode());
+        RuleRespVO ruleRespVO = ruleService.deliverGoods(null, mainDo.getSupplierCode(), null);
+        if(ruleRespVO == null) {
+            throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
+        } else {
+            JSONArray conditionArray = JSONUtil.parseArray(ruleRespVO.getConfiguration());
+            for (int i = 0; i < conditionArray.size(); i++) {
+                JSONObject conditionObject = conditionArray.getJSONObject(i);
+                if ("WarehouseCode".equals(conditionObject.get("ParamCode"))) {
+                    mainDo.setFromWarehouseCode(String.valueOf(conditionObject.get("Value")));
+                }
+                if ("DockCode".equals(conditionObject.get("ParamCode"))) {
+                    mainDo.setToDockCode(String.valueOf(conditionObject.get("Value")));
+                }
+                if ("OnTheWayLocationCode".equals(conditionObject.get("ParamCode"))) {
+                    mainDo.setToWarehouseCode(String.valueOf(conditionObject.get("Value")));
+                }
+            }
+        }
+    }
+
+    /**
+     * 校验导入，并赋值一些参数，未完全实现
+     * @param mainDo
+     * @return
+     */
+    private String validatePurchasereceiptRequestMainImport(PurchasereceiptRequestMainDO mainDo) {
+        StringBuilder message = new StringBuilder();
+        try {
+            ValidationUtils.validate(validator, mainDo);
+        } catch (Exception ex) {
+            message.append(ex.getMessage()).append(",");
+        }
+        try {
+            supplierService.selectSupplier(mainDo.getSupplierCode());
+        } catch (Exception ex) {
+            message.append(ex.getMessage()).append(",");
+        }
+        RuleRespVO ruleRespVO = ruleService.deliverGoods(null, mainDo.getSupplierCode(), null);
+        if(ruleRespVO == null) {
+            message.append(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS.getMsg());
+        } else {
+            JSONArray conditionArray = JSONUtil.parseArray(ruleRespVO.getConfiguration());
+            for (int i = 0; i < conditionArray.size(); i++) {
+                JSONObject conditionObject = conditionArray.getJSONObject(i);
+                if ("WarehouseCode".equals(conditionObject.get("ParamCode"))) {
+                    mainDo.setFromWarehouseCode(String.valueOf(conditionObject.get("Value")));
+                }
+                if ("DockCode".equals(conditionObject.get("ParamCode"))) {
+                    mainDo.setToDockCode(String.valueOf(conditionObject.get("Value")));
+                }
+                if ("OnTheWayLocationCode".equals(conditionObject.get("ParamCode"))) {
+                    mainDo.setToWarehouseCode(String.valueOf(conditionObject.get("Value")));
+                }
+            }
+        }
+        return message.toString();
+    }
+
+    /**
+     * 校验导入，并赋值一些参数，未完全实现
+     * @param detailDo
+     * @return
+     */
+    private void validatePurchasereceiptRequestDetailCreate(PurchasereceiptRequestDetailDO detailDo) {
+
+    }
+
+    /**
+     * 校验导入，并赋值一些参数，未完全实现
+     * @param detailDo
+     * @return
+     */
+    private String validatePurchasereceiptRequestDetailImport(PurchasereceiptRequestDetailDO detailDo) {
+        StringBuilder message = new StringBuilder();
+        try {
+            ValidationUtils.validate(validator, detailDo);
+        } catch (Exception ex) {
+            message.append(ex.getMessage()).append(",");
+        }
+        return message.toString();
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -130,9 +130,15 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierType", supplierType);
+            if(supplierType != null && !supplierType.isEmpty()) {
-            params.put("SupplierCode", supplierCode);
+                params.put("SupplierType", supplierType);
-            params.put("Weekday", weekday);
+            }
+            if(supplierCode != null && !supplierCode.isEmpty()) {
+                params.put("SupplierCode", supplierCode);
+            }
+            if(weekday != null && !weekday.isEmpty()) {
+                params.put("Weekday", weekday);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -154,8 +160,12 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierType", supplierType);
+            if(supplierType != null && !supplierType.isEmpty()) {
-            params.put("SupplierCode", supplierCode);
+                params.put("SupplierType", supplierType);
+            }
+            if(supplierCode != null && !supplierCode.isEmpty()) {
+                params.put("SupplierCode", supplierCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -177,7 +187,9 @@ public class RuleServiceImpl implements RuleService {
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
             params.put("SupplierCode", supplierCode);
-            params.put("ItemCode", itemCode);
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -198,8 +210,12 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierType", supplierType);
+            if(supplierType != null && !supplierType.isEmpty()) {
-            params.put("ItemCode", itemCode);
+                params.put("SupplierType", supplierType);
+            }
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -220,19 +236,45 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierType", supplierCode);
+            if(supplierCode != null && !supplierCode.isEmpty()) {
-            params.put("CustomerCode", customerCode);
+                params.put("SupplierType", supplierCode);
-            params.put("AbcClass", abcClass);
+            }
-            params.put("ItemType", itemType);
+            if(customerCode != null && !customerCode.isEmpty()) {
-            params.put("ItemGroup", itemGroup);
+                params.put("CustomerCode", customerCode);
-            params.put("Project", project);
+            }
-            params.put("ItemCode", itemCode);
+            if(abcClass != null && !abcClass.isEmpty()) {
-            params.put("InventoryStatus", inventoryStatus);
+                params.put("AbcClass", abcClass);
-            params.put("StorageType", storageType);
+            }
-            params.put("TransactionType", transactionType);
+            if(itemType != null && !itemType.isEmpty()) {
-            params.put("Weight", weight);
+                params.put("ItemType", itemType);
-            params.put("Area", area);
+            }
-            params.put("Volume", volume);
+            if(itemGroup != null && !itemGroup.isEmpty()) {
+                params.put("ItemGroup", itemGroup);
+            }
+            if(project != null && !project.isEmpty()) {
+                params.put("Project", project);
+            }
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
+            if(inventoryStatus != null && !inventoryStatus.isEmpty()) {
+                params.put("InventoryStatus", inventoryStatus);
+            }
+            if(storageType != null && !storageType.isEmpty()) {
+                params.put("StorageType", storageType);
+            }
+            if(transactionType != null && !transactionType.isEmpty()) {
+                params.put("TransactionType", transactionType);
+            }
+            if(weight != null && !weight.isEmpty()) {
+                params.put("Weight", weight);
+            }
+            if(area != null && !area.isEmpty()) {
+                params.put("Area", area);
+            }
+            if(volume != null && !volume.isEmpty()) {
+                params.put("Volume", volume);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -253,13 +295,27 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("ItemGroup", itemGroup);
+            if(itemGroup != null && !itemGroup.isEmpty()) {
-            params.put("Project", project);
+                params.put("ItemGroup", itemGroup);
-            params.put("ItemCode", itemCode);
+            }
-            params.put("WarehouseCode", warehouseCode);
+            if(project != null && !project.isEmpty()) {
-            params.put("AreaCode", areaCode);
+                params.put("Project", project);
-            params.put("LocationGroupCode", locationGroupCode);
+            }
-            params.put("LocationCode", locationCode);
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
+            if(warehouseCode != null && !warehouseCode.isEmpty()) {
+                params.put("WarehouseCode", warehouseCode);
+            }
+            if(areaCode != null && !areaCode.isEmpty()) {
+                params.put("AreaCode", areaCode);
+            }
+            if(locationGroupCode != null && !locationGroupCode.isEmpty()) {
+                params.put("LocationGroupCode", locationGroupCode);
+            }
+            if(locationCode != null && !locationCode.isEmpty()) {
+                params.put("LocationCode", locationCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -280,16 +336,36 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierCode", supplierCode);
+            if(supplierCode != null && !supplierCode.isEmpty()) {
-            params.put("CustomerCode", customerCode);
+                params.put("SupplierCode", supplierCode);
-            params.put("AbcClass", abcClass);
+            }
-            params.put("ItemType", itemType);
+            if(customerCode != null && !customerCode.isEmpty()) {
-            params.put("ItemGroup", itemGroup);
+                params.put("CustomerCode", customerCode);
-            params.put("Project", project);
+            }
-            params.put("ItemCode", itemCode);
+            if(abcClass != null && !abcClass.isEmpty()) {
-            params.put("InventoryStatus", inventoryStatus);
+                params.put("AbcClass", abcClass);
-            params.put("StorageType", storageType);
+            }
-            params.put("TransactionType", transactionType);
+            if(itemType != null && !itemType.isEmpty()) {
+                params.put("ItemType", itemType);
+            }
+            if(itemGroup != null && !itemGroup.isEmpty()) {
+                params.put("ItemGroup", itemGroup);
+            }
+            if(project != null && !project.isEmpty()) {
+                params.put("Project", project);
+            }
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
+            if(inventoryStatus != null && !inventoryStatus.isEmpty()) {
+                params.put("InventoryStatus", inventoryStatus);
+            }
+            if(storageType != null && !storageType.isEmpty()) {
+                params.put("StorageType", storageType);
+            }
+            if(transactionType != null && !transactionType.isEmpty()) {
+                params.put("TransactionType", transactionType);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -310,12 +386,24 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("Project", project);
+            if(project != null && !project.isEmpty()) {
-            params.put("ItemCode", itemCode);
+                params.put("Project", project);
-            params.put("WarehouseCode", warehouseCode);
+            }
-            params.put("AreaCode", areaCode);
+            if(itemCode != null && !itemCode.isEmpty()) {
-            params.put("LocationGroupCode", locationGroupCode);
+                params.put("ItemCode", itemCode);
-            params.put("LocationCode", locationCode);
+            }
+            if(warehouseCode != null && !warehouseCode.isEmpty()) {
+                params.put("WarehouseCode", warehouseCode);
+            }
+            if(areaCode != null && !areaCode.isEmpty()) {
+                params.put("AreaCode", areaCode);
+            }
+            if(locationGroupCode != null && !locationGroupCode.isEmpty()) {
+                params.put("LocationGroupCode", locationGroupCode);
+            }
+            if(locationCode != null && !locationCode.isEmpty()) {
+                params.put("LocationCode", locationCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -336,19 +424,45 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierCode", supplierCode);
+            if(supplierCode != null && !supplierCode.isEmpty()) {
-            params.put("CustomerCode", customerCode);
+                params.put("SupplierCode", supplierCode);
-            params.put("AbcClass", abcClass);
+            }
-            params.put("ItemType", itemType);
+            if(customerCode != null && !customerCode.isEmpty()) {
-            params.put("ItemGroup", itemGroup);
+                params.put("CustomerCode", customerCode);
-            params.put("Project", project);
+            }
-            params.put("ItemCode", itemCode);
+            if(abcClass != null && !abcClass.isEmpty()) {
-            params.put("WarehouseCode", warehouseCode);
+                params.put("AbcClass", abcClass);
-            params.put("AreaCode", areaCode);
+            }
-            params.put("LocationGroupCode", locationGroupCode);
+            if(itemType != null && !itemType.isEmpty()) {
-            params.put("LocationCode", locationCode);
+                params.put("ItemType", itemType);
-            params.put("IgnoreListOfItem", ignoreListOfItem);
+            }
-            params.put("IgnoreListOfLocation", ignoreListOfLocation);
+            if(itemGroup != null && !itemGroup.isEmpty()) {
+                params.put("ItemGroup", itemGroup);
+            }
+            if(project != null && !project.isEmpty()) {
+                params.put("Project", project);
+            }
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
+            if(warehouseCode != null && !warehouseCode.isEmpty()) {
+                params.put("WarehouseCode", warehouseCode);
+            }
+            if(areaCode != null && !areaCode.isEmpty()) {
+                params.put("AreaCode", areaCode);
+            }
+            if(locationGroupCode != null && !locationGroupCode.isEmpty()) {
+                params.put("LocationGroupCode", locationGroupCode);
+            }
+            if(locationCode != null && !locationCode.isEmpty()) {
+                params.put("LocationCode", locationCode);
+            }
+            if(ignoreListOfItem != null && !ignoreListOfItem.isEmpty()) {
+                params.put("IgnoreListOfItem", ignoreListOfItem);
+            }
+            if(ignoreListOfLocation != null && !ignoreListOfLocation.isEmpty()) {
+                params.put("IgnoreListOfLocation", ignoreListOfLocation);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -369,13 +483,27 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierCode", supplierCode);
+            if(supplierCode != null && !supplierCode.isEmpty()) {
-            params.put("CustomerCode", customerCode);
+                params.put("SupplierCode", supplierCode);
-            params.put("AbcClass", abcClass);
+            }
-            params.put("ItemType", itemType);
+            if(customerCode != null && !customerCode.isEmpty()) {
-            params.put("ItemGroup", itemGroup);
+                params.put("CustomerCode", customerCode);
-            params.put("Project", project);
+            }
-            params.put("ItemCode", itemCode);
+            if(abcClass != null && !abcClass.isEmpty()) {
+                params.put("AbcClass", abcClass);
+            }
+            if(itemType != null && !itemType.isEmpty()) {
+                params.put("ItemType", itemType);
+            }
+            if(itemGroup != null && !itemGroup.isEmpty()) {
+                params.put("ItemGroup", itemGroup);
+            }
+            if(project != null && !project.isEmpty()) {
+                params.put("Project", project);
+            }
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -396,10 +524,18 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("WarehouseCode", warehouseCode);
+            if(warehouseCode != null && !warehouseCode.isEmpty()) {
-            params.put("AreaCode", areaCode);
+                params.put("WarehouseCode", warehouseCode);
-            params.put("LocationGroupCode", locationGroupCode);
+            }
-            params.put("LocationCode", locationCode);
+            if(areaCode != null && !areaCode.isEmpty()) {
+                params.put("AreaCode", areaCode);
+            }
+            if(locationGroupCode != null && !locationGroupCode.isEmpty()) {
+                params.put("LocationGroupCode", locationGroupCode);
+            }
+            if(locationCode != null && !locationCode.isEmpty()) {
+                params.put("LocationCode", locationCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -421,9 +557,15 @@ public class RuleServiceImpl implements RuleService {
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
             params.put("ContainerType", containerType);
-            params.put("ItemGroup", itemGroup);
+            if(itemGroup != null && !itemGroup.isEmpty()) {
-            params.put("ProjectCode", projectCode);
+                params.put("ItemGroup", itemGroup);
-            params.put("ItemCode", itemCode);
+            }
+            if(projectCode != null && !projectCode.isEmpty()) {
+                params.put("ProjectCode", projectCode);
+            }
+            if(itemCode != null && !itemCode.isEmpty()) {
+                params.put("ItemCode", itemCode);
+            }
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);
             }
@@ -439,7 +581,7 @@ public class RuleServiceImpl implements RuleService {
      */
     private boolean forEachParams(Map<String, String> params, JSONArray conditionArray) {
         for(int i = 0; i < conditionArray.size(); i++) {
-            JSONObject conditionObject = conditionArray.getJSONObject(0);
+            JSONObject conditionObject = conditionArray.getJSONObject(i);
             for (String key : params.keySet()) {
                 if(key.equals(conditionObject.get("ParamCode"))) {
                     boolean result = this.checkCondition(conditionObject, key, params.get(key));
@@ -465,56 +607,56 @@ public class RuleServiceImpl implements RuleService {
             String value = conditionObject.get("Value").toString();
             if(paramValue != null && paramValue.isEmpty()) {
                 if(operator.equals("==")) {
-                    if(!value.equals(paramValue)) {
+                    if(value.equals(paramValue)) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals("!=")) {
-                    if(value.equals(paramValue)) {
+                    if(!value.equals(paramValue)) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals(">")) {
                     BigDecimal value1 = new BigDecimal(paramValue);
                     BigDecimal value2 = new BigDecimal(value);
-                    if(value1.compareTo(value2) <= 0) {
+                    if(value1.compareTo(value2) > 0) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals("<")) {
                     BigDecimal value1 = new BigDecimal(paramValue);
                     BigDecimal value2 = new BigDecimal(value);
-                    if(value1.compareTo(value2) >= 0) {
+                    if(value1.compareTo(value2) < 0) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals(">=")) {
                     BigDecimal value1 = new BigDecimal(paramValue);
                     BigDecimal value2 = new BigDecimal(value);
-                    if(value1.compareTo(value2) < 0) {
+                    if(value1.compareTo(value2) >= 0) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals("<=")) {
                     BigDecimal value1 = new BigDecimal(paramValue);
                     BigDecimal value2 = new BigDecimal(value);
-                    if(value1.compareTo(value2) > 0) {
+                    if(value1.compareTo(value2) <= 0) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals("IN")) {
                     List<String> valueList = Arrays.asList(value.split(","));
-                    if(!valueList.contains(paramValue)) {
+                    if(valueList.contains(paramValue)) {
-                        return false;
+                        return true;
                     }
                 } else if(operator.equals("NOT IN")) {
                     List<String> valueList = Arrays.asList(value.split(","));
-                    if(valueList.contains(paramValue)) {
+                    if(!valueList.contains(paramValue)) {
-                        return false;
+                        return true;
                     }
                 }
             }
-            if(operator.equals("NULL")) {
+            //if(operator.equals("NULL")) {
-                return paramValue == null || paramValue.isEmpty();
+            //    return paramValue == null || paramValue.isEmpty();
-            } else if(operator.equals("NOT NULL")) {
+            //} else if(operator.equals("NOT NULL")) {
-                return paramValue != null && !paramValue.isEmpty();
+            //    return paramValue != null && !paramValue.isEmpty();
-            }
+            //}
         }
-        return true;
+        return false;
     }
 
 }