From 0e476b99d9ccb2b549d792aceab339d74510d26b Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 14 Dec 2023 11:24:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9bug?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countJob/CountJobMainController.java | 33 +++++++++++++++++++ .../countJob/vo/CountJobDetailPageReqVO.java | 14 +++++--- .../dataobject/countJob/CountJobMainDO.java | 4 --- .../dataobject/countPlan/CountPlanMainDO.java | 4 --- .../countRequest/CountRequestMainDO.java | 4 --- .../CountadjustRequestMainDO.java | 4 --- .../mysql/countJob/CountJobDetailMapper.java | 1 + .../service/countJob/CountJobMainService.java | 7 ++++ .../countJob/CountJobMainServiceImpl.java | 14 ++++++++ .../countPlan/CountPlanMainServiceImpl.java | 1 + .../CountRequestMainServiceImpl.java | 5 +++ 11 files changed, 70 insertions(+), 21 deletions(-) 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 2b41af1d..bd653146 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 @@ -163,4 +163,37 @@ public class CountJobMainController { return resultList; } + @Operation(summary = "承接任务") + @PreAuthorize("@ss.hasPermission('wms:count-job-main:accept')") + @PutMapping(value = "/accept") + public CommonResult acceptCountJobMain(@RequestParam("id") Long id) { + int result = countJobMainService.acceptCountJobMain(id); + return success(result > 0); + } + + @Operation(summary = "放弃任务") + @PreAuthorize("@ss.hasPermission('wms:count-job-main:abandon')") + @PutMapping(value = "/abandon") + public CommonResult abandonInspectJobMain(@RequestParam("id") Long id) { + int result = countJobMainService.abandonCountJobMain(id); + return success(result > 0); + } + + @PutMapping(value = "/close") + @Operation(summary = "关闭任务") + @PreAuthorize("@ss.hasPermission('wms:count-job-main:close')") + public CommonResult closeInspectJobMain(@RequestParam("id") Long id) { + int result = countJobMainService.closeCountJobMain(id); + return success(result > 0); + } + + @PutMapping("/execute") + @Operation(summary = "执行任务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:count-job-main:execute')") + public CommonResult executeInspectJobMain(@Valid @RequestBody CountJobMainUpdateReqVO updateReqVO) { + String number = countJobMainService.executeCountJobMain(updateReqVO); + return success(number); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java index d1684011..5b57cb8e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.countJob.vo; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -69,4 +70,7 @@ public class CountJobDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java index 2b71a62b..00c06053 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java @@ -162,10 +162,6 @@ public class CountJobMainDO extends BaseDO { * 权限所属人员id */ private Long ruleUserId; - /** - * 工作流流水号 - */ - private String serialNumber; /** * 自动完成 */ 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 64e688fe..991688f0 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 @@ -98,10 +98,6 @@ public class CountPlanMainDO extends BaseDO { * 权限所属人员id */ private Long ruleUserId; - /** - * 工作流流水号 - */ - private String serialNumber; /** * 快照盘点 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java index 3078179c..af1d11ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java @@ -91,10 +91,6 @@ public class CountRequestMainDO extends BaseDO { * 权限所属人员id */ private Long ruleUserId; - /** - * 工作流流水号 - */ - private String serialNumber; /** * 自动提交 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestMainDO.java index 63d144b2..04a5c05a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestMainDO.java @@ -81,10 +81,6 @@ public class CountadjustRequestMainDO extends BaseDO { * 权限所属人员id */ private Long ruleUserId; - /** - * 工作流流水号 - */ - private String serialNumber; /** * 自动提交 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java index 9725e5c7..571cbaf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java @@ -22,6 +22,7 @@ public interface CountJobDetailMapper extends BaseMapperX { default PageResult selectPage(CountJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(CountJobDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CountJobDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber()) .eqIfPresent(CountJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) .eqIfPresent(CountJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java index 8c4facaf..de6bf144 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java @@ -90,6 +90,13 @@ public interface CountJobMainService { */ Integer abandonCountJobMain(Long id); + /** + * 关闭任务 + * @param id + * @return + */ + Integer closeCountJobMain(Long id); + /** * 执行任务 * @param countJobMainUpdateReqVO 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 722bd789..00bbb16c 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 @@ -29,6 +29,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -143,6 +144,19 @@ public class CountJobMainServiceImpl implements CountJobMainService { return countJobMainMapper.updateById(countJobMainDO); } + @Override + @Transactional + public Integer closeCountJobMain(Long id) { + CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus()); + if(!jobStatusState.close()) { + throw exception(COUNT_JOB_MAIN_STATUS_ERROR); + } + countJobMainDO.setStatus(jobStatusState.getState().getCode()); + trendsApi.createTrends(id, "countJob", "关闭了盘点任务", TrendsTypeEnum.UPDATE); + return countJobMainMapper.updateById(countJobMainDO); + } + @Override public String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO) { //查询数据 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 b4bdebaa..12615c45 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 @@ -317,6 +317,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { countRequestMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); countRequestMainCreateReqVO.setRequestTime(LocalDateTime.now()); countRequestMainCreateReqVO.setDueTime(LocalDateTime.now()); + countRequestMainCreateReqVO.setIsOpenCount(mainDO.getIsOpenCount()); List countBanlanceDOList = new ArrayList<>(); for (BalanceDO balanceDO : balanceDOList) { if(balanceDO.getQty().compareTo(BigDecimal.ZERO) == 0) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 6ed68a2b..f8e7703c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -24,6 +24,7 @@ import com.win.module.wms.dal.dataobject.countRequest.CountRequestDetailDO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper; import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; @@ -352,6 +353,10 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { //组装任务数据 for(String mapKey : listMap.keySet()) { CountJobMainDO countJobMainDO = CountJobMainConvert.INSTANCE.convert(mainDO); + LocationDO locationDO = locationService.selectLocation(mapKey); + countJobMainDO.setLocationCode(locationDO.getCode()); + countJobMainDO.setWarehouseCode(locationDO.getWarehouseCode()); + countJobMainDO.setRequestDueTime(mainDO.getDueTime()); countJobMainDO.setRequestNumber(mainDO.getNumber()); countJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); countJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());