From 3530c49555ae3a98c37aa60a332c351e101b879e Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 19 Oct 2024 17:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 14 ++++++++++---- src/main/resources/schemas/schema_v2.4.sql | 4 +++- 2 files changed, 13 insertions(+), 5 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 bf0a4df7d..26a124235 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -2664,11 +2664,17 @@ public class IoCodeTempController extends BaseController { List codeList = new ArrayList<>(); collectOrderBizResponses.forEach(item -> { String code = item.getFinishUdiCode(); - Integer reCountObj = item.getScanCount(); - int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null,则默认为0次迭代 - for (int i = 0; i < reCount; i++) { - codeList.add(code); + if (StrUtil.isNotBlank(code) && code.contains(";")) { + List partsList = Arrays.asList(code.split(";")); + codeList.addAll(partsList); + } else { + Integer reCountObj = item.getScanCount(); + int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null,则默认为0次迭代 + for (int i = 0; i < reCount; i++) { + codeList.add(code); + } } + }); addOrderCodeRequest.setCodeList(codeList); addOrderCodeRequest.setCorpOrderId(orderFinishBillNo); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 1bf5c14d9..a21055e00 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4558,4 +4558,6 @@ CALL Pro_Temp_ColumnWork('io_collect_order_code_man', 'scanActCount', CALL Pro_Temp_ColumnWork('io_code_temp', 'drugLink', ' tinyint NULL DEFAULT b''0''COMMENT ''药品关联关系是否存在 0不存在 1存在''', - 1); \ No newline at end of file + 1); + +