From 5fc0d84bff34cb9fb45b23173fc3027065a57463 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 13 Sep 2024 19:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           |  2 +
 .../collect/IoCollectOrderService.java        | 30 +++++++++-----
 .../collect/IoCollectOriginService.java       | 41 -------------------
 3 files changed, 22 insertions(+), 51 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 e5dee187c..d1f167917 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -223,6 +223,8 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+
+        // TODO: 2024/9/13 首次无单进入的时候报错提示，不需要执行校验
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         if (udiEntity == null) {
             String viewType = addEnterCodeRequest.getViewType();
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 1c62aebda..c98ae3e8a 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -468,11 +468,13 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
      */
     @Transactional(rollbackFor = Exception.class)
     public void importPrescribe(List<IoCollectOrder> ioCollectOrderList, String addr) {
-        //下载处方
+
         if (CollUtil.isNotEmpty(ioCollectOrderList)) {
+
+            List<IoCollectOrder> allotCollects = new ArrayList<>();
+            List<IoCollectOrderBiz> allotCollectBizs = new ArrayList<>();
             for (IoCollectOrder collectOrder : ioCollectOrderList) {
                 IoCollectOrderOrigin ioCollectOrderOrigin = new IoCollectOrderOrigin();
-
                 if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()))) {
                     continue;
                 }
@@ -514,13 +516,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
                 collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());
                 BeanUtils.copyProperties(collectOrder, ioCollectOrderOrigin);
-
-                if (!collectOrder.getTagStatus().equals(4) && collectOrder.getWorkPlaceCode() != null) {
-                    collectOrder.setTagStatus(1);
-                    this.save(collectOrder);
-                }
                 collectOrderOriginService.save(ioCollectOrderOrigin);
 
+
                 List<IoCollectOrderBiz> bizList = collectOrder.getBizList();
                 if (CollUtil.isNotEmpty(bizList)) {
                     for (IoCollectOrderBiz collectOrderBiz : bizList) {
@@ -536,12 +534,24 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                             }
                         }
                     }
-                    collectOrderBizService.saveBatch(bizList);
                     List<IoCollectOrderBizOrigin> ioCollectOrderBizOrigins = BeanCopyUtils.copyList(bizList, IoCollectOrderBizOrigin.class);
                     collectOrderBizOriginService.saveBatch(ioCollectOrderBizOrigins);
                 }
-                if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
-                    splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
+
+                if (!collectOrder.getTagStatus().equals(4)) {
+                    collectOrder.setTagStatus(1);
+                    allotCollects.add(collectOrder);
+                    allotCollectBizs.addAll(bizList);
+                }
+            }
+            if (CollUtil.isNotEmpty(allotCollects)) {
+                saveBatch(allotCollects);
+                collectOrderBizService.saveBatch(allotCollectBizs);
+                for (IoCollectOrder collectOrder : allotCollects) {
+                    SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(addr);
+                    if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
+                        splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
+                    }
                 }
             }
         }
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 e45c25b61..2a33ab0c7 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
@@ -58,47 +58,6 @@ public class IoCollectOriginService {
     @Resource
     private SysWorkplaceDocumentService sysWorkplaceDocumentService;
 
-    public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
-
-        //拉取药品处方
-        if (collectOrderRequest.getBusType().equals("YPCF002")) {
-            GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
-            getSickPrescribeRequest.setPage(1);
-            getSickPrescribeRequest.setLimit(100);
-            getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
-            getSickPrescribeRequest.setThirdSys("thirdId");
-            BaseResponse<PageSimpleResponse<BasicSkPrescribeResponse>> baseResponse = erpBasicClient.getPrescribe(getSickPrescribeRequest);
-
-            if (baseResponse.getCode() == 20000) {
-                List<BasicSkPrescribeResponse> list = baseResponse.getData().getList();
-                List<BasicSkPrescribeEntity> basicSkPrescribeEntities = new ArrayList<>();
-                list.forEach(item -> {
-                    BasicSkPrescribeEntity basicSkPrescribeEntity = new BasicSkPrescribeEntity();
-                    BeanUtil.copyProperties(item, basicSkPrescribeEntity);
-                    basicSkPrescribeEntity.setSickerCode(item.getSickCode());
-                    basicSkPrescribeEntity.setUpdateTime(LocalDateTime.now());
-                    List<BasicSkPrescribeItemEntity> skPrescribeItemEntities = item.getItemList();
-                    if (CollUtil.isNotEmpty(skPrescribeItemEntities)) {
-                        basicSkPrescirbeDetailService.remove(new QueryWrapper<BasicSkPrescribeItemEntity>().eq("prescribeCode", item.getCode()));
-                        for (BasicSkPrescribeItemEntity skPrescribeItemEntity : skPrescribeItemEntities) {
-                            skPrescribeItemEntity.setPrescribeCode(item.getCode());
-                            skPrescribeItemEntity.setSickerCode(item.getSickCode());
-                            skPrescribeItemEntity.setAdNum(basicSkPrescribeEntity.getAdNum());
-                            skPrescribeItemEntity.setId(IdUtil.getSnowflakeNextId());
-                            basicSkPrescirbeDetailService.save(skPrescribeItemEntity);
-                        }
-                    }
-                    basicSkPrescribeEntities.add(basicSkPrescribeEntity);
-                    basicSkPrescribeService.saveOrUpdate(basicSkPrescribeEntity);
-                });
-                collectOrderService.importPrescribe(basicSkPrescribeEntities);
-                return ResultVOUtils.success("下载成功");
-            }
-        }
-        return ResultVOUtils.error("下载失败");
-
-    }
-
     public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) {
         //条件
         String busType = collectOrderRequest.getBusType();