tanzhongran преди 3 години
родител
ревизия
d3b66aa8b5

+ 3 - 0
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseMaterial.java

@@ -33,6 +33,9 @@ public class BaseMaterial {
 	@Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
+    @Schema(name = "商品ID(即base_sku表的主键id)")
+	private Long skuId;
+
 	@Schema(name = "描述")
     private String description;
 

+ 2 - 1
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseMaterialMapper.xml

@@ -9,6 +9,7 @@
         <result column="MATERIAL_NAME" property="materialName" />
         <result column="MATERIAL_TYPE" property="materialType" />
         <result column="DESCRIPTION" property="description" />
+        <result column="sku_id" property="skuId" />
         <result column="VALID" property="valid" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
@@ -19,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, DESCRIPTION, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
+        ID, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, DESCRIPTION, sku_id, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
     </sql>
 
     <select id="listMaterial" resultType="com.abi.qms.platform.dao.vo.result.MaterialVO">