From ff4eb3ab3c1586ec2453cf75b94dc9e2265b1cba Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 27 Apr 2024 16:20:00 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisGoodsController.java     |  4 ++-
 .../erp/emis/domain/EmisWaybillCargo.java     | 16 ++++-----
 .../com/xdadan/erp/emis/domain/vo/Cargo.java  | 36 +++++++++++++++++++
 .../mapper/EmisWaybillCargoMapper.xml         | 34 +++++++++---------
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java
index e1a9a9346..153e1d447 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java
@@ -64,7 +64,9 @@ public class EmisGoodsController extends BaseController
     }
 
 //    @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')")
-    @JacksonFilter(include= {"id","goodsSn","goodsName","goodsNameEn"},value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"id","goodsSn","goodsName","goodsNameEn","price","orginalNation",
+            "brand","ingredients",""
+    },value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
     public TableDataInfo listSimple(EmisGoods emisGoods)
     {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
index 71f7e4274..063e0eabe 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWaybillCargo.java
  * @author linfso
- * @date 2024-04-25 09:18:11
+ * @date 2024-04-27 08:16:45
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 运单货物 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisWaybillCargo
  * @Description 运单货物
  * @author linfso
- * @date 2024-04-25 09:18:11
+ * @date 2024-04-27 08:16:45
  */
 @Data
 public class EmisWaybillCargo extends BaseEntity
@@ -59,18 +59,22 @@ public class EmisWaybillCargo extends BaseEntity
     private String hscode;
     /* 品牌 */
     private String brand;
+    /* 材质 */
+    private String material;
     /* 用途 */
     private String purpose;
     /* 成分 */
     private String ingredients;
+    /* 厂家 */
+    private String manufacturer;
     /* 功能 */
     private String function;
     /* 规格型号 */
     private String goodsModel;
-    /* 厂家 */
-    private String manufacturer;
     /* 毛重 */
     private BigDecimal grossWeight;
+    /* 净重 */
+    private BigDecimal netWeight;
     /* 长 */
     private BigDecimal length;
     /* 宽 */
@@ -79,10 +83,6 @@ public class EmisWaybillCargo extends BaseEntity
     private BigDecimal height;
     /* 体积 */
     private BigDecimal volume;
-    /* 申报价值 */
-    private BigDecimal declaredValue;
-    /* 申报价值币种 */
-    private String declaredValueCurrency;
     /* 条码 */
     private String barcode;
     /* 排序 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
index c23b373cd..c98642f9f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
@@ -2,6 +2,8 @@ package com.xdadan.erp.emis.domain.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class Cargo {
     /* 货物编码 */
@@ -10,4 +12,38 @@ public class Cargo {
     private String goodsName;
     /* 货物数量 */
     private String cargoQty;
+    /* 单位 */
+    private String unit;
+    /* 重量 */
+    private BigDecimal weight;
+    /* 货物单价 */
+    private BigDecimal price;
+    /* 货物币种 */
+    private String currency;
+    /* 原产国 */
+    private String nationArea;
+    /* 行邮税号 */
+    private String taxNo;
+    /* 海关编码 */
+    private String hscode;
+    /* 品牌 */
+    private String brand;
+    /* 材质 */
+    private String material;
+    /* 用途 */
+    private String purpose;
+    /* 成分 */
+    private String ingredients;
+    /* 厂家 */
+    private String manufacturer;
+    /* 规格型号 */
+    private String goodsModel;
+    /* 毛重 */
+    private BigDecimal grossWeight;
+    /* 净重 */
+    private BigDecimal netWeight;
+    /* 排序 */
+    private Integer orderNum;
+
+    private Integer isSave;
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
index ba9f8c6ff..4201aea6f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
@@ -18,18 +18,18 @@
         <result property="taxNo"    column="tax_no"    />
         <result property="hscode"    column="hscode"    />
         <result property="brand"    column="brand"    />
+        <result property="material"    column="material"    />
         <result property="purpose"    column="purpose"    />
         <result property="ingredients"    column="ingredients"    />
+        <result property="manufacturer"    column="manufacturer"    />
         <result property="function"    column="function"    />
         <result property="goodsModel"    column="goods_model"    />
-        <result property="manufacturer"    column="manufacturer"    />
         <result property="grossWeight"    column="gross_weight"    />
+        <result property="netWeight"    column="net_weight"    />
         <result property="length"    column="length"    />
         <result property="width"    column="width"    />
         <result property="height"    column="height"    />
         <result property="volume"    column="volume"    />
-        <result property="declaredValue"    column="declared_value"    />
-        <result property="declaredValueCurrency"    column="declared_value_currency"    />
         <result property="barcode"    column="barcode"    />
         <result property="orderNum"    column="order_num"    />
         <result property="delFlag"    column="del_flag"    />
@@ -41,7 +41,7 @@
     </resultMap>
 
     <sql id="selectEmisWaybillCargoVo">
-        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, purpose, ingredients, function, goods_model, manufacturer, gross_weight, length, width, height, volume, declared_value, declared_value_currency, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_cargo
+        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, material, purpose, ingredients, manufacturer, function, goods_model, gross_weight, net_weight, length, width, height, volume, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_cargo
     </sql>
 
     <select id="selectEmisWaybillCargoList" parameterType="EmisWaybillCargo" resultMap="EmisWaybillCargoResult">
@@ -60,18 +60,18 @@
             <if test="taxNo != null  and taxNo != ''"> and tax_no like concat('%', #{taxNo}, '%')</if>
             <if test="hscode != null  and hscode != ''"> and hscode like concat('%', #{hscode}, '%')</if>
             <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
+            <if test="material != null  and material != ''"> and material like concat('%', #{material}, '%')</if>
             <if test="purpose != null  and purpose != ''"> and purpose like concat('%', #{purpose}, '%')</if>
             <if test="ingredients != null  and ingredients != ''"> and ingredients like concat('%', #{ingredients}, '%')</if>
+            <if test="manufacturer != null  and manufacturer != ''"> and manufacturer like concat('%', #{manufacturer}, '%')</if>
             <if test="function != null  and function != ''"> and function like concat('%', #{function}, '%')</if>
             <if test="goodsModel != null  and goodsModel != ''"> and goods_model like concat('%', #{goodsModel}, '%')</if>
-            <if test="manufacturer != null  and manufacturer != ''"> and manufacturer like concat('%', #{manufacturer}, '%')</if>
             <if test="grossWeight != null "> and gross_weight like concat('%', #{grossWeight}, '%')</if>
+            <if test="netWeight != null "> and net_weight = #{netWeight}</if>
             <if test="length != null "> and length like concat('%', #{length}, '%')</if>
             <if test="width != null "> and width like concat('%', #{width}, '%')</if>
             <if test="height != null "> and height like concat('%', #{height}, '%')</if>
             <if test="volume != null "> and volume like concat('%', #{volume}, '%')</if>
-            <if test="declaredValue != null "> and declared_value like concat('%', #{declaredValue}, '%')</if>
-            <if test="declaredValueCurrency != null  and declaredValueCurrency != ''"> and declared_value_currency like concat('%', #{declaredValueCurrency}, '%')</if>
             <if test="barcode != null  and barcode != ''"> and barcode like concat('%', #{barcode}, '%')</if>
             <if test="orderNum != null "> and order_num = #{orderNum}</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -85,7 +85,7 @@
     </select>
 
     <select id="selectEmisWaybillCargoById" parameterType="Long" resultMap="EmisWaybillCargoResult">
-        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, purpose, ingredients, function, goods_model, manufacturer, gross_weight, length, width, height, volume, declared_value, declared_value_currency, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark
+        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, material, purpose, ingredients, manufacturer, function, goods_model, gross_weight, net_weight, length, width, height, volume, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_waybill_cargo a
         where a.id = #{id}
     </select>
@@ -106,18 +106,18 @@
             <if test="taxNo != null and taxNo != ''">tax_no,</if>
             <if test="hscode != null and hscode != ''">hscode,</if>
             <if test="brand != null and brand != ''">brand,</if>
+            <if test="material != null and material != ''">material,</if>
             <if test="purpose != null and purpose != ''">purpose,</if>
             <if test="ingredients != null and ingredients != ''">ingredients,</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer,</if>
             <if test="function != null and function != ''">function,</if>
             <if test="goodsModel != null and goodsModel != ''">goods_model,</if>
-            <if test="manufacturer != null and manufacturer != ''">manufacturer,</if>
             <if test="grossWeight != null">gross_weight,</if>
+            <if test="netWeight != null">net_weight,</if>
             <if test="length != null">length,</if>
             <if test="width != null">width,</if>
             <if test="height != null">height,</if>
             <if test="volume != null">volume,</if>
-            <if test="declaredValue != null">declared_value,</if>
-            <if test="declaredValueCurrency != null and declaredValueCurrency != ''">declared_value_currency,</if>
             <if test="barcode != null and barcode != ''">barcode,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -141,18 +141,18 @@
             <if test="taxNo != null and taxNo != ''">#{taxNo},</if>
             <if test="hscode != null and hscode != ''">#{hscode},</if>
             <if test="brand != null and brand != ''">#{brand},</if>
+            <if test="material != null and material != ''">#{material},</if>
             <if test="purpose != null and purpose != ''">#{purpose},</if>
             <if test="ingredients != null and ingredients != ''">#{ingredients},</if>
+            <if test="manufacturer != null and manufacturer != ''">#{manufacturer},</if>
             <if test="function != null and function != ''">#{function},</if>
             <if test="goodsModel != null and goodsModel != ''">#{goodsModel},</if>
-            <if test="manufacturer != null and manufacturer != ''">#{manufacturer},</if>
             <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="netWeight != null">#{netWeight},</if>
             <if test="length != null">#{length},</if>
             <if test="width != null">#{width},</if>
             <if test="height != null">#{height},</if>
             <if test="volume != null">#{volume},</if>
-            <if test="declaredValue != null">#{declaredValue},</if>
-            <if test="declaredValueCurrency != null and declaredValueCurrency != ''">#{declaredValueCurrency},</if>
             <if test="barcode != null and barcode != ''">#{barcode},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -179,18 +179,18 @@
             <if test="taxNo != null and taxNo != ''">tax_no = #{taxNo},</if>
             <if test="hscode != null and hscode != ''">hscode = #{hscode},</if>
             <if test="brand != null and brand != ''">brand = #{brand},</if>
+            <if test="material != null and material != ''">material = #{material},</if>
             <if test="purpose != null and purpose != ''">purpose = #{purpose},</if>
             <if test="ingredients != null and ingredients != ''">ingredients = #{ingredients},</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer = #{manufacturer},</if>
             <if test="function != null and function != ''">function = #{function},</if>
             <if test="goodsModel != null and goodsModel != ''">goods_model = #{goodsModel},</if>
-            <if test="manufacturer != null and manufacturer != ''">manufacturer = #{manufacturer},</if>
             <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
             <if test="length != null">length = #{length},</if>
             <if test="width != null">width = #{width},</if>
             <if test="height != null">height = #{height},</if>
             <if test="volume != null">volume = #{volume},</if>
-            <if test="declaredValue != null">declared_value = #{declaredValue},</if>
-            <if test="declaredValueCurrency != null and declaredValueCurrency != ''">declared_value_currency = #{declaredValueCurrency},</if>
             <if test="barcode != null and barcode != ''">barcode = #{barcode},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>