Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java

@@ -3,6 +3,9 @@ package com.win.module.wms.controller.issueJob;
 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.issueJob.IssueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
+import com.win.module.wms.service.issueJob.IssueJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,8 @@ public class IssueJobMainController {
 
     @Resource
     private IssueJobMainService issueJobMainService;
+    @Resource
+    private IssueJobDetailService issueJobDetailService;
 
     @Resource
     private AdminUserApi userApi;
@@ -122,4 +127,22 @@ public class IssueJobMainController {
         ExcelUtils.write(response, "发料任务主.xls", "数据", IssueJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getIssueJobById")
+    @Operation(summary = "APP获得发料任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:issue-job-main:query')")
+    public CommonResult<IssueJobMainRespVO> getIssueJobById(@RequestParam("id") Long id) {
+        IssueJobMainDO issueJobMain = issueJobMainService.getIssueJobMain(id);
+        IssueJobMainRespVO result = IssueJobMainConvert.INSTANCE.convert(issueJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        IssueJobDetailExportReqVO issueJobDetailExportReqVO = new IssueJobDetailExportReqVO();
+        issueJobDetailExportReqVO.setMasterId(result.getId());
+        List<IssueJobDetailDO> issueJobDetailList = issueJobDetailService.getIssueJobDetailList(issueJobDetailExportReqVO);
+        List<IssueJobDetailExcelVO> issueJobDetailExcelVOS = IssueJobDetailConvert.INSTANCE.convertList02(issueJobDetailList);
+        result.setSubList(issueJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java

@@ -94,4 +94,7 @@ public class IssueJobDetailExportReqVO {
     @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/issueJob/vo/IssueJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.issueJob.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 IssueJobMainRespVO extends IssueJobMainBaseVO {
 
+    @Schema(description = "发料任务子表job_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.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.pickJob.vo.*;
+import com.win.module.wms.convert.pickJob.PickJobDetailConvert;
 import com.win.module.wms.convert.pickJob.PickJobMainConvert;
+import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO;
 import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO;
+import com.win.module.wms.service.pickJob.PickJobDetailService;
 import com.win.module.wms.service.pickJob.PickJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -36,6 +39,9 @@ public class PickJobMainController {
 
     @Resource
     private PickJobMainService pickJobMainService;
+
+    @Resource
+    private PickJobDetailService pickJobDetailService;
     @Resource
     private AdminUserApi userApi;
 
@@ -120,4 +126,23 @@ public class PickJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getPickJobById")
+    @Operation(summary = "APP获得拣料任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:pick-job-main:query')")
+    public CommonResult<PickJobMainRespVO> getPickJobById(@RequestParam("id") Long id) {
+        PickJobMainDO pickJobMain = pickJobMainService.getPickJobMain(id);
+        PickJobMainRespVO result = PickJobMainConvert.INSTANCE.convert(pickJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        PickJobDetailExportReqVO pickJobDetailExportReqVO = new PickJobDetailExportReqVO();
+        pickJobDetailExportReqVO.setMasterId(result.getId());
+        List<PickJobDetailDO> pickJobDetailList = pickJobDetailService.getPickJobDetailList(pickJobDetailExportReqVO);
+        List<PickJobDetailExcelVO> pickJobDetailExcelVOS = PickJobDetailConvert.INSTANCE.convertList02(pickJobDetailList);
+        result.setSubList(pickJobDetailExcelVOS);
+        return success(result);
+    }
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java

@@ -65,7 +65,7 @@ public class PickJobDetailExportReqVO {
     private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
-    private String creatorId;
+    private String creator;
 
     @Schema(description = "从货主代码")
     private String fromOwnerCode;
@@ -73,4 +73,7 @@ public class PickJobDetailExportReqVO {
     @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/pickJob/vo/PickJobDetailPageReqVO.java

@@ -67,7 +67,7 @@ public class PickJobDetailPageReqVO extends PageParam {
     private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
-    private String creatorId;
+    private String creator;
 
     @Schema(description = "从货主代码")
     private String fromOwnerCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.pickJob.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 PickJobMainRespVO extends PickJobMainBaseVO {
 
+    @Schema(description = "拣料任务子表job_repleinsh_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

@@ -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.productionreceiptJob.vo.*;
+import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert;
 import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
+import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService;
 import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductionreceiptJobMainController {
     @Resource
     private ProductionreceiptJobMainService productionreceiptJobMainService;
 
+    @Resource
+    private ProductionreceiptJobDetailService productionreceiptJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
     @PostMapping("/create")
@@ -120,4 +126,22 @@ public class ProductionreceiptJobMainController {
         return success(result);
     }
 
+    @GetMapping("/gettProductionreceiptJobById")
+    @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) {
+        ProductionreceiptJobMainDO productionreceiptJobMain = productionreceiptJobMainService.getProductionreceiptJobMain(id);
+        ProductionreceiptJobMainRespVO result = ProductionreceiptJobMainConvert.INSTANCE.convert(productionreceiptJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductionreceiptJobDetailExportReqVO productionreceiptJobDetailExportReqVO = new ProductionreceiptJobDetailExportReqVO();
+        productionreceiptJobDetailExportReqVO.setMasterId(result.getId());
+        List<ProductionreceiptJobDetailDO> productionreceiptJobDetailList = productionreceiptJobDetailService.getProductionreceiptJobDetailList(productionreceiptJobDetailExportReqVO);
+        List<ProductionreceiptJobDetailExcelVO> productionreceiptJobDetailExcelVOS = ProductionreceiptJobDetailConvert.INSTANCE.convertList02(productionreceiptJobDetailList);
+        result.setSubList(productionreceiptJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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

@@ -82,4 +82,7 @@ public class ProductionreceiptJobDetailExportReqVO {
     @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/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreceiptJob.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 ProductionreceiptJobMainRespVO extends ProductionreceiptJobMainBaseVO {
 
+    @Schema(description = "生产发料子表job_productionreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.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.productionreturnJob.vo.*;
+import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert;
 import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
+import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService;
 import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductionreturnJobMainController {
     @Resource
     private ProductionreturnJobMainService productionreturnJobMainService;
 
+    @Resource
+    private ProductionreturnJobDetailService productionreturnJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class ProductionreturnJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductionreturnJobById")
+    @Operation(summary = "APP获得生产退料主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')")
+    public CommonResult<ProductionreturnJobMainRespVO> getProductionreturnJobById(@RequestParam("id") Long id) {
+        ProductionreturnJobMainDO productionreturnJobMain = productionreturnJobMainService.getProductionreturnJobMain(id);
+        ProductionreturnJobMainRespVO result = ProductionreturnJobMainConvert.INSTANCE.convert(productionreturnJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductionreturnJobDetailExportReqVO productionreturnJobDetailExportReqVO = new ProductionreturnJobDetailExportReqVO();
+        productionreturnJobDetailExportReqVO.setMasterId(result.getId());
+        List<ProductionreturnJobDetailDO> productionreturnJobDetailList = productionreturnJobDetailService.getProductionreturnJobDetailList(productionreturnJobDetailExportReqVO);
+        List<ProductionreturnJobDetailExcelVO> productionreturnJobDetailExcelVOS = ProductionreturnJobDetailConvert.INSTANCE.convertList02(productionreturnJobDetailList);
+        result.setSubList(productionreturnJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java

@@ -79,4 +79,7 @@ public class ProductionreturnJobDetailExportReqVO {
     @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/productionreturnJob/vo/ProductionreturnJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreturnJob.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 ProductionreturnJobMainRespVO extends ProductionreturnJobMainBaseVO {
 
+    @Schema(description = "生产退料子表job_productionreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java

@@ -97,7 +97,7 @@ public class PickJobDetailDO extends BaseDO {
     /**
      * 创建者Id
      */
-    private String creatorId;
+    private String creator;
     /**
      * 地点ID
      */

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

@@ -38,7 +38,7 @@ public interface PickJobDetailMapper extends BaseMapperX<PickJobDetailDO> {
                 .eqIfPresent(PickJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(PickJobDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(PickJobDetailDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(PickJobDetailDO::getCreatorId, reqVO.getCreatorId())
+                .eqIfPresent(PickJobDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(PickJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(PickJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .orderByDesc(PickJobDetailDO::getId));
@@ -66,7 +66,7 @@ public interface PickJobDetailMapper extends BaseMapperX<PickJobDetailDO> {
                 .eqIfPresent(PickJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(PickJobDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(PickJobDetailDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(PickJobDetailDO::getCreatorId, reqVO.getCreatorId())
+                .eqIfPresent(PickJobDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(PickJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(PickJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .orderByDesc(PickJobDetailDO::getId));