From 4b394c3f9b71f2401f00a63faa7e906479102af1 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 13 Dec 2023 18:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../putawayJob/PutawayJobMainController.java | 14 +++++++--- .../putawayJob/vo/PutawayJobMainBaseVO.java | 6 +++++ .../PurchasereturnJobMainServiceImpl.java | 6 ++--- ...urchasereturnRequestDetailServiceImpl.java | 2 +- .../PurchasereturnRequestMainServiceImpl.java | 26 +++++++++++-------- .../putawayJob/PutawayJobMainService.java | 7 +++++ .../putawayJob/PutawayJobMainServiceImpl.java | 15 +++++++++-- 7 files changed, 56 insertions(+), 20 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index 50d63342..c556b800 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java @@ -175,7 +175,7 @@ public class PutawayJobMainController { } @Operation(summary = "承接任务") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:accept')") @PutMapping(value = "/accept") public CommonResult acceptPutawayJobMain(@RequestParam("id") Long id) { int result = putawayJobMainService.acceptPutawayJobMain(id); @@ -183,17 +183,25 @@ public class PutawayJobMainController { } @Operation(summary = "放弃任务") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:abandon')") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:abandon')") @PutMapping(value = "/abandon") public CommonResult cancelAcceptPutawayJobMain(@RequestParam("id") Long id) { int result = putawayJobMainService.abandonPutawayJobMain(id); return success(result > 0); } + @PutMapping(value = "/close") + @Operation(summary = "关闭任务") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:close')") + public CommonResult closePutawayJobMain(@RequestParam("id") Long id) { + int result = putawayJobMainService.closePutawayJobMain(id); + return success(result > 0); + } + @PutMapping("/execute") @Operation(summary = "执行采购收货任务主") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:execute')") public CommonResult executePutawayJobMain(@Valid @RequestBody PutawayJobMainUpdateReqVO updateReqVO) { String number = putawayJobMainService.executePutawayJobMain(updateReqVO); return success(number); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java index 872d0779..de86ba4c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java @@ -70,6 +70,9 @@ public class PutawayJobMainBaseVO { @Schema(description = "承接人用户ID") private String acceptUserId; + @Schema(description = "承接人用户名") + private String acceptUserName; + @Schema(description = "承接时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime acceptTime; @@ -77,6 +80,9 @@ public class PutawayJobMainBaseVO { @Schema(description = "完成人用户ID") private String completeUserId; + @Schema(description = "完成人用户名") + private String completeUserName; + @Schema(description = "完成时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime completeTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 22a0048a..bd3091d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -312,9 +312,9 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe transactionCreateReqVOIn.setQty(purchasereturnJobDetailUpdateReqVO.getHandleQty()); transactionCreateReqVOIn.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus()); transactionCreateReqVOIn.setWarehouseCode(purchasereturnJobMainUpdateReqVO.getToWarehouseCode()); - transactionCreateReqVOOut.setBatch(purchasereturnJobDetailUpdateReqVO.getToBatch()); - transactionCreateReqVOOut.setWorker(purchasereturnJobMainDO.getCompleteUserId()); - transactionCreateReqVOOut.setPackingNumber(purchasereturnRecordDetailDO.getFromPackingNumber()); + transactionCreateReqVOIn.setBatch(purchasereturnJobDetailUpdateReqVO.getToBatch()); + transactionCreateReqVOIn.setWorker(purchasereturnJobMainDO.getCompleteUserId()); + transactionCreateReqVOIn.setPackingNumber(purchasereturnRecordDetailDO.getFromPackingNumber()); transactionCreateReqVOIn.setId(null); transactionCreateReqVOList.add(transactionCreateReqVOIn); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java index 0835729f..ea239b08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java @@ -92,7 +92,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq private void validatePurchasereturnRequestDetailCreate(PurchasereturnRequestDetailDO detailDo) { ItembasicDO itembasicDO = this.validateItem(detailDo); if(!itembasicDO.getUom().equals(detailDo.getUom())) { - throw exception(ITEMBASIC_UOM_EXCEPTION, itembasicDO.getUom(), itembasicDO.getUom()); + throw exception(ITEMBASIC_UOM_EXCEPTION, detailDo.getUom(), itembasicDO.getUom()); } this.validateBusinesstype(itembasicDO.getType()); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index e76a8445..55e7f429 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -476,11 +476,13 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque detailDo.setProjectCode(itembasicDO.getProject()); this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); validatorLocation(detailDo.getFromLocationCode()); - PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); - PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); - mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); - mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); - ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); + if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) { + PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); + PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); + mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); + mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); + ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); + } BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); List inventoryStatusList = Arrays.asList(businesstypeDO.getOutInventoryStatuses().split(",")); BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList); @@ -559,16 +561,18 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - try { - PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); - PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); + if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) { try { - ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); + PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); + PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); + try { + ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); + } catch (Exception ex) { + message.append(ex.getMessage()).append(","); + } } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - } catch (Exception ex) { - message.append(ex.getMessage()).append(","); } try { List inventoryStatusList = new ArrayList<>(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index 36b93806..645586d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -89,6 +89,13 @@ public interface PutawayJobMainService { */ Integer abandonPutawayJobMain(Long id); + /** + * 关闭任务 + * @param id + * @return + */ + Integer closePutawayJobMain(Long id); + /** * 执行任务 * @param putawayJobMainUpdateReqVO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index b722c8e7..14222001 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -15,14 +15,12 @@ import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; -import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; -import com.win.module.wms.dal.mysql.putawayJob.PutawayJobDetailMapper; import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper; @@ -157,6 +155,19 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { return putawayJobMainMapper.updateById(putawayJobMainDO); } + @Override + @Transactional + public Integer closePutawayJobMain(Long id) { + PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus()); + if(!jobStatusState.close()) { + throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + } + putawayJobMainDO.setStatus(jobStatusState.getState().getCode()); + trendsApi.createTrends(id, "putawayJob", "关闭了上架任务", TrendsTypeEnum.UPDATE); + return putawayJobMainMapper.updateById(putawayJobMainDO); + } + @Override @Transactional public String executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) {