From 56bc53c235393331a0ed5bc07d2ed5d9dfc4df7a 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, 25 Dec 2020 23:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=97=E8=A1=A8=E5=BA=93=E5=AD=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/DepotItemController.java    |  5 ++++-
 .../datasource/entities/DepotItemVo4WithInfoEx.java    | 10 ++++++++++
 src/main/resources/mapper_xml/DepotItemMapperEx.xml    |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 02f8caf4..a6760639 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -156,7 +156,10 @@ public class DepotItemController {
                     if(ratio!=null){
                         BigDecimal ratioDecimal = new BigDecimal(ratio.toString());
                         if(ratioDecimal.compareTo(BigDecimal.ZERO)!=0){
-                            stock = stock.divide(ratioDecimal,2,BigDecimal.ROUND_HALF_UP); //两位小数
+                            String otherUnit = diEx.getOtherUnit();
+                            if(otherUnit.equals(diEx.getMaterialUnit())) {
+                                stock = stock.divide(ratioDecimal,2,BigDecimal.ROUND_HALF_UP); //两位小数
+                            }
                         }
                     }
                     item.put("Stock", stock);
diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
index ff011967..3a642dc8 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
@@ -34,6 +34,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
 
     private Integer ratio;
 
+    private String otherUnit;
+
     private BigDecimal presetPriceOne;
 
     private String priceStrategy;
@@ -162,6 +164,14 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
         this.ratio = ratio;
     }
 
+    public String getOtherUnit() {
+        return otherUnit;
+    }
+
+    public void setOtherUnit(String otherUnit) {
+        this.otherUnit = otherUnit;
+    }
+
     public BigDecimal getPresetPriceOne() {
         return presetPriceOne;
     }
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 9eab863d..f2506057 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -30,6 +30,7 @@
         <result column="UnitId" jdbcType="BIGINT" property="UnitId" />
         <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
         <result column="ratio" jdbcType="INTEGER" property="ratio" />
+        <result column="other_unit" jdbcType="INTEGER" property="otherUnit" />
         <result column="barCode" jdbcType="VARCHAR" property="barCode" />
     </resultMap>
 
@@ -141,7 +142,7 @@
     <select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
         select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,
         m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,
-        dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.name unit_name, u.ratio, me.bar_code barCode
+        dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.name unit_name, u.ratio, u.other_unit, me.bar_code barCode
         from jsh_depot_item di
         left join jsh_material m on di.material_id=m.id  and ifnull(m.delete_flag,'0') !='1'
         left join jsh_material_extend me on me.id=di.material_extend_id  and ifnull(me.delete_Flag,'0') !='1'