盘点任务

根据id查询主任务及子任务信息以及整理createtime

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;
 }