diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java index bd653146..12c8afeb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java @@ -70,7 +70,7 @@ public class CountJobMainController { public CommonResult> getCountJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = countJobMainService.getCountJobMainSenior(conditions); PageResult result = CountJobMainConvert.INSTANCE.convertPage(pageResult); - for(CountJobMainRespVO vo : result.getList()) { + for (CountJobMainRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); @@ -107,14 +107,15 @@ public class CountJobMainController { public CommonResult getCountJobById(@RequestParam("id") Long id) { CountJobMainDO countJobMain = countJobMainService.getCountJobMain(id); CountJobMainRespVO result = CountJobMainConvert.INSTANCE.convert(countJobMain); - if(result==null) { - return success(result); - }; + if (result == null) { + return success(null); + } + ; CountJobDetailExportReqVO reqVO = new CountJobDetailExportReqVO(); reqVO.setMasterId(result.getId()); - List countJobDetailList = countJobDetailService.getCountJobDetailList(reqVO); - List vos = CountJobDetailConvert.INSTANCE.convertList02(countJobDetailList); - result.setSubList(vos); + List countJobDetailList = countJobDetailService.selectList(result.getId()); + List countJobDetailRespVOList = CountJobDetailConvert.INSTANCE.convertList(countJobDetailList); + result.setSubList(countJobDetailRespVOList); return success(result); } @@ -122,11 +123,11 @@ public class CountJobMainController { @Operation(summary = "APP获得盘点任务数量根据任务状态") @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") @PreAuthorize("@ss.hasPermission('wms:count-job-main:query')") - public CommonResult> getCountByStatus(@RequestBody Map> map) { + public CommonResult> getCountByStatus(@RequestBody Map> map) { List list = new ArrayList<>(); - if(map==null||map.get("types")==null|| StringUtil.isEmpty(map.get("types").toString())){ + if (map == null || map.get("types") == null || StringUtil.isEmpty(map.get("types").toString())) { list.add("1");//默认不传为执行中的 - }else{ + } else { list = map.get("types"); } Map countByStatus = countJobMainService.getCountByStatus(list); @@ -150,9 +151,9 @@ public class CountJobMainController { mapDropDown.put(45, uom); List resultList = new ArrayList<>(); // 导出 - for(CountJobMainDO mainDO : list) { + for (CountJobMainDO mainDO : list) { List subList = countJobDetailService.selectList(mainDO.getId()); - for(CountJobDetailDO detailDO : subList) { + for (CountJobDetailDO detailDO : subList) { CountJobMainExcelVO vo = CountJobMainConvert.INSTANCE.convert(mainDO, detailDO); AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java index bf970527..ca69d257 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java @@ -11,6 +11,6 @@ import java.util.List; @ToString(callSuper = true) public class CountJobMainRespVO extends CountJobMainBaseVO { - @Schema(description = "盘点任务子表job_count_detail", requiredMode = Schema.RequiredMode.REQUIRED) - private List subList; + @Schema(description = "盘点任务子表jobCountDetail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java index 991688f0..f7c3faac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java @@ -126,5 +126,9 @@ public class CountPlanMainDO extends BaseDO { * 是否可用 */ private String available; + /** + * 租户编号 + */ + private Integer tenantId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java index b47950d9..252d9025 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java @@ -1,6 +1,7 @@ package com.win.module.wms.job; import com.win.framework.quartz.core.handler.JobHandler; +import com.win.framework.tenant.core.context.TenantContextHolder; import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO; import com.win.module.wms.service.countPlan.CountPlanMainService; import org.springframework.stereotype.Component; @@ -15,7 +16,9 @@ public class CountPlanJob implements JobHandler { @Override public String execute(String param) { - CountPlanMainDO countPlanMainDO = countPlanMainService.getCountPlanMain(Long.parseLong(param)); + String[] strs = param.split(","); + TenantContextHolder.setTenantId(Long.parseLong(strs[1])); + CountPlanMainDO countPlanMainDO = countPlanMainService.getCountPlanMain(Long.parseLong(strs[0])); countPlanMainService.generateRequest(countPlanMainDO); return "盘点计划 " + countPlanMainDO.getNumber()+ " 生成了盘点申请"; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java index c5b12200..cf4bd50a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailService.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.countJob; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.countJob.vo.CountJobDetailExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO; @@ -37,12 +36,4 @@ public interface CountJobDetailService { */ List selectList(Long masterId); - /** - * 获得盘点任务子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 盘点任务子列表 - */ - List getCountJobDetailList(CountJobDetailExportReqVO exportReqVO); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java index 11a940f4..46256682 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobDetailServiceImpl.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.countJob; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.countJob.vo.CountJobDetailExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO; import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper; @@ -38,8 +37,4 @@ public class CountJobDetailServiceImpl implements CountJobDetailService { return countJobDetailMapper.selectList(masterId); } - @Override - public List getCountJobDetailList(CountJobDetailExportReqVO exportReqVO) { - return countJobDetailMapper.selectList(exportReqVO); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 00bbb16c..0bfbbca0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -19,10 +19,12 @@ import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper; import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper; import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper; +import com.win.module.wms.dal.mysql.location.LocationMapper; import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; @@ -64,6 +66,8 @@ public class CountJobMainServiceImpl implements CountJobMainService { @Resource private CountRequestMainMapper countRequestMainMapper; @Resource + private LocationMapper locationMapper; + @Resource private JobUtils jobUtils; @Override @@ -195,6 +199,10 @@ public class CountJobMainServiceImpl implements CountJobMainService { for(CountJobDetailUpdateReqVO countJobDetailUpdateReqVO : countJobDetailUpdateReqVOList) { CountRecordDetailDO countRecordDetailDO = new CountRecordDetailDO(); BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRecordDetailDO); + LocationDO locationDO = locationMapper.selectByCode(countJobMainDO.getLocationCode()); + countRecordDetailDO.setLocationCode(locationDO.getCode()); + countRecordDetailDO.setLocationGroupCode(locationDO.getLocationGroupCode()); + countRecordDetailDO.setAreaCode(locationDO.getAreaCode()); countRecordDetailDO.setMasterId(countRecordMainDO.getId()); countRecordDetailDO.setNumber(number); countRecordDetailDO.setJobDetailId(String.valueOf(countJobDetailUpdateReqVO.getId())); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index 12615c45..9c5a49b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -278,7 +278,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { } else if (mainDO.getType().equals("CYCLE")) {//循环盘点 // 添加 Job 到 Quartz 中 try { - schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob_" + mainDO.getId(), String.valueOf(mainDO.getId()), mainDO.getCrontab(), 3, 60*10); + schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob", String.valueOf(mainDO.getId()) + "," + mainDO.getTenantId(), mainDO.getCrontab(), 3, 60*10); } catch (SchedulerException e) { throw new ServiceException(COUNT_PLAN_CRON_ERROR); }