From fe6a7c18b184faebef24103e3ce6653cff763965 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 5 Sep 2024 17:00:48 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/collect/IoCollectOrderController.java  | 2 +-
 .../glxp/api/controller/thrsys/ThrProductsController.java | 6 +++---
 .../com/glxp/api/service/basic/UdiProductService.java     | 2 +-
 .../glxp/api/service/collect/IoCollectOrderService.java   | 4 +---
 .../com/glxp/api/service/inout/IoSplitCodeService.java    | 4 ++--
 src/main/resources/schemas/schema_v2.4.sql                | 8 ++++++++
 6 files changed, 16 insertions(+), 10 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 73ab1b826..4e5966ccf 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -257,7 +257,7 @@ public class IoCollectOrderController extends BaseController {
             collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
             List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
             boolean isAllTag = collectOrderBizResponses.stream()
-                    .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()));
+                    .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
             if (!isAllTag) {
                 return ResultVOUtils.error(502, "该业务单据未全部赋码，是否强制完成单据？");
             }
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
index d73b10265..e49c3b181 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
@@ -81,9 +81,9 @@ public class ThrProductsController {
                 BaseResponse<PageSimpleResponse<ThrProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest);
                 return udiDlDeviceResponse;
             } else {
-                if (filterThrProductsRequest.getProductType() == null) {
-                    filterThrProductsRequest.setProductType(1);
-                }
+//                if (filterThrProductsRequest.getProductType() == null) {
+//                    filterThrProductsRequest.setProductType(1);
+//                }
                 List<ThrProductsResponse> thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest);
                 PageInfo<ThrProductsResponse> pageInfo;
                 pageInfo = new PageInfo<>(thrCorpEntities);
diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 05015bab7..7048b803c 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -497,7 +497,7 @@ public class UdiProductService {
                 udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
                 udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
                 udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
-                udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
+//                udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
                 udiProductDao.insert(udiProductEntity1);
             }
         } else {
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 3eb6f7d92..040c29364 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -351,7 +351,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
     public void importPrescribe(List<BasicSkPrescribeEntity> basicSkPrescribeEntities) {
         //下载处方
-        if (CollUtil.isNotEmpty(basicSkPrescribeEntities))
+        if (CollUtil.isEmpty(basicSkPrescribeEntities))
             basicSkPrescribeEntities = basicSkPrescribeService.list();
         List<SysWorkplaceResponse> allWorksList = new ArrayList<>();
         for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
@@ -516,10 +516,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
                     splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
                 }
-
             }
         }
-
     }
 
     @Transactional(rollbackFor = Exception.class)
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 6fe3e81b8..d76f7fc8a 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -458,8 +458,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
                     }
                 }
-
-
                 continue;
             }
 
@@ -524,6 +522,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             } else
                 collectOrderBiz.setAutoTagStatus(1);
         }
+
+        collectOrderBizService.updateBatchById(collectOrderBizs);
     }
 
 
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 9a526ef44..1c4d517cb 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4337,6 +4337,14 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoTagStatus',
 CALL Pro_Temp_ColumnWork('basic_ins_drug', 'prepnSpec',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''采集规格''',
                          1);
+CALL Pro_Temp_ColumnWork('thr_products', 'prepnSpec',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''采集规格''',
+                         1);
+
+
+
+
+
 CALL Pro_Temp_ColumnWork('basic_ins_material', 'remark',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''备注''',
                          1);