From 030bb804a743175ff5f258da3302dfa5442e5d4d Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 7 Jan 2025 09:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8D=95=E6=8D=AE=E6=AD=BB?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderService.java        | 71 +++++--------------
 .../service/collect/down/YPCF002Download.java | 39 +++++-----
 src/main/resources/schemas/schema_v2.4.sql    |  7 +-
 3 files changed, 42 insertions(+), 75 deletions(-)

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 0fc4b9b26..63632c994 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -148,7 +148,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     @Resource
     UdiRelevanceDao udiRelevanceDao;
 
-
     public IoCollectOrder getByBillNo(String billNo) {
         return collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo).last("limit 1"));
     }
@@ -651,7 +650,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         if (CollUtil.isNotEmpty(ioCollectOrderList)) {
 
             //是否自动转成待处理单据
-            Boolean autoDealOrder = collectSetService.getSet().getAutoDealOrder();
+            IoCollectSet collectSet = collectSetService.getSet();
 
             List<IoCollectOrder> allotCollects = new ArrayList<>();
             List<IoCollectOrderBiz> allotCollectBizs = new ArrayList<>();
@@ -664,46 +663,10 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 if (sysWorkplaceDocumentEntity == null) {
                     continue;
                 }
-                //暂时不自动分配工位
-//                if (collectOrder.getWorkPlaceCode() == null) {
-//                    //自动分配工位
-//                    final Long[] defaultWorkplace = {null};
-//                    List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(addr);
-//                    if (CollUtil.isNotEmpty(sysWorkplaces)) {
-//                        if (sysWorkplaces.size() == 1) {
-//                            defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId();
-//                        } else {
-//                            List<SysWorkplaceResponse> addWorkplace = new ArrayList<>();
-//                            for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) {
-//                                //获取是否有正在处理的工位
-//                                List<IoCollectOrder> collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper<IoCollectOrder>()
-//                                        .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2));
-//                                sysWorkplace.setOrderCount(collectOrderList1.size());
-//                                if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) {
-//                                    addWorkplace.add(sysWorkplace);
-//                                }
-//                            }
-//                            if (addWorkplace.size() > 0) {
-//                                Optional<SysWorkplaceResponse> minCountObject = addWorkplace.stream()
-//                                        .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount()));
-//                                minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId());
-//                            } else {
-//                                defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId();
-//                            }
-//                        }
-//                    }
-//                    collectOrder.setWorkPlaceCode(defaultWorkplace[0]);
-//                }
 
-//                collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
                 collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());
                 BeanUtils.copyProperties(collectOrder, ioCollectOrderOrigin);
-                boolean save = collectOrderOriginService.save(ioCollectOrderOrigin);
-                if (!save) {
-                    throw new JsonException(500, "charu cuowu ");
-                }
-
-
+                collectOrderOriginService.save(ioCollectOrderOrigin);
                 List<IoCollectOrderBiz> bizList = collectOrder.getBizList();
                 if (CollUtil.isNotEmpty(bizList)) {
                     //先清空 原来的biz
@@ -727,7 +690,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     collectOrderBizOriginService.saveBatch(ioCollectOrderBizOrigins);
                 }
 
-                if (!collectOrder.getTagStatus().equals(4) && autoDealOrder) {//没出现耗材不匹配 且 开启了自动转成待处理单据
+                if (!collectOrder.getTagStatus().equals(4) && IntUtil.value(collectSet.getAutoDealOrder())) {//没出现耗材不匹配 且 开启了自动转成待处理单据
                     collectOrder.setTagStatus(1);
                     allotCollects.add(collectOrder);
                     allotCollectBizs.addAll(bizList);
@@ -737,19 +700,22 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             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) {
-                        boolean b = splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
-                        if (b && sysWorkplaceDocumentEntity.getAutoHandle()) {
-                            //单据是否自动完成 是 调用 完成
-                            CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
-                            AuthAdmin user = customerService.getUserBean();
-                            collectOrderRequest.setUpdateUser(user.getId());
-                            finishOrder(collectOrderRequest, user, true);
+
+                if (IntUtil.value(collectSet.getAutoFinishOrder()))
+                    for (IoCollectOrder collectOrder : allotCollects) {
+                        SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(addr);
+                        if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
+                            boolean b = splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
+                            if (b && sysWorkplaceDocumentEntity.getAutoHandle()) {
+                                //单据是否自动完成 是 调用 完成
+                                CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
+                                AuthAdmin user = customerService.getUserBean();
+                                collectOrderRequest.setUpdateUser(user.getId());
+                                collectOrderRequest.setBusType(addr);
+                                finishOrder(collectOrderRequest, user, true);
+                            }
                         }
                     }
-                }
             }
         }
     }
@@ -1194,8 +1160,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
         }
 
-        if (CollUtil.isNotEmpty(ioCollectOrders)){
+        if (CollUtil.isNotEmpty(ioCollectOrders)) {
             CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
+
             collectOrderRequest.setBusType("YPCF002");
             collectOrderRequest.setCreateUser(String.valueOf(customerService.getUserId()));
             collectOrderRequest.setWorkPlaceCode(null);
diff --git a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
index 87c98465f..f894c8b8e 100644
--- a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
+++ b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
@@ -27,21 +27,21 @@ public class YPCF002Download implements IDownload {
     @Override
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
 
-            int page = 1;
-            int limit = 100;
-            GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
-            getSickPrescribeRequest.setLimit(limit);
-            getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
-            getSickPrescribeRequest.setThirdSys("thirdId");
-            getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
-            getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
-            getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
-            getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
-            getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
-            getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType());
-            while (true) {
-                List<IoCollectOrder> list;
-                try {
+        int page = 1;
+        int limit = 100;
+        GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
+        getSickPrescribeRequest.setLimit(limit);
+        getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
+        getSickPrescribeRequest.setThirdSys("thirdId");
+        getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+        getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
+        getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
+        getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
+        getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
+        getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType());
+        while (true) {
+            List<IoCollectOrder> list;
+            try {
                 getSickPrescribeRequest.setPage(page);
                 BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
 
@@ -61,11 +61,12 @@ public class YPCF002Download implements IDownload {
                 } else {
                     return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
                 }
-                }catch (Exception e){
-                    System.out.println("下载三方错误==="+e.getMessage()+"==="+collectOrderRequest);
-                    e.printStackTrace();
-                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ResultVOUtils.error(500, e.getMessage());
+
             }
+        }
 
 
         return ResultVOUtils.success("下载成功");
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 28570ea54..7f8deb8dc 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4759,10 +4759,6 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'lastCodeSplit',
                          ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用扫码拆零确认 0:关闭 1:启用''',
                          1);
 
-CALL Pro_Temp_ColumnWork('io_collect_set', 'getSplitConfirm',
-                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用取药拆零确认0:关闭 1:启用''',
-                         1);
-
 CREATE TABLE IF NOT EXISTS `sys_workplace_layer`
 (
     `id`          int                                                           NOT NULL AUTO_INCREMENT,
@@ -5115,6 +5111,9 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'ledNum',
                          '  int DEFAULT NULL COMMENT ''灯组颜色''',
                          1);
 
+CALL Pro_Temp_ColumnWork('io_collect_set', 'getSplitConfirm',
+                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用取药拆零确认0:关闭 1:启用''',
+                         1);
 
 CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'isSingQueue',
                          ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用单品种槽位 0:关闭 1:开启''',