From 80e0790b895c3aaccabc4711d72aaca3c20ecbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 7 Aug 2021 23:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/material/MaterialService.java | 46 +++++++++----------
 .../resources/mapper_xml/MaterialMapperEx.xml |  3 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
index b8f861ff..5e07d7f0 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -120,32 +120,32 @@ public class MaterialService {
                 idList = getListByParentId(Long.parseLong(categoryId));
             }
             list= materialMapperEx.selectByConditionMaterial(barCode, name, standard, model, idList, mpList, offset, rows);
+            if (null != list) {
+                for (MaterialVo4Unit m : list) {
+                    //扩展信息
+                    String materialOther = "";
+                    for (int i = 0; i < mpArr.length; i++) {
+                        if (mpArr[i].equals("制造商")) {
+                            materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
+                        }
+                        if (mpArr[i].equals("自定义1")) {
+                            materialOther = materialOther + ((m.getOtherField1() == null || m.getOtherField1().equals("")) ? "" : "(" + m.getOtherField1() + ")");
+                        }
+                        if (mpArr[i].equals("自定义2")) {
+                            materialOther = materialOther + ((m.getOtherField2() == null || m.getOtherField2().equals("")) ? "" : "(" + m.getOtherField2() + ")");
+                        }
+                        if (mpArr[i].equals("自定义3")) {
+                            materialOther = materialOther + ((m.getOtherField3() == null || m.getOtherField3().equals("")) ? "" : "(" + m.getOtherField3() + ")");
+                        }
+                    }
+                    m.setMaterialOther(materialOther);
+                    m.setStock(depotItemService.getStockByParam(null,m.getId(),null,null));
+                    resList.add(m);
+                }
+            }
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
-        if (null != list) {
-            for (MaterialVo4Unit m : list) {
-                //扩展信息
-                String materialOther = "";
-                for (int i = 0; i < mpArr.length; i++) {
-                    if (mpArr[i].equals("制造商")) {
-                        materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
-                    }
-                    if (mpArr[i].equals("自定义1")) {
-                        materialOther = materialOther + ((m.getOtherField1() == null || m.getOtherField1().equals("")) ? "" : "(" + m.getOtherField1() + ")");
-                    }
-                    if (mpArr[i].equals("自定义2")) {
-                        materialOther = materialOther + ((m.getOtherField2() == null || m.getOtherField2().equals("")) ? "" : "(" + m.getOtherField2() + ")");
-                    }
-                    if (mpArr[i].equals("自定义3")) {
-                        materialOther = materialOther + ((m.getOtherField3() == null || m.getOtherField3().equals("")) ? "" : "(" + m.getOtherField3() + ")");
-                    }
-                }
-                m.setMaterialOther(materialOther);
-                m.setStock(depotItemService.getStockByParam(null,m.getId(),null,null));
-                resList.add(m);
-            }
-        }
         return resList;
     }
 
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index be14425b..07e07db8 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -10,6 +10,7 @@
         <result column="commodity_decimal" jdbcType="VARCHAR" property="commodityDecimal" />
         <result column="wholesale_decimal" jdbcType="VARCHAR" property="wholesaleDecimal" />
         <result column="low_decimal" jdbcType="VARCHAR" property="lowDecimal" />
+        <result column="sku" jdbcType="VARCHAR" property="sku" />
     </resultMap>
 
     <resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultMapListWithStock" type="com.jsh.erp.datasource.entities.MaterialVo4Unit">
@@ -30,7 +31,7 @@
 
     <select id="selectByConditionMaterial" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
         select m.*,u.name unitName, mc.name categoryName, me.bar_code,
-        me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal
+        me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal,me.sku
         FROM jsh_material m
         left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1'
         left JOIN jsh_unit u on m.unit_id = u.id and ifnull(u.delete_Flag,'0') !='1'