From d287402f677d51db1c1aa27a2e0fa4bf6d6470cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 9 Feb 2023 22:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E9=87=8F=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
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 ++++++++++
 .../main/resources/mapper_xml/DepotItemMapperEx.xml    |  3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)

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 aa61932f..9508a7c3 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
@@ -183,6 +183,7 @@ public class DepotItemController {
                 BigDecimal totalAllPrice = BigDecimal.ZERO;
                 BigDecimal totalTaxMoney = BigDecimal.ZERO;
                 BigDecimal totalTaxLastMoney = BigDecimal.ZERO;
+                BigDecimal totalWeight = BigDecimal.ZERO;
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
                     item.put("id", diEx.getId());
@@ -226,6 +227,8 @@ public class DepotItemController {
                         item.put("taxMoney", diEx.getTaxMoney());
                         item.put("taxLastMoney", diEx.getTaxLastMoney());
                     }
+                    BigDecimal allWeight = diEx.getBasicNumber()==null||diEx.getWeight()==null?BigDecimal.ZERO:diEx.getBasicNumber().multiply(diEx.getWeight());
+                    item.put("weight", allWeight);
                     item.put("remark", diEx.getRemark());
                     item.put("linkId", diEx.getLinkId());
                     item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
@@ -240,6 +243,7 @@ public class DepotItemController {
                     totalAllPrice = totalAllPrice.add(diEx.getAllPrice()==null?BigDecimal.ZERO:diEx.getAllPrice());
                     totalTaxMoney = totalTaxMoney.add(diEx.getTaxMoney()==null?BigDecimal.ZERO:diEx.getTaxMoney());
                     totalTaxLastMoney = totalTaxLastMoney.add(diEx.getTaxLastMoney()==null?BigDecimal.ZERO:diEx.getTaxLastMoney());
+                    totalWeight = totalWeight.add(allWeight);
                 }
                 if(StringUtil.isNotEmpty(isReadOnly) && "1".equals(isReadOnly)) {
                     JSONObject footItem = new JSONObject();
@@ -247,6 +251,7 @@ public class DepotItemController {
                     footItem.put("allPrice", totalAllPrice);
                     footItem.put("taxMoney", totalTaxMoney);
                     footItem.put("taxLastMoney", totalTaxLastMoney);
+                    footItem.put("weight", totalWeight);
                     dataArray.add(footItem);
                 }
             }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
index 37ff5cb6..70a8ca37 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
@@ -48,6 +48,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
 
     private String barCode;
 
+    private BigDecimal weight;
+
     public Long getMId() {
         return MId;
     }
@@ -223,4 +225,12 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
     public void setBarCode(String barCode) {
         this.barCode = barCode;
     }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 89c6b7a3..eb4f4e02 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -25,6 +25,7 @@
         <result column="MColor" jdbcType="VARCHAR" property="MColor" />
         <result column="MStandard" jdbcType="VARCHAR" property="MStandard" />
         <result column="MMfrs" jdbcType="VARCHAR" property="MMfrs" />
+        <result column="weight" jdbcType="VARCHAR" property="weight" />
         <result column="MOtherField1" jdbcType="VARCHAR" property="MOtherField1" />
         <result column="MOtherField2" jdbcType="VARCHAR" property="MOtherField2" />
         <result column="MOtherField3" jdbcType="VARCHAR" property="MOtherField3" />
@@ -234,7 +235,7 @@
     </select>
 
     <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,
+        select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,m.weight,
         m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,m.enable_serial_number, m.enable_batch_number,
         dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode, me.purchase_decimal
         from jsh_depot_item di