From a20b5ebf358b9cf6ead402d292a4f28d64269783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 3 Dec 2021 23:46:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=93=E5=AD=98=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=9A=84bug?=
 =?UTF-8?q?=EF=BC=88=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E6=94=B9=E9=80=A0?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/DepotItemController.java    | 6 +++---
 .../src/main/resources/mapper_xml/DepotItemMapperEx.xml     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 7f79965c..0e50b583 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -546,10 +546,10 @@ public class DepotItemController {
      */
     public String getUName(String materialUnit, String uName) {
         String unitName = null;
-        if(!StringUtil.isEmpty(materialUnit)) {
+        if(StringUtil.isNotEmpty(materialUnit)) {
             unitName = materialUnit;
-        } else if(!StringUtil.isEmpty(uName)) {
-            unitName = uName.substring(0,uName.indexOf(","));
+        } else if(StringUtil.isNotEmpty(uName)) {
+            unitName = uName;
         }
         return unitName;
     }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 2219c6e9..21ce7f24 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -425,7 +425,7 @@
     <select id="findStockWarningCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStockWarningCount">
         select m.id MId, m.name MName, me.bar_code, m.mfrs MMfrs, m.model MModel, m.standard MStandard,m.color MColor,
         m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,d.name depotName,
-        m.unit MaterialUnit, u.name unit_name,mcs.current_number,
+        m.unit MaterialUnit, u.basic_unit unit_name,mcs.current_number,
         ifnull(mis.low_safe_stock,0) low_safe_stock, ifnull(mis.high_safe_stock,0) high_safe_stock
         from jsh_material m
         left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_Flag,'0') !='1'