出入库修改

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

@@ -20,13 +20,11 @@ public class StockChangeRecordEntity implements Serializable {
      * 
      */
     private Integer id;
-    /**
-     * 门店id
-     */
-    private Integer storeId;
-    private String merchSn;
-    private String thirdMerchSn;
+    private Integer specification;
+    private String product;
+    private String parentId;
     private String orderSn;
+    private String courierNumber;
     /**
      * sku
      */
@@ -54,143 +52,111 @@ public class StockChangeRecordEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date modifyTime;
 
-    /**
-     * 设置：
-     */
+    public Integer getId() {
+        return id;
+    }
+
     public void setId(Integer id) {
         this.id = id;
     }
 
-    /**
-     * 获取：
-     */
-    public Integer getId() {
-        return id;
+    public Integer getSpecification() {
+        return specification;
     }
-    /**
-     * 设置：门店id
-     */
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
+
+    public void setSpecification(Integer specification) {
+        this.specification = specification;
     }
 
-    /**
-     * 获取：门店id
-     */
-    public Integer getStoreId() {
-        return storeId;
+    public String getProduct() {
+        return product;
     }
-    /**
-     * 设置：sku
-     */
-    public void setSku(String sku) {
-        this.sku = sku;
+
+    public void setProduct(String product) {
+        this.product = product;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getOrderSn() {
+        return orderSn;
+    }
+
+    public void setOrderSn(String orderSn) {
+        this.orderSn = orderSn;
+    }
+
+    public String getCourierNumber() {
+        return courierNumber;
+    }
+
+    public void setCourierNumber(String courierNumber) {
+        this.courierNumber = courierNumber;
     }
 
-    /**
-     * 获取：sku
-     */
     public String getSku() {
         return sku;
     }
-    /**
-     * 设置：记录类型，0:出库 1:入库
-     */
-    public void setType(String type) {
-        this.type = type;
+
+    public void setSku(String sku) {
+        this.sku = sku;
     }
 
-    /**
-     * 获取：记录类型，0:出库 1:入库
-     */
     public String getType() {
         return type;
     }
-    /**
-     * 设置：出库或入库数量
-     */
-    public void setNumber(Integer number) {
-        this.number = number;
+
+    public void setType(String type) {
+        this.type = type;
     }
 
-    /**
-     * 获取：出库或入库数量
-     */
     public Integer getNumber() {
         return number;
     }
-    /**
-     * 设置：备注
-     */
-    public void setRemark(String remark) {
-        this.remark = remark;
+
+    public void setNumber(Integer number) {
+        this.number = number;
     }
 
-    /**
-     * 获取：备注
-     */
     public String getRemark() {
         return remark;
     }
-    /**
-     * 设置：
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
-    /**
-     * 获取：
-     */
     public Date getCreateTime() {
         return createTime;
     }
-    /**
-     * 设置：
-     */
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
-    /**
-     * 获取：
-     */
     public Date getModifyTime() {
         return 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 String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
     }
 
     @Override
     public String toString() {
         return "StockChangeRecordEntity{" +
                 "id=" + id +
-                ", storeId=" + storeId +
-                ", merchSn='" + merchSn + '\'' +
-                ", thirdMerchSn='" + thirdMerchSn + '\'' +
+                ", specification=" + specification +
+                ", product='" + product + '\'' +
+                ", parentId='" + parentId + '\'' +
                 ", orderSn='" + orderSn + '\'' +
+                ", courierNumber='" + courierNumber + '\'' +
                 ", sku='" + sku + '\'' +
                 ", type='" + type + '\'' +
                 ", number=" + number +

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

@@ -5,9 +5,10 @@
 
     <resultMap type="com.kmall.admin.entity.haikong.StockChangeRecordEntity" id="stockChangeRecordMap">
         <result property="id" column="id"/>
-        <result property="merchSn" column="merch_sn"/>
-        <result property="thirdMerchSn" column="third_merch_sn"/>
-        <result property="storeId" column="store_id"/>
+        <result property="specification" column="specification"/>
+        <result property="product" column="product"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="courierNumber" column="courier_number"/>
         <result property="sku" column="sku"/>
         <result property="type" column="type"/>
         <result property="number" column="number"/>
@@ -35,9 +36,6 @@
 		<if test="sku != null and sku.trim() != ''">
 			AND `sku` LIKE concat('%',#{sku},'%')
 		</if>
-		<if test="storeId != null and storeId.trim() != ''">
-			AND `store_id` LIKE concat('%',#{storeId},'%')
-		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -61,10 +59,11 @@
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.haikong.StockChangeRecordEntity" useGeneratedKeys="true" keyProperty="id">
 		insert into mall_stock_change_record(
-			`merch_sn`,
-			`third_merch_sn`,
+			`specification`,
+			`product`,
 			`order_sn`,
-			`store_id`,
+			`parent_id`,
+			`courier_number`,
 			`sku`,
 			`type`,
 			`number`,
@@ -72,10 +71,11 @@
 			`create_time`,
 			`modify_time`)
 		values(
-			#{merchSn},
-			#{thirdMerchSn},
+			#{specification},
+			#{product},
 			#{orderSn},
-			#{storeId},
+			#{parentId},
+			#{courierNumber},
 			#{sku},
 			#{type},
 			#{number},
@@ -87,10 +87,11 @@
 	<insert id="saveBatch">
 		insert into mall_stock_change_record
 		(
-			`store_id`,
-			`merch_sn`,
-			`third_merch_sn`,
+			`specification`,
+			`product`,
 			`order_sn`,
+			`parent_id`,
+			`courier_number`,
 			`sku`,
 			`type`,
 			`number`,
@@ -101,10 +102,11 @@
 		values
 		<foreach collection="list" item="item" separator=",">
 			(
-				#{item.storeId},
-				#{item.merchSn},
-				#{item.thirdMerchSn},
+				#{item.specification},
+				#{item.product},
 				#{item.orderSn},
+				#{item.parentId},
+				#{item.courierNumber},
 				#{item.sku},
 				#{item.type},
 				#{item.number},
@@ -118,9 +120,10 @@
 	<update id="update" parameterType="com.kmall.admin.entity.haikong.StockChangeRecordEntity">
 		update mall_stock_change_record 
 		<set>
-			<if test="storeId != null">`store_id` = #{storeId}, </if>
-			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
-			<if test="thirdMerchSn != null">`third_merch_sn` = #{thirdMerchSn}, </if>
+			<if test="specification != null">`specification` = #{specification}, </if>
+			<if test="product != null">`product` = #{product}, </if>
+			<if test="parentId != null">`parent_id` = #{parentId}, </if>
+			<if test="courierNumber != null">`courier_number` = #{courierNumber}, </if>
 			<if test="orderSn != null">`order_sn` = #{orderSn}, </if>
 			<if test="sku != null">`sku` = #{sku}, </if>
 			<if test="type != null">`type` = #{type}, </if>