From a74fe8a6c31d629b760eba5800d9ac67410ffcf6 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 9 Nov 2024 14:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=8F=96=E8=8D=AF=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=AE=8C=E6=88=90=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     | 23 +++++++++++++++++++
 .../collect/IoCollectOrderService.java        | 21 +++++++++++++++++
 2 files changed, 44 insertions(+)

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 a275ed0da..1368673df 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -427,6 +427,29 @@ public class IoCollectOrderController extends BaseController {
     }
 
 
+    /**
+     * 取货确认完成
+     *
+     * @return
+     */
+    @PostMapping("/udiwms/basic/collect/order/confirmFinish")
+    @Transactional(rollbackFor = Exception.class)
+    public BaseResponse confirmFinish(@RequestBody CollectOrderRequest collectOrderRequest) {
+        if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) {
+            return ResultVOUtils.error(500, "单据号不能为空！");
+        }
+        List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrderRequest.getBillNo());
+        boolean allConfirmed = CollUtil.isNotEmpty(collectOrderBizs) &&
+                collectOrderBizs.stream().allMatch(biz -> IntUtil.value(biz.getGetConfirm()));
+        if (allConfirmed) {
+            collectOrderService.confirmFinishOrder(collectOrderRequest, getUser());
+            return ResultVOUtils.success("单据完成！");
+        } else {
+            return ResultVOUtils.error(500, "单据未全部确认！");
+        }
+    }
+
+
     /**
      * 确认取药
      *
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 32cab79ab..e36ed00ee 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -821,7 +821,28 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         });
     }
 
+    public void confirmFinishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin) {
+        IoCollectOrder collectOrder = new IoCollectOrder();
+        BeanUtils.copyProperties(collectOrderRequest, collectOrder);
+        collectOrder.setTagStatus(3);
+        collectOrder.setUpdateTime(new Date());
+
+        //插入备用表
+        IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
+        BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
+        ioCollectOrderBackupService.save(ioCollectOrderBackup);
+
+        //删除原来单据
+        removeOrderByBillNo(collectOrder);
 
+        ThreadUtil.execAsync(() -> {
+            //插入到码表
+            collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
+            //更新数据至第三方系统
+            //单据更新
+            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin);
+        });
+    }
 
 
     private void removeOrderByBillNo(IoCollectOrder collectOrder) {