From ccddd39dbf422d5ea587c511b4cfce8c0ce3710d Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 21 Oct 2024 15:30:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=89=E5=8F=96=E5=A4=96=E7=BD=91?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           | 15 +++++++++++
 .../collect/IoCollectOrderService.java        | 25 +++++++++++++------
 .../collect/IoCollectOriginService.java       |  1 +
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 26a124235..2550dfc79 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -194,6 +194,21 @@ public class IoCodeTempController extends BaseController {
                 response.setData(collectOrder);
                 return response;
             } else {
+                BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest);
+                if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) {
+                    collectOrder = collectOrderService.unionSearch(null, null, code);
+                    //=============================================//
+                    if (collectOrder != null) {
+                        collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
+                        collectOrder.setBusType(addEnterCodeRequest.getBusType());
+                        IoCollectOrder ioCollectOrder = new IoCollectOrder();
+                        BeanUtils.copyProperties(collectOrder, ioCollectOrder);
+                        collectOrderService.updateById(ioCollectOrder);
+                        BaseResponse response = ResultVOUtils.error(601, code);
+                        response.setData(collectOrder);
+                        return response;
+                    }
+                }
                 BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage());
                 response.setData(code);
                 return response;
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 41a596fef..a66c11c40 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -57,6 +57,7 @@ import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inout.impl.IoCodeService;
+import com.glxp.api.service.thrsys.SysWorkplacePutRelService;
 import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
@@ -288,10 +289,10 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             String mainAction = ioOrderEntity.getMainAction();
             String fromCorpName = "";
             String shipperName = "";
-            if (mainAction.equals(ConstantType.TYPE_PUT)){
+            if (mainAction.equals(ConstantType.TYPE_PUT)) {
                 shipperName = ioOrderEntity.getFromName();
                 fromCorpName = ioOrderEntity.getDeptName();
-            }else {
+            } else {
                 shipperName = ioOrderEntity.getDeptName();
                 fromCorpName = ioOrderEntity.getFromName();
             }
@@ -315,7 +316,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             }
             save(collectOrder);
             IoCollectOrderOrigin ioCollectOrderOrigin = new IoCollectOrderOrigin();
-            BeanUtils.copyProperties(collectOrder,ioCollectOrderOrigin);
+            BeanUtils.copyProperties(collectOrder, ioCollectOrderOrigin);
             ioCollectOrderOrigin.setTagStatus(2);
             collectOrderOriginService.saveOrUpdate(ioCollectOrderOrigin);
 
@@ -346,7 +347,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 }
                 collectOrderBizs.add(collectOrderBiz);
                 IoCollectOrderBizOrigin ioCollectOrderBizOrigin = new IoCollectOrderBizOrigin();
-                BeanUtils.copyProperties(collectOrderBiz,ioCollectOrderBizOrigin);
+                BeanUtils.copyProperties(collectOrderBiz, ioCollectOrderBizOrigin);
                 ioCollectOrderBizOrigin.setId(null);
                 collectOrderOriginBizs.add(ioCollectOrderBizOrigin);
             }
@@ -376,10 +377,10 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             String mainAction = ioOrderEntity.getMainAction();
             String fromCorpName = "";
             String shipperName = "";
-            if (mainAction.equals(ConstantType.TYPE_PUT)){
+            if (mainAction.equals(ConstantType.TYPE_PUT)) {
                 shipperName = ioOrderEntity.getFromName();
                 fromCorpName = ioOrderEntity.getDeptName();
-            }else {
+            } else {
                 shipperName = ioOrderEntity.getDeptName();
                 fromCorpName = ioOrderEntity.getFromName();
             }
@@ -432,13 +433,12 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         }
 
         PageInfo<IoCollectOrder> pageInfoReturn = new PageInfo<>(ioCollectOrders);
-        BeanUtils.copyProperties(pageInfo,pageInfoReturn);
+        BeanUtils.copyProperties(pageInfo, pageInfoReturn);
         pageInfoReturn.setList(ioCollectOrders);
         return ResultVOUtils.success(pageInfoReturn);
     }
 
 
-
     public void importPrescribe(List<BasicSkPrescribeEntity> basicSkPrescribeEntities) {
         //下载处方
         if (CollUtil.isEmpty(basicSkPrescribeEntities))
@@ -714,14 +714,23 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 .eq(IoCollectOrder::getId, collectOrderRequest.getId()).update();
     }
 
+    SysWorkplacePutRelService sysWorkplacePutRelService;
+
     public void finishOrder(CollectOrderRequest collectOrderRequest) {
         IoCollectOrder collectOrder = new IoCollectOrder();
         BeanUtils.copyProperties(collectOrderRequest, collectOrder);
         collectOrder.setTagStatus(3);
         collectOrder.setUpdateTime(new Date());
 //        updateByBillNo(collectOrder);
+
+//        Long putWorkPlace = null;
+//        SysWorkplacePutRel sysWorkplacePutRel = sysWorkplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
+//        if (sysWorkplacePutRel != null) {
+//            putWorkPlace = sysWorkplacePutRel.getWorkPlaceCode();
+//        }
         splitCodeService.finishAutoTagCode(collectOrder);
 
+
         //插入备用表
         IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
         BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
index 337c51113..459f6dd82 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
@@ -19,6 +19,7 @@ import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.entity.collect.IoCollectOrderBizOrigin;
 import com.glxp.api.entity.collect.IoCollectOrderOrigin;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.GetSickPrescribeRequest;