From cfc1ad8bf5bf26453467962dbf2e23fffe1704f4 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 20 Mar 2025 14:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84sql=E7=9A=84bug=EF=BC=88=E9=81=87=E5=88=B0?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=89=AF=E6=9D=A1=E7=A0=81=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=EF=BC=8C=E5=8F=AA=E5=8A=A0=E7=AC=AC=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsh/erp/service/MaterialService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
index 45b347cf..5a87c877 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
@@ -474,7 +474,8 @@ public class MaterialService {
         Map<Long, MaterialExtend> otherMaterialMap = new HashMap<>();
         List<MaterialExtend> otherDataList = materialMapperEx.getOtherMaterialList();
         for(MaterialExtend me: otherDataList) {
-            otherMaterialMap.put(me.getMaterialId(), me);
+            //遇到多个副条码的情况，只加第一个
+            otherMaterialMap.putIfAbsent(me.getMaterialId(), me);
         }
         String nameStr = "名称*,规格,型号,颜色,品牌,类别,基础重量(kg),保质期(天),基本单位*,副单位,基本条码*,副条码,比例,多属性," +
                 "采购价,零售价,销售价,最低售价,状态*,序列号,批号,仓位货架,制造商,自定义1,自定义2,自定义3,备注";