From 9ee2f38b05aff3e2b363ea260bd1eae21fd683b3 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 19 Aug 2024 09:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderCodeManController.java | 2 ++ .../collect/IoCollectOrderController.java | 21 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 6f5254e62..ea528244b 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -283,6 +283,8 @@ public class IoCollectOrderCodeManController extends BaseController { .build(); collectOrderCodeManService.save(collectOrderCodeMan); } + collectOrder.setTagStatus(2); + collectOrderService.updateById(collectOrder); return ResultVOUtils.success(collectOrder); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 3c22290b1..a48de2242 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -122,7 +122,22 @@ public class IoCollectOrderController extends BaseController { * * @return */ - @GetMapping("/udiwms/basic/collect/order/draft") + @PostMapping("/udiwms/basic/collect/order/update") + public BaseResponse updateOrder(@RequestBody CollectOrderRequest collectOrderRequest) { + IoCollectOrder collectOrder = new IoCollectOrder(); + BeanUtils.copyProperties(collectOrderRequest, collectOrder); + collectOrder.setUpdateTime(new Date()); + collectOrder.setUpdateUser(getUserId()); + collectOrderService.updateById(collectOrder); + return ResultVOUtils.success(); + } + + /** + * 单据挂起 + * + * @return + */ + @PostMapping("/udiwms/basic/collect/order/draft") public BaseResponse saveDraftOrder(@RequestBody CollectOrderRequest collectOrderRequest) { IoCollectOrder collectOrder = new IoCollectOrder(); BeanUtils.copyProperties(collectOrderRequest, collectOrder); @@ -138,7 +153,7 @@ public class IoCollectOrderController extends BaseController { * * @return */ - @GetMapping("/udiwms/basic/collect/order/finish") + @PostMapping("/udiwms/basic/collect/order/finish") public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) { //1.校验是否全部自动赋码 @@ -161,9 +176,11 @@ public class IoCollectOrderController extends BaseController { if (bindWorkRequest.getCollOrder() != null) { IoCollectOrder collectOrder = bindWorkRequest.getCollOrder(); collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode()); + collectOrder.setTagStatus(1); collectOrderService.updateById(collectOrder); } else { for (IoCollectOrder collectOrder : bindWorkRequest.getList()) { + collectOrder.setTagStatus(1); collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode()); } collectOrderService.updateBatchById(bindWorkRequest.getList());