From 0dde92a03580e2839727fc78f0132b92b5aa3928 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, 6 Jun 2020 00:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/MaterialController.java   | 12 ++++++------
 src/main/resources/mapper_xml/MaterialMapperEx.xml   |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index 094bb0a8..4e33fb7f 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -288,7 +288,7 @@ public class MaterialController {
         try {
             List<MaterialVo4Unit> dataList = materialService.findByAll(StringUtil.toNull(name), StringUtil.toNull(model),
                     StringUtil.toNull(categoryIds));
-            String[] names = {"名称", "类型", "型号", "安全存量", "单位", "零售价", "最低售价", "预计采购价", "批发价", "备注", "状态"};
+            String[] names = {"名称", "类型", "型号", "安全存量", "单位", "零售价", "最低售价", "采购价", "销售价", "备注", "状态"};
             String title = "商品信息";
             List<String[]> objects = new ArrayList<String[]>();
             if (null != dataList) {
@@ -298,11 +298,11 @@ public class MaterialController {
                     objs[1] = m.getCategoryName();
                     objs[2] = m.getModel();
                     objs[3] = m.getSafetystock() == null? "" : m.getSafetystock().toString();
-                    objs[4] = m.getUnit();
-                    objs[5] = "";
-                    objs[6] = "";
-                    objs[7] = "";
-                    objs[8] = "";
+                    objs[4] = m.getCommodityUnit();
+                    objs[5] = m.getCommodityDecimal() == null? "" : m.getCommodityDecimal().toString();
+                    objs[6] = m.getLowDecimal() == null? "" : m.getLowDecimal().toString();
+                    objs[7] = m.getPurchaseDecimal() == null? "" : m.getPurchaseDecimal().toString();
+                    objs[8] = m.getWholesaleDecimal() == null? "" : m.getWholesaleDecimal().toString();
                     objs[9] = m.getRemark();
                     objs[10] = m.getEnabled() ? "启用" : "禁用";
                     objects.add(objs);
diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 6f2f0101..ac6ace68 100644
--- a/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -5,6 +5,7 @@
         <result column="unitName" jdbcType="VARCHAR" property="unitName" />
         <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
         <result column="bar_code" jdbcType="VARCHAR" property="mBarCode" />
+        <result column="commodity_unit" jdbcType="VARCHAR" property="commodityUnit" />
         <result column="purchase_decimal" jdbcType="VARCHAR" property="purchaseDecimal" />
         <result column="commodity_decimal" jdbcType="VARCHAR" property="commodityDecimal" />
         <result column="wholesale_decimal" jdbcType="VARCHAR" property="wholesaleDecimal" />
@@ -124,11 +125,14 @@
     </select>
 
     <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
-        select m.*,u.uname unitName, mc.name categoryName
+        select m.*,u.uname unitName, mc.name categoryName,me.commodity_unit,me.purchase_decimal, me.commodity_decimal,
+        me.wholesale_decimal, me.low_decimal
         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.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1'
         left JOIN jsh_materialcategory mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
         where 1=1
+        and me.default_flag=1
         <if test="name != null">
             and m.name like '%${name}%'
         </if>