From 31556421fd2be40c396a43a9b06c2a2fbe92bfef Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 17 Apr 2024 17:34:32 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/EmisGoods.java  | 6 ++++--
 emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml   | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
index 2408910e3..76bad37b3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisGoods.java
  * @author linfso
- * @date 2024-04-17 07:45:04
+ * @date 2024-04-17 09:33:39
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 货物信息 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisGoods
  * @Description 货物信息
  * @author linfso
- * @date 2024-04-17 07:45:04
+ * @date 2024-04-17 09:33:39
  */
 @Data
 public class EmisGoods extends BaseEntity
@@ -139,5 +139,7 @@ public class EmisGoods extends BaseEntity
     private String saleUrl;
     /* 口岸编码 */
     private String portCode;
+    /* 排序 */
+    private Integer orderNum;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
index c67b3920f..87124f092 100644
--- a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
@@ -58,6 +58,7 @@
         <result property="pd"    column="pd"    />
         <result property="saleUrl"    column="sale_url"    />
         <result property="portCode"    column="port_code"    />
+        <result property="orderNum"    column="order_num"    />
         <result property="remark"    column="remark"    />
         <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -68,7 +69,7 @@
     </resultMap>
 
     <sql id="selectEmisGoodsVo">
-        select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, pic_url, owner_id, is_real_goods, is_big_cat, brand_id, brand, net_weight, gross_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, hs_code, is_code, unit, unit1, unit2, price, currency_type, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_goods
+        select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, pic_url, owner_id, is_real_goods, is_big_cat, brand_id, brand, net_weight, gross_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, hs_code, is_code, unit, unit1, unit2, price, currency_type, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_goods
     </sql>
 
     <select id="selectEmisGoodsList" parameterType="EmisGoods" resultMap="EmisGoodsResult">
@@ -127,6 +128,7 @@
             <if test="pd != null  and pd != ''"> and pd like concat('%', #{pd}, '%')</if>
             <if test="saleUrl != null  and saleUrl != ''"> and sale_url like concat('%', #{saleUrl}, '%')</if>
             <if test="portCode != null  and portCode != ''"> and port_code like concat('%', #{portCode}, '%')</if>
+            <if test="orderNum != null "> and order_num = #{orderNum}</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -139,7 +141,7 @@
     </select>
 
     <select id="selectEmisGoodsById" parameterType="Long" resultMap="EmisGoodsResult">
-        select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, pic_url, owner_id, is_real_goods, is_big_cat, brand_id, brand, net_weight, gross_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, hs_code, is_code, unit, unit1, unit2, price, currency_type, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
+        select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, pic_url, owner_id, is_real_goods, is_big_cat, brand_id, brand, net_weight, gross_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, hs_code, is_code, unit, unit1, unit2, price, currency_type, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
         from emis_goods a
         where a.id = #{id}
     </select>
@@ -200,6 +202,7 @@
             <if test="pd != null and pd != ''">pd,</if>
             <if test="saleUrl != null and saleUrl != ''">sale_url,</if>
             <if test="portCode != null and portCode != ''">port_code,</if>
+            <if test="orderNum != null">order_num,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -262,6 +265,7 @@
             <if test="pd != null and pd != ''">#{pd},</if>
             <if test="saleUrl != null and saleUrl != ''">#{saleUrl},</if>
             <if test="portCode != null and portCode != ''">#{portCode},</if>
+            <if test="orderNum != null">#{orderNum},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -327,6 +331,7 @@
             <if test="pd != null and pd != ''">pd = #{pd},</if>
             <if test="saleUrl != null and saleUrl != ''">sale_url = #{saleUrl},</if>
             <if test="portCode != null and portCode != ''">port_code = #{portCode},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>