From 426adf2ad6c6124273aef087a67142b41a37b1fd 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, 1 Apr 2023 23:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotItemController.java   | 11 ++------
 .../vo/DepotItemVoBatchNumberList.java        | 18 ++++++++++++
 .../service/depotItem/DepotItemService.java   | 28 +++++++++++++++----
 .../mapper_xml/DepotItemMapperEx.xml          | 12 +++++---
 4 files changed, 50 insertions(+), 19 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 bae01d1e..bdd131f6 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
@@ -845,16 +845,9 @@ public class DepotItemController {
                 DepotItem depotItem = depotItemService.getDepotItem(depotItemId);
                 number = depotHeadService.getDepotHead(depotItem.getHeaderId()).getNumber();
             }
-            List<DepotItemVoBatchNumberList> reslist = new ArrayList<>();
             List<DepotItemVoBatchNumberList> list = depotItemService.getBatchNumberList(number, name, depotId, barCode, batchNumber);
-            for(DepotItemVoBatchNumberList bn: list) {
-                if(bn.getTotalNum()!=null && bn.getTotalNum().compareTo(BigDecimal.ZERO)>0) {
-                    reslist.add(bn);
-                }
-                bn.setExpirationDateStr(Tools.parseDateToStr(bn.getExpirationDate()));
-            }
-            map.put("rows", reslist);
-            map.put("total", reslist.size());
+            map.put("rows", list);
+            map.put("total", list.size());
             res.code = 200;
             res.data = map;
         } catch (Exception e) {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemVoBatchNumberList.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemVoBatchNumberList.java
index 25a78e35..ea7a90b8 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemVoBatchNumberList.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemVoBatchNumberList.java
@@ -11,6 +11,8 @@ public class DepotItemVoBatchNumberList {
     private String name;
     private String standard;
     private String model;
+    private Long unitId;
+    private String commodityUnit;
     private String batchNumber;
     private Date expirationDate;
     private String expirationDateStr;
@@ -56,6 +58,22 @@ public class DepotItemVoBatchNumberList {
         this.model = model;
     }
 
+    public Long getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Long unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getCommodityUnit() {
+        return commodityUnit;
+    }
+
+    public void setCommodityUnit(String commodityUnit) {
+        this.commodityUnit = commodityUnit;
+    }
+
     public String getBatchNumber() {
         return batchNumber;
     }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index ba4a317c..0986fd31 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -13,14 +13,14 @@ import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
 import com.jsh.erp.service.depot.DepotService;
 import com.jsh.erp.service.depotHead.DepotHeadService;
-import com.jsh.erp.service.materialExtend.MaterialExtendService;
 import com.jsh.erp.service.log.LogService;
 import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.materialExtend.MaterialExtendService;
 import com.jsh.erp.service.role.RoleService;
 import com.jsh.erp.service.serialNumber.SerialNumberService;
 import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.unit.UnitService;
 import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.utils.QueryUtils;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;
 import org.slf4j.Logger;
@@ -31,7 +31,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class DepotItemService {
@@ -65,7 +68,7 @@ public class DepotItemService {
     @Resource
     private DepotService depotService;
     @Resource
-    private RoleService roleService;
+    private UnitService unitService;
     @Resource
     private MaterialCurrentStockMapper materialCurrentStockMapper;
     @Resource
@@ -1087,8 +1090,21 @@ public class DepotItemService {
         return count;
     }
 
-    public List<DepotItemVoBatchNumberList> getBatchNumberList(String number, String name, Long depotId, String barCode, String batchNumber){
-        return depotItemMapperEx.getBatchNumberList(StringUtil.toNull(number), name, depotId, barCode, batchNumber);
+    public List<DepotItemVoBatchNumberList> getBatchNumberList(String number, String name, Long depotId, String barCode, String batchNumber) throws Exception {
+        List<DepotItemVoBatchNumberList> reslist = new ArrayList<>();
+        List<DepotItemVoBatchNumberList> list =  depotItemMapperEx.getBatchNumberList(StringUtil.toNull(number), name, depotId, barCode, batchNumber);
+        for(DepotItemVoBatchNumberList bn: list) {
+            if(bn.getTotalNum()!=null && bn.getTotalNum().compareTo(BigDecimal.ZERO)>0) {
+                bn.setExpirationDateStr(Tools.parseDateToStr(bn.getExpirationDate()));
+                if(bn.getUnitId()!=null) {
+                    Unit unit = unitService.getUnit(bn.getUnitId());
+                    String commodityUnit = bn.getCommodityUnit();
+                    bn.setTotalNum(unitService.parseStockByUnit(bn.getTotalNum(), unit, commodityUnit));
+                }
+                reslist.add(bn);
+            }
+        }
+        return reslist;
     }
 
     public Long getCountByMaterialAndDepot(Long mId, Long depotId) {
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 0295d7bb..620074d9 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -88,6 +88,8 @@
         <result column="name" jdbcType="VARCHAR" property="name" />
         <result column="standard" jdbcType="VARCHAR" property="standard" />
         <result column="model" jdbcType="VARCHAR" property="model" />
+        <result column="unit_id" jdbcType="BIGINT" property="unitId" />
+        <result column="commodity_unit" jdbcType="VARCHAR" property="commodityUnit" />
         <result column="batch_number" jdbcType="VARCHAR" property="batchNumber" />
         <result column="expiration_date" jdbcType="TIMESTAMP" property="expirationDate" />
         <result column="total_num" jdbcType="VARCHAR" property="totalNum" />
@@ -841,14 +843,16 @@
     </select>
 
     <select id="getBatchNumberList" resultMap="batchNumberListMap">
-        select id, bar_code, name, standard, model, batch_number, expiration_date, sum(basic_number) total_num from
-        (select di.batch_number id, me.bar_code, m.name, m.standard, m.model,di.batch_number,di.expiration_date,
-        di.basic_number*(case dh.type when '入库' then 1 when '出库' then -1 end) as basic_number
+        select id, bar_code, name, standard, model, unit_id,
+        commodity_unit, batch_number, expiration_date, sum(basic_number) total_num from
+        (select di.batch_number id, me.bar_code, m.name, m.standard, m.model, m.unit_id,
+         me.commodity_unit, di.batch_number,di.expiration_date,
+         di.basic_number*(case dh.type when '入库' then 1 when '出库' then -1 end) as basic_number
         from jsh_depot_head dh
         left join jsh_depot_item di on dh.id=di.header_id
         left join jsh_material m on m.id=di.material_id and ifnull(m.delete_flag, '0') != '1'
         left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_flag,'0') !='1'
-        where me.bar_code= #{barCode} and me.default_flag=1
+        where me.bar_code= #{barCode}
         <if test="name != null">
             <bind name="bindName" value="'%'+name+'%'"/>
             and di.batch_number like #{bindName}