Browse Source

更改方法名。

master
刘忱 2 years ago
parent
commit
7f574e37cd
  1. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
  2. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java
  3. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java
  4. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java
  5. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java
  6. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

12
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<Boolean> accept(@PathVariable("id") Long id) {
int result = inspectJobMainService.accept(id);
public CommonResult<Boolean> 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<Boolean> cancelAccept(@PathVariable("id") Long id) {
int result = inspectJobMainService.cancelAccept(id);
public CommonResult<Boolean> 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<Boolean> excute(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
Integer count = inspectJobMainService.excute(updateReqVO);
public CommonResult<Boolean> excuteInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
Integer count = inspectJobMainService.excuteInspectJobMain(updateReqVO);
return success(count > 0);
}

12
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<Boolean> accept(@PathVariable("id") Long id) {
int result = purchasereceiptJobMainService.accept(id);
public CommonResult<Boolean> 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<Boolean> cancelAccept(@PathVariable("id") Long id) {
int result = purchasereceiptJobMainService.cancelAccept(id);
public CommonResult<Boolean> 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<Boolean> excute(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
Integer count = purchasereceiptJobMainService.excute(updateReqVO);
public CommonResult<Boolean> excutePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
Integer count = purchasereceiptJobMainService.excutePurchasereceiptJobMain(updateReqVO);
return success(count > 0);
}

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

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

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

6
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<PurchasereceiptJobDetailDO> subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId());

Loading…
Cancel
Save