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 1b6344f31..2408910e3 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
@@ -1,10 +1,10 @@
-/**
+/**
* @Project: emis
* @Title: EmisGoods.java
* @author linfso
- * @date 2024-01-10 03:59:32
+ * @date 2024-04-17 07:45:04
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 货物信息 实体类
*/
@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
import com.xdadan.erp.common.core.domain.BaseEntity;
import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@@ -25,9 +26,9 @@ import lombok.Data;
* @ClassName EmisGoods
* @Description 货物信息
* @author linfso
- * @date 2024-01-10 03:59:32
+ * @date 2024-04-17 07:45:04
*/
- @Data
+@Data
public class EmisGoods extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -50,6 +51,10 @@ public class EmisGoods extends BaseEntity
private String barcode;
/* 原产国 */
private String orginalNation;
+ /* 图片地址 */
+ private String picUrl;
+ /* 归属客户 */
+ private String ownerId;
/* 是否实物 0-否 1-是 */
private Integer isRealGoods;
/* 是否大类 0-否 1-是 */
@@ -134,15 +139,5 @@ public class EmisGoods extends BaseEntity
private String saleUrl;
/* 口岸编码 */
private String portCode;
- /* ext1 */
- private String ext1;
- /* ext2 */
- private String ext2;
- /* ext3 */
- private String ext3;
- /* ext4 */
- private String ext4;
- /* ext5 */
- private String ext5;
}
diff --git a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
index f6b9b59c7..c67b3920f 100644
--- a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
@@ -1,9 +1,9 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -56,11 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
-
-
-
@@ -71,12 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, 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, ext1, ext2, ext3, ext4, ext5, 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, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_goods
-
+
-
+
insert into emis_goods
@@ -162,6 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
goods_model,
barcode,
orginal_nation,
+ pic_url,
+ owner_id,
is_real_goods,
is_big_cat,
brand_id,
@@ -204,11 +200,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pd,
sale_url,
port_code,
- ext1,
- ext2,
- ext3,
- ext4,
- ext5,
remark,
tenant_id,
del_flag,
@@ -216,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time,
update_by,
update_time,
-
+
#{id},
#{goodsSn},
@@ -227,6 +218,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{goodsModel},
#{barcode},
#{orginalNation},
+ #{picUrl},
+ #{ownerId},
#{isRealGoods},
#{isBigCat},
#{brandId},
@@ -269,11 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{pd},
#{saleUrl},
#{portCode},
- #{ext1},
- #{ext2},
- #{ext3},
- #{ext4},
- #{ext5},
#{remark},
#{tenantId},
#{delFlag},
@@ -281,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createTime},
#{updateBy},
#{updateTime},
-
+
@@ -295,6 +283,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
goods_model = #{goodsModel},
barcode = #{barcode},
orginal_nation = #{orginalNation},
+ pic_url = #{picUrl},
+ owner_id = #{ownerId},
is_real_goods = #{isRealGoods},
is_big_cat = #{isBigCat},
brand_id = #{brandId},
@@ -337,11 +327,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pd = #{pd},
sale_url = #{saleUrl},
port_code = #{portCode},
- ext1 = #{ext1},
- ext2 = #{ext2},
- ext3 = #{ext3},
- ext4 = #{ext4},
- ext5 = #{ext5},
remark = #{remark},
tenant_id = #{tenantId},
del_flag = #{delFlag},
@@ -358,7 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_goods where id in
+ delete from emis_goods where id in
#{id}