库存转移任务

根据id查询主任务及子任务信息以及修改后端涉及所有createtime字段

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/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/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())
@@ -59,7 +59,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())