From 59a762c5bf2b92939bd5e8a5b9f161a6e5dbb80e Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 2 Sep 2024 10:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=E4=B8=8E?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java          | 14 ++++++++++++++
 .../api/service/collect/IoCollectOrderService.java |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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 c9aa2bad8..e7860d5bf 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -310,4 +310,18 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 单据上传
+     *
+     * @param collectOrderRequest
+     * @return
+     */
+    @PostMapping("/udiwms/basic/collect/order/upload")
+    public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) {
+        if (StrUtil.isEmpty(collectOrderRequest.getBillNo()))
+            return ResultVOUtils.error(500, "单据号不能为空");
+        collectOrderService.generateOrder(collectOrderRequest.getBillNo());
+        return ResultVOUtils.success();
+    }
+
 }
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 57451f374..2e9525dbc 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -534,7 +534,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     /**
      * @param billNo
      */
-    private void generateOrder(String billNo) {
+    public void generateOrder(String billNo) {
 
         IoCollectOrder collectOrder = getByBillNo(billNo);
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
@@ -584,7 +584,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             orderService.update(orderEntity);
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 2) {
             //todo  根据单据类型上传医保或者第三方系统
-
+            
 
         }