diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java index e95834ec..1b392eda 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java @@ -106,8 +106,7 @@ public class CountPlanMainController { @Operation(summary = "导出盘点计划主 Excel") @PreAuthorize("@ss.hasPermission('wms:count-plan-main:export')") @OperateLog(type = EXPORT) - public void exportCountPlanMainExcel(@Valid CountPlanMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportCountPlanMainExcel(@Valid CountPlanMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = countPlanMainService.getCountPlanMainList(exportReqVO); // 导出 Excel List datas = CountPlanMainConvert.INSTANCE.convertList02(list); 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 8d075f8c..c1672132 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 @@ -191,16 +191,16 @@ public class InspectJobMainController { @Operation(summary = "承接任务") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:accept')") - @PostMapping(value = "/accept/{id}") - public CommonResult acceptInspectJobMain(@PathVariable("id") Long id) { + @PutMapping(value = "/accept") + public CommonResult acceptInspectJobMain(@RequestParam("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 cancelAcceptInspectJobMain(@PathVariable("id") Long id) { + @PutMapping(value = "/cancelAccept") + public CommonResult cancelAcceptInspectJobMain(@RequestParam("id") Long id) { int result = inspectJobMainService.cancelAcceptInspectJobMain(id); return success(result > 0); } @@ -209,9 +209,9 @@ public class InspectJobMainController { @Operation(summary = "执行任务") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')") - public CommonResult executeInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { - Integer count = inspectJobMainService.executeInspectJobMain(updateReqVO); - return success(count > 0); + public CommonResult executeInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { + String number = inspectJobMainService.executeInspectJobMain(updateReqVO); + return success(number); } } 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 5feb964b..2b7fc8ba 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 @@ -151,8 +151,8 @@ public class PurchasereceiptJobMainController { return success(result); } List purchasereceiptJobDetailList = purchasereceiptJobDetailService.selectList(result.getId()); - List purchasereceiptJobDetailExcelVOS = PurchasereceiptJobDetailConvert.INSTANCE.convertList02(purchasereceiptJobDetailList); - result.setSubList(purchasereceiptJobDetailExcelVOS); + List purchasereceiptJobDetailExcelVOList = PurchasereceiptJobDetailConvert.INSTANCE.convertList(purchasereceiptJobDetailList); + result.setSubList(purchasereceiptJobDetailExcelVOList); return success(result); } @@ -171,7 +171,7 @@ public class PurchasereceiptJobMainController { return success(countByStatus); } - @GetMapping(value = "/accept") + @PutMapping(value = "/accept") @Operation(summary = "承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')") public CommonResult acceptPurchasereceiptJobMain(@RequestParam("id") Long id) { @@ -179,7 +179,7 @@ public class PurchasereceiptJobMainController { return success(result > 0); } - @GetMapping(value = "/abandon") + @PutMapping(value = "/abandon") @Operation(summary = "放弃任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:abandon')") public CommonResult abandonPurchasereceiptJobMain(@RequestParam("id") Long id) { @@ -187,7 +187,7 @@ public class PurchasereceiptJobMainController { return success(result > 0); } - @GetMapping(value = "/close") + @PutMapping(value = "/close") @Operation(summary = "关闭任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:close')") public CommonResult closePurchasereceiptJobMain(@RequestParam("id") Long id) { @@ -199,9 +199,9 @@ public class PurchasereceiptJobMainController { @Operation(summary = "执行采购收货任务主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')") - public CommonResult executePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { - Integer count = purchasereceiptJobMainService.executePurchasereceiptJobMain(updateReqVO); - return success(count > 0); + public CommonResult executePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { + String number = purchasereceiptJobMainService.executePurchasereceiptJobMain(updateReqVO); + return success(number); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java index 00ae6ccf..d66b9762 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java @@ -1,8 +1,10 @@ package com.win.module.wms.controller.purchasereceiptJob.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.time.LocalDateTime; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.util.List; @Schema(description = "管理后台 - 采购收货任务主 Response VO") @@ -12,5 +14,5 @@ import java.util.List; public class PurchasereceiptJobMainRespVO extends PurchasereceiptJobMainBaseVO { @Schema(description = "收货任务子表job_purchasereceipt_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED) - private List subList; + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java index b025ba84..b7560fc6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java @@ -143,12 +143,12 @@ public class PurchasereturnJobMainController { return success(result); } List purchasereturnJobDetailList = purchasereturnJobDetailService.selectList(result.getId()); - List purchasereturnJobDetailExcelVOS = PurchasereturnJobDetailConvert.INSTANCE.convertList02(purchasereturnJobDetailList); - result.setSubList(purchasereturnJobDetailExcelVOS); + List purchasereturnJobDetailRespVOList = PurchasereturnJobDetailConvert.INSTANCE.convertList(purchasereturnJobDetailList); + result.setSubList(purchasereturnJobDetailRespVOList); return success(result); } - @PostMapping("/getCountByStatus") + @GetMapping("/getCountByStatus") @Operation(summary = "APP获得采购收货任务数量根据任务状态") @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')") @@ -163,4 +163,37 @@ public class PurchasereturnJobMainController { return success(countByStatus); } + @PutMapping(value = "/accept") + @Operation(summary = "承接任务") + @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:accept')") + public CommonResult acceptPurchasereceiptJobMain(@RequestParam("id") Long id) { + int result = purchasereturnJobMainService.acceptPurchasereturnJobMain(id); + return success(result > 0); + } + + @PutMapping(value = "/abandon") + @Operation(summary = "放弃任务") + @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:abandon')") + public CommonResult abandonPurchasereceiptJobMain(@RequestParam("id") Long id) { + int result = purchasereturnJobMainService.abandonPurchasereturnJobMain(id); + return success(result > 0); + } + + @PutMapping(value = "/close") + @Operation(summary = "关闭任务") + @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:close')") + public CommonResult closePurchasereceiptJobMain(@RequestParam("id") Long id) { + int result = purchasereturnJobMainService.closePurchasereturnJobMain(id); + return success(result > 0); + } + + @PutMapping("/execute") + @Operation(summary = "执行采购收货任务主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:execute')") + public CommonResult executePurchasereceiptJobMain(@Valid @RequestBody PurchasereturnJobMainUpdateReqVO updateReqVO) { + String number = purchasereturnJobMainService.executePurchasereturnJobMain(updateReqVO); + return success(number); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java index 8ddfb1f3..e0b220eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java @@ -12,7 +12,6 @@ import java.util.List; public class PurchasereturnJobMainRespVO extends PurchasereturnJobMainBaseVO { @Schema(description = "退货任务子表job_purchasereceipt_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED) - private List subList; - + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index 042b4691..4b01f24a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java @@ -197,8 +197,8 @@ public class PurchasereturnRequestMainController { return success(result); } List list = purchasereturnRequestDetailService.selectList(result.getId()); - List vos = PurchasereturnRequestDetailConvert.INSTANCE.convertList02(list); - result.setSubList(vos); + List purchasereturnRequestDetailRespVOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList(list); + result.setSubList(purchasereturnRequestDetailRespVOList); return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java index b86663db..b37e5c23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainRespVO.java @@ -12,5 +12,5 @@ import java.util.List; public class PurchasereturnRequestMainRespVO extends PurchasereturnRequestMainBaseVO { @Schema(description = " 采购退货申请子表request_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED) - private List subList; + private List subList; } 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 6d5c7053..44816658 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 @@ -174,16 +174,16 @@ public class PutawayJobMainController { @Operation(summary = "承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')") - @PostMapping(value = "/accept/{id}") - public CommonResult acceptPutawayJobMain(@PathVariable("id") Long id) { + @PutMapping(value = "/accept") + public CommonResult acceptPutawayJobMain(@RequestParam("id") Long id) { int result = putawayJobMainService.acceptPutawayJobMain(id); return success(result > 0); } @Operation(summary = "取消承接任务") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')") - @PostMapping(value = "/cancelAccept/{id}") - public CommonResult cancelAcceptPutawayJobMain(@PathVariable("id") Long id) { + @PutMapping(value = "/cancelAccept/{id}") + public CommonResult cancelAcceptPutawayJobMain(@RequestParam("id") Long id) { int result = putawayJobMainService.cancelAcceptPutawayJobMain(id); return success(result > 0); } @@ -192,9 +192,9 @@ public class PutawayJobMainController { @Operation(summary = "执行采购收货任务主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')") - public CommonResult executePutawayJobMain(@Valid @RequestBody PutawayJobMainUpdateReqVO updateReqVO) { - Integer count = putawayJobMainService.executePutawayJobMain(updateReqVO); - return success(count > 0); + 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/convert/purchasereceiptJob/PurchasereceiptJobDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptJob/PurchasereceiptJobDetailConvert.java index 2fe3ea40..097edc66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptJob/PurchasereceiptJobDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptJob/PurchasereceiptJobDetailConvert.java @@ -2,7 +2,6 @@ package com.win.module.wms.convert.purchasereceiptJob; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailCreateReqVO; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailExcelVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailRespVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; @@ -32,8 +31,6 @@ public interface PurchasereceiptJobDetailConvert { PageResult convertPage(PageResult page); - List convertList02(List list); - PurchasereceiptJobDetailCreateReqVO convert(PurchasereceiptRequestDetailDO bean); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnJob/PurchasereturnJobDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnJob/PurchasereturnJobDetailConvert.java index 3bfb61dc..7a3e8a0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnJob/PurchasereturnJobDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnJob/PurchasereturnJobDetailConvert.java @@ -2,7 +2,6 @@ package com.win.module.wms.convert.purchasereturnJob; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailCreateReqVO; -import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailExcelVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailRespVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO; @@ -32,8 +31,6 @@ public interface PurchasereturnJobDetailConvert { PageResult convertPage(PageResult page); - List convertList02(List list); - PurchasereturnJobDetailDO convert(PurchasereturnRequestDetailDO bean); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnRequest/PurchasereturnRequestDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnRequest/PurchasereturnRequestDetailConvert.java index 3871b1d9..0b0396c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnRequest/PurchasereturnRequestDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnRequest/PurchasereturnRequestDetailConvert.java @@ -33,8 +33,6 @@ public interface PurchasereturnRequestDetailConvert { PageResult convertPage(PageResult page); - List convertList02(List list); - List convertList03(List list); List convertList04(List list); 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 b52138f7..5876c1a9 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 @@ -104,6 +104,6 @@ public interface InspectJobMainService { * @param inspectJobMainUpdateReqVO * @return */ - Integer executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); + String executeInspectJobMain(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 a84b54f6..65480606 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 @@ -164,7 +164,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { @Override @Transactional - public Integer executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { + public String executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { //查询数据 InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(inspectJobMainUpdateReqVO.getId()); JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); @@ -245,7 +245,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { expectinService.deleteExpectinByJobNumber(inspectJobMainDO.getNumber()); //变更记录 trendsApi.createTrends(inspectJobMainDO.getId(), "inspectJob", "执行了到货检验任务", TrendsTypeEnum.UPDATE); - return result; + return number; } private InspectJobMainDO validateInspectJobMainExists(Long id) { 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 f24c14db..3dfeb29f 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 @@ -113,6 +113,6 @@ public interface PurchasereceiptJobMainService { * @param purchasereceiptJobMainUpdateReqVO * @return */ - Integer executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO); + String executePurchasereceiptJobMain(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 2cd40e6d..a93ac57b 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 @@ -22,6 +22,7 @@ import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; @@ -42,6 +43,7 @@ import com.win.module.wms.service.businesstype.BusinesstypeService; import com.win.module.wms.service.documentSwitch.SwitchService; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.inspectRequest.InspectRequestMainService; +import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; @@ -105,6 +107,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain private PurchaseMainService purchaseMainService; @Resource private BusinesstypeService businesstypeService; + @Resource + private LocationService locationService; @Override public PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions) { @@ -212,7 +216,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) { + public String executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) { //查询数据 PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(purchasereceiptJobMainUpdateReqVO.getId()); List subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId()); @@ -239,6 +243,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode()); purchasereceiptRecordMainDO.setNumber(number); purchasereceiptRecordMainDO.setJobNumber(purchasereceiptJobMainDO.getNumber()); + purchasereceiptRecordMainDO.setExecuteTime(LocalDateTime.now()); + purchasereceiptRecordMainDO.setActiveDate(LocalDateTime.now()); + purchasereceiptRecordMainDO.setDueTime(purchasereceiptJobMainDO.getRequestDueTime()); + purchasereceiptRecordMainDO.setAvailable("TRUE"); purchasereceiptRecordMainDO.setId(null); purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMainDO); List purchasereceiptJobDetailUpdateReqVOList = purchasereceiptJobMainUpdateReqVO.getSubList(); @@ -269,6 +277,16 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber()); purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailUpdateReqVOTemp.getToPackingNumber()); purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVOTemp.getHandleQty()); + purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber()); + purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber()); + purchasereceiptRecordDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); + purchasereceiptRecordDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); + LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + purchasereceiptRecordDetailDO.setFromAreaCode(locationDO1.getAreaCode()); + purchasereceiptRecordDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode()); + LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + purchasereceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode()); + purchasereceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); purchasereceiptRecordDetailDO.setId(null); purchasereceiptRecordDetailDOList.add(purchasereceiptRecordDetailDO); //更新采购订单明细的收货数量 @@ -293,6 +311,16 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchaseshortageDetailDO.setMasterId(purchasereceiptRecordMainDO.getId()); purchaseshortageDetailDO.setNumber(number); purchaseshortageDetailDO.setJobDetailId(String.valueOf(purchasereceiptJobDetailDO.getId())); + purchaseshortageDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber()); + purchaseshortageDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber()); + purchaseshortageDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); + purchaseshortageDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); + LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + purchaseshortageDetailDO.setFromAreaCode(locationDO1.getAreaCode()); + purchaseshortageDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode()); + LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + purchaseshortageDetailDO.setToAreaCode(locationDO2.getAreaCode()); + purchaseshortageDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); purchaseshortageDetailDO.setId(null); purchaseshortageDetailDOList.add(purchaseshortageDetailDO); } @@ -394,7 +422,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber()); //变更记录 trendsApi.createTrends(purchasereceiptJobMainDO.getId(), "purchasereceiptJob", "执行了采购收货任务", TrendsTypeEnum.UPDATE); - return result; + return number; } private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index 4cb7685e..6034ad0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -101,6 +101,6 @@ public interface PurchasereturnJobMainService { * @param purchasereturnJobMainUpdateReqVO * @return */ - Integer executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO); + String executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO); } 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 7c42ff5c..4fc4c1e7 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 @@ -201,7 +201,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe @Override @Transactional - public Integer executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO) { + public String executePurchasereturnJobMain(PurchasereturnJobMainUpdateReqVO purchasereturnJobMainUpdateReqVO) { //查询数据 PurchasereturnJobMainDO purchasereturnJobMainDO = this.validatePurchasereturnJobMainExists(purchasereturnJobMainUpdateReqVO.getId()); List subList = purchasereturnJobDetailService.selectList(purchasereturnJobMainDO.getId()); @@ -282,7 +282,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe expectoutService.deleteExpectoutByJobNumber(purchasereturnJobMainDO.getNumber()); //变更记录 trendsApi.createTrends(purchasereturnJobMainDO.getId(), "purchasereturnJob", "执行了采购退货任务", TrendsTypeEnum.UPDATE); - return result; + return number; } private PurchasereturnJobMainDO validatePurchasereturnJobMainExists(Long id) { 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 21152c91..0418f3ec 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 @@ -94,6 +94,6 @@ public interface PutawayJobMainService { * @param putawayJobMainUpdateReqVO * @return */ - Integer executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO); + String executePutawayJobMain(PutawayJobMainUpdateReqVO 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 7082e219..e1be590a 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 @@ -157,7 +157,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { @Override @Transactional - public Integer executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) { + public String executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) { //查询数据 PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(putawayJobMainUpdateReqVO.getId()); JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus()); @@ -238,7 +238,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { expectinService.deleteExpectinByJobNumber(putawayJobMainDO.getNumber()); //变更记录 trendsApi.createTrends(putawayJobMainDO.getId(), "putawayJob", "执行了上架任务", TrendsTypeEnum.UPDATE); - return result; + return number; } private PutawayJobMainDO validatePutawayJobMainExists(Long id) {