From 151ad2ed2d4af50512be447ae9f602385d6166b5 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 9 Dec 2024 15:00:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=81=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A5=E6=89=AB=E7=A0=81=E6=98=8E=E7=BB=86=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderService.java        | 40 +++++++++++++++++--
 src/main/resources/schemas/schema_v2.1.sql    |  2 +
 src/main/resources/schemas/schema_v2.4.sql    |  3 ++
 3 files changed, 41 insertions(+), 4 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 6e24942ff..d732b4459 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -27,10 +27,7 @@ import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.collect.*;
-import com.glxp.api.entity.inout.IoCodeTempEntity;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderEntity;
-import com.glxp.api.entity.inout.IoSplitFifoInv;
+import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvCountOrderDetailEntity;
 import com.glxp.api.entity.inv.InvCountOrderEntity;
 import com.glxp.api.entity.inv.InvCountSettingEntity;
@@ -370,6 +367,41 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             if (CollUtil.isNotEmpty(collectOrderOriginBizs)) {
                 collectOrderBizOriginService.saveBatch(collectOrderOriginBizs);
             }
+
+            //导入扫码明细
+            List<IoCodeEntity> codeEntities = codeService.findByOrderId(ioOrderEntity.getBillNo());
+            List<IoCollectOrderCodeMan> collectOrderCodeManList = new ArrayList<>();
+            if (CollUtil.isNotEmpty(codeEntities)) {
+                for (IoCodeEntity codeEntity : codeEntities) {
+                    IoCollectOrderBiz mCollectOrderBiz = null;
+                    for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
+                        if (collectOrderBiz.getRelId().equals(codeEntity.getRelId())
+                                && StrUtil.trimToEmpty(collectOrderBiz.getBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getBatchNo()))) {
+                            mCollectOrderBiz = collectOrderBiz;
+                            continue;
+                        }
+                    }
+                    collectOrderCodeManList.add(IoCollectOrderCodeMan.builder()
+                            .udiCode(codeEntity.getCode())
+                            .orderIdFk(collectOrder.getBillNo())
+                            .bizIdFk(mCollectOrderBiz == null ? null : mCollectOrderBiz.getId())
+                            .relId(codeEntity.getRelId())
+                            .nameCode(codeEntity.getNameCode())
+                            .batchNo(codeEntity.getBatchNo())
+                            .serialNo(codeEntity.getSerialNo())
+                            .productDate(codeEntity.getProduceDate())
+                            .expireDate(codeEntity.getExpireDate())
+                            .createTime(new Date())
+                            .createUser(1l)
+                            .updateTime(new Date())
+                            .updateUser(1l)
+                            .scanCount(1)
+                            .isSplitCode(false)
+                            .scanActCount(1)
+                            .build());
+                }
+                collectOrderCodeManService.saveBatch(collectOrderCodeManList);
+            }
         }
         return ResultVOUtils.success("下载成功");
     }
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index a23792c24..ca85205b4 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -504,6 +504,8 @@ call Modify_index('basic_products', 'nameCode', 'idex_nameCode', 'BTREE');
 
 
 
+
+
 CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_products', 'cgzmraqxgxx', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_products', 'sfbjwycxsy', 'varchar(255)', 1);
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 4c22f24e4..8f08f4db7 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4899,3 +4899,6 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `update_by`, `update_time`, `remark`)
  VALUES (6001, '医保上传统计', 5210, 999, 'inout/split/tag/stats', 'collect/CollectOrderStatsNew', NULL, 1, 0, 'C', '0', '0', NULL, '', '超级用户', '2024-11-18 17:46:08', NULL, NULL, NULL);
 
+
+
+call Modify_UNIQUE_index('io_collect_order_biz', 'orderIdFk`, `relId`, `batchNo', 'sorts', 'BTREE');