出入库

kmall-admin/src/main/java/com/kmall/admin/entity/haikong/StockChangeRecordEntity.java

@@ -22,6 +22,9 @@ public class StockChangeRecordEntity implements Serializable {
     private Integer id;
     private Integer specification;
     private String product;
+    private String merchSn;
+    private String thirdMerchSn;
+    private Integer storeId;
     private String parentId;
     private String orderSn;
     private String courierNumber;
@@ -148,12 +151,39 @@ public class StockChangeRecordEntity implements Serializable {
         this.modifyTime = modifyTime;
     }
 
+    public String getMerchSn() {
+        return merchSn;
+    }
+
+    public void setMerchSn(String merchSn) {
+        this.merchSn = merchSn;
+    }
+
+    public String getThirdMerchSn() {
+        return thirdMerchSn;
+    }
+
+    public void setThirdMerchSn(String thirdMerchSn) {
+        this.thirdMerchSn = thirdMerchSn;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
     @Override
     public String toString() {
         return "StockChangeRecordEntity{" +
                 "id=" + id +
                 ", specification=" + specification +
                 ", product='" + product + '\'' +
+                ", merchSn='" + merchSn + '\'' +
+                ", thirdMerchSn='" + thirdMerchSn + '\'' +
+                ", storeId=" + storeId +
                 ", parentId='" + parentId + '\'' +
                 ", orderSn='" + orderSn + '\'' +
                 ", courierNumber='" + courierNumber + '\'' +

kmall-admin/src/main/resources/mybatis/mapper/haikong/StockChangeRecordDao.xml

@@ -14,6 +14,9 @@
         <result property="number" column="number"/>
         <result property="remark" column="remark"/>
         <result property="orderSn" column="order_sn"/>
+        <result property="thirdMerchSn" column="third_merch_sn"/>
+        <result property="merchSn" column="merch_sn"/>
+        <result property="storeId" column="store_id"/>
         <result property="createTime" column="create_time"/>
         <result property="modifyTime" column="modify_time"/>
     </resultMap>
@@ -68,6 +71,9 @@
 			`type`,
 			`number`,
 			`remark`,
+			`third_merch_sn`,
+			`merch_sn`,
+			`store_id`,
 			`create_time`,
 			`modify_time`)
 		values(
@@ -80,6 +86,9 @@
 			#{type},
 			#{number},
 			#{remark},
+			#{thirdMerchSn},
+			#{merchSn},
+			#{storeId},
 			#{createTime},
 			#{modifyTime})
 	</insert>
@@ -96,6 +105,9 @@
 			`type`,
 			`number`,
 			`remark`,
+			`third_merch_sn`,
+			`merch_sn`,
+			`store_id`,
 			`create_time`,
 			`modify_time`
 		)
@@ -111,6 +123,9 @@
 				#{item.type},
 				#{item.number},
 				#{item.remark},
+				#{item.thirdMerchSn},
+				#{item.merchSn},
+				#{item.storeId},
 				#{item.createTime},
 				#{item.modifyTime}
 			)
@@ -129,6 +144,9 @@
 			<if test="type != null">`type` = #{type}, </if>
 			<if test="number != null">`number` = #{number}, </if>
 			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="thirdMerchSn != null">`third_merch_sn` = #{thirdMerchSn}, </if>
+			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
+			<if test="storeId != null">`store_id` = #{storeId}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="modifyTime != null">`modify_time` = #{modifyTime}</if>
 		</set>