From 7f574e37cdaa7293594eeb8251fab479ad381a7d Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 16 Nov 2023 10:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectJob/InspectJobMainController.java | 12 ++++++------ .../PurchasereceiptJobMainController.java | 12 ++++++------ .../service/inspectJob/InspectJobMainService.java | 6 +++--- .../inspectJob/InspectJobMainServiceImpl.java | 6 +++--- .../PurchasereceiptJobMainService.java | 6 +++--- .../PurchasereceiptJobMainServiceImpl.java | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index 23a97202..ce9b7367 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -193,16 +193,16 @@ public class InspectJobMainController { @Operation(summary = "承接任务") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:accept')") @PostMapping(value = "/accept/{id}") - public CommonResult accept(@PathVariable("id") Long id) { - int result = inspectJobMainService.accept(id); + public CommonResult acceptInspectJobMain(@PathVariable("id") Long id) { + int result = inspectJobMainService.acceptInspectJobMain(id); return success(result > 0); } @Operation(summary = "取消承接任务") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:cancel-accept')") @PostMapping(value = "/cancelAccept/{id}") - public CommonResult cancelAccept(@PathVariable("id") Long id) { - int result = inspectJobMainService.cancelAccept(id); + public CommonResult cancelAcceptInspectJobMain(@PathVariable("id") Long id) { + int result = inspectJobMainService.cancelAcceptInspectJobMain(id); return success(result > 0); } @@ -210,8 +210,8 @@ public class InspectJobMainController { @Operation(summary = "执行任务") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')") - public CommonResult excute(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { - Integer count = inspectJobMainService.excute(updateReqVO); + public CommonResult excuteInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { + Integer count = inspectJobMainService.excuteInspectJobMain(updateReqVO); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 078f2dc2..42365120 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -176,16 +176,16 @@ public class PurchasereceiptJobMainController { @Operation(summary = "承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')") @PostMapping(value = "/accept/{id}") - public CommonResult accept(@PathVariable("id") Long id) { - int result = purchasereceiptJobMainService.accept(id); + public CommonResult acceptPurchasereceiptJobMain(@PathVariable("id") Long id) { + int result = purchasereceiptJobMainService.acceptPurchasereceiptJobMain(id); return success(result > 0); } @Operation(summary = "取消承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')") @PostMapping(value = "/cancelAccept/{id}") - public CommonResult cancelAccept(@PathVariable("id") Long id) { - int result = purchasereceiptJobMainService.cancelAccept(id); + public CommonResult cancelAcceptPurchasereceiptJobMain(@PathVariable("id") Long id) { + int result = purchasereceiptJobMainService.cancelAcceptPurchasereceiptJobMain(id); return success(result > 0); } @@ -193,8 +193,8 @@ public class PurchasereceiptJobMainController { @Operation(summary = "执行采购收货任务主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')") - public CommonResult excute(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { - Integer count = purchasereceiptJobMainService.excute(updateReqVO); + public CommonResult excutePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { + Integer count = purchasereceiptJobMainService.excutePurchasereceiptJobMain(updateReqVO); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index 53ea0a28..071127b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -90,20 +90,20 @@ public interface InspectJobMainService { * @param id * @return */ - Integer accept(Long id); + Integer acceptInspectJobMain(Long id); /** * 取消承接任务 * @param id * @return */ - Integer cancelAccept(Long id); + Integer cancelAcceptInspectJobMain(Long id); /** * 执行任务 * @param inspectJobMainUpdateReqVO * @return */ - Integer excute(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); + Integer excuteInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 1ad9daf2..68f42fe6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -100,7 +100,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { @Override @Transactional - public Integer accept(Long id) { + public Integer acceptInspectJobMain(Long id) { InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); if(!jobStatusState.accept()) { @@ -118,7 +118,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { @Override @Transactional - public Integer cancelAccept(Long id) { + public Integer cancelAcceptInspectJobMain(Long id) { InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); if(!jobStatusState.cancelAccept()) { @@ -134,7 +134,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { @Override @Transactional - public Integer excute(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { + public Integer excuteInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { return 0; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 616bea23..d3fe9fa7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -92,20 +92,20 @@ public interface PurchasereceiptJobMainService { * @param id * @return */ - Integer accept(Long id); + Integer acceptPurchasereceiptJobMain(Long id); /** * 取消承接任务 * @param id * @return */ - Integer cancelAccept(Long id); + Integer cancelAcceptPurchasereceiptJobMain(Long id); /** * 执行任务 * @param purchasereceiptJobMainUpdateReqVO * @return */ - Integer excute(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO); + Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 9757a9b6..542f674f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -167,7 +167,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer accept(Long id) { + public Integer acceptPurchasereceiptJobMain(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(purchasereceiptJobMainDO.getStatus()); if(!jobStatusState.accept()) { @@ -185,7 +185,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer cancelAccept(Long id) { + public Integer cancelAcceptPurchasereceiptJobMain(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(purchasereceiptJobMainDO.getStatus()); if(!jobStatusState.cancelAccept()) { @@ -201,7 +201,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer excute(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) { + public Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) { //查询数据 PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(purchasereceiptJobMainUpdateReqVO.getId()); List subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId());