Commit 819fd504 by huluobin

# update

parent 27da6ef8
...@@ -357,5 +357,8 @@ public class PurchaseDetailDTO { ...@@ -357,5 +357,8 @@ public class PurchaseDetailDTO {
@JSONField(name = "arrivaldate") @JSONField(name = "arrivaldate")
private Date arrivaldate; private Date arrivaldate;
@JSONField(name = "skudelstatus")
private Integer hasDelete;
} }
...@@ -432,6 +432,8 @@ public class DcBasePurchaseDetails { ...@@ -432,6 +432,8 @@ public class DcBasePurchaseDetails {
*/ */
private Date arrivaldate; private Date arrivaldate;
private Integer hasDelete;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_purchase_details * This method corresponds to the database table dc_base_purchase_details
......
...@@ -3710,6 +3710,66 @@ public class DcBasePurchaseDetailsExample { ...@@ -3710,6 +3710,66 @@ public class DcBasePurchaseDetailsExample {
addCriterion("arrivaldate not between", value1, value2, "arrivaldate"); addCriterion("arrivaldate not between", value1, value2, "arrivaldate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andHasDeleteIsNull() {
addCriterion("has_delete is null");
return (Criteria) this;
}
public Criteria andHasDeleteIsNotNull() {
addCriterion("has_delete is not null");
return (Criteria) this;
}
public Criteria andHasDeleteEqualTo(Integer value) {
addCriterion("has_delete =", value, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteNotEqualTo(Integer value) {
addCriterion("has_delete <>", value, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteGreaterThan(Integer value) {
addCriterion("has_delete >", value, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteGreaterThanOrEqualTo(Integer value) {
addCriterion("has_delete >=", value, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteLessThan(Integer value) {
addCriterion("has_delete <", value, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteLessThanOrEqualTo(Integer value) {
addCriterion("has_delete <=", value, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteIn(List<Integer> values) {
addCriterion("has_delete in", values, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteNotIn(List<Integer> values) {
addCriterion("has_delete not in", values, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteBetween(Integer value1, Integer value2) {
addCriterion("has_delete between", value1, value2, "hasDelete");
return (Criteria) this;
}
public Criteria andHasDeleteNotBetween(Integer value1, Integer value2) {
addCriterion("has_delete not between", value1, value2, "hasDelete");
return (Criteria) this;
}
} }
/** /**
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<result column="can_7day_refund" jdbcType="INTEGER" property="can7dayRefund" /> <result column="can_7day_refund" jdbcType="INTEGER" property="can7dayRefund" />
<result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" /> <result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
<result column="arrivaldate" jdbcType="TIMESTAMP" property="arrivaldate" /> <result column="arrivaldate" jdbcType="TIMESTAMP" property="arrivaldate" />
<result column="has_delete" jdbcType="INTEGER" property="hasDelete" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, logistics_order_id, gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, logistics_order_id,
logistics_company_name, company_id, ispush, isallot, isaims, pay_type, pay_status, logistics_company_name, company_id, ispush, isallot, isaims, pay_type, pay_status,
last_signtime, arrival_status, amount_buy, amount_payed, amount_express, createusername, last_signtime, arrival_status, amount_buy, amount_payed, amount_express, createusername,
can_7day_refund, warehouse_code, arrivaldate can_7day_refund, warehouse_code, arrivaldate, has_delete
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -219,8 +220,8 @@ ...@@ -219,8 +220,8 @@
isaims, pay_type, pay_status, isaims, pay_type, pay_status,
last_signtime, arrival_status, amount_buy, last_signtime, arrival_status, amount_buy,
amount_payed, amount_express, createusername, amount_payed, amount_express, createusername,
can_7day_refund, warehouse_code, arrivaldate can_7day_refund, warehouse_code, arrivaldate,
) has_delete)
values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT},
#{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR},
#{deliverValue,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR}, #{deliverValue,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR},
...@@ -239,8 +240,8 @@ ...@@ -239,8 +240,8 @@
#{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, #{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER},
#{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL}, #{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL},
#{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR}, #{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR},
#{can7dayRefund,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{arrivaldate,jdbcType=TIMESTAMP} #{can7dayRefund,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{arrivaldate,jdbcType=TIMESTAMP},
) #{hasDelete,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
<!-- <!--
...@@ -408,6 +409,9 @@ ...@@ -408,6 +409,9 @@
<if test="arrivaldate != null"> <if test="arrivaldate != null">
arrivaldate, arrivaldate,
</if> </if>
<if test="hasDelete != null">
has_delete,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -569,6 +573,9 @@ ...@@ -569,6 +573,9 @@
<if test="arrivaldate != null"> <if test="arrivaldate != null">
#{arrivaldate,jdbcType=TIMESTAMP}, #{arrivaldate,jdbcType=TIMESTAMP},
</if> </if>
<if test="hasDelete != null">
#{hasDelete,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long">
...@@ -747,6 +754,9 @@ ...@@ -747,6 +754,9 @@
<if test="record.arrivaldate != null"> <if test="record.arrivaldate != null">
arrivaldate = #{record.arrivaldate,jdbcType=TIMESTAMP}, arrivaldate = #{record.arrivaldate,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.hasDelete != null">
has_delete = #{record.hasDelete,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -810,7 +820,8 @@ ...@@ -810,7 +820,8 @@
createusername = #{record.createusername,jdbcType=VARCHAR}, createusername = #{record.createusername,jdbcType=VARCHAR},
can_7day_refund = #{record.can7dayRefund,jdbcType=INTEGER}, can_7day_refund = #{record.can7dayRefund,jdbcType=INTEGER},
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
arrivaldate = #{record.arrivaldate,jdbcType=TIMESTAMP} arrivaldate = #{record.arrivaldate,jdbcType=TIMESTAMP},
has_delete = #{record.hasDelete,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -978,6 +989,9 @@ ...@@ -978,6 +989,9 @@
<if test="arrivaldate != null"> <if test="arrivaldate != null">
arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP}, arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP},
</if> </if>
<if test="hasDelete != null">
has_delete = #{hasDelete,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1038,7 +1052,8 @@ ...@@ -1038,7 +1052,8 @@
createusername = #{createusername,jdbcType=VARCHAR}, createusername = #{createusername,jdbcType=VARCHAR},
can_7day_refund = #{can7dayRefund,jdbcType=INTEGER}, can_7day_refund = #{can7dayRefund,jdbcType=INTEGER},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP} arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
...@@ -1208,6 +1223,9 @@ ...@@ -1208,6 +1223,9 @@
<if test="arrivaldate != null"> <if test="arrivaldate != null">
arrivaldate, arrivaldate,
</if> </if>
<if test="hasDelete != null">
has_delete,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -1370,6 +1388,9 @@ ...@@ -1370,6 +1388,9 @@
<if test="arrivaldate != null"> <if test="arrivaldate != null">
#{arrivaldate,jdbcType=TIMESTAMP}, #{arrivaldate,jdbcType=TIMESTAMP},
</if> </if>
<if test="hasDelete != null">
#{hasDelete,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -1532,6 +1553,9 @@ ...@@ -1532,6 +1553,9 @@
<if test="arrivaldate != null"> <if test="arrivaldate != null">
arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP}, arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP},
</if> </if>
<if test="hasDelete != null">
has_delete = #{hasDelete,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
...@@ -1550,7 +1574,8 @@ ...@@ -1550,7 +1574,8 @@
update_time, gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, update_time, gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id,
logistics_order_id, logistics_company_name, company_id, ispush, isallot, isaims, logistics_order_id, logistics_company_name, company_id, ispush, isallot, isaims,
pay_type, pay_status, last_signtime, arrival_status, amount_buy, amount_payed, pay_type, pay_status, last_signtime, arrival_status, amount_buy, amount_payed,
amount_express, createusername, can_7day_refund, warehouse_code, arrivaldate) amount_express, createusername, can_7day_refund, warehouse_code, arrivaldate, has_delete
)
values values
(#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT},
#{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR},
...@@ -1570,8 +1595,8 @@ ...@@ -1570,8 +1595,8 @@
#{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, #{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER},
#{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL}, #{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL},
#{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR}, #{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR},
#{can7dayRefund,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{arrivaldate,jdbcType=TIMESTAMP} #{can7dayRefund,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{arrivaldate,jdbcType=TIMESTAMP},
) #{hasDelete,jdbcType=INTEGER})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
purchase_id = #{purchaseId,jdbcType=VARCHAR}, purchase_id = #{purchaseId,jdbcType=VARCHAR},
...@@ -1625,7 +1650,8 @@ ...@@ -1625,7 +1650,8 @@
createusername = #{createusername,jdbcType=VARCHAR}, createusername = #{createusername,jdbcType=VARCHAR},
can_7day_refund = #{can7dayRefund,jdbcType=INTEGER}, can_7day_refund = #{can7dayRefund,jdbcType=INTEGER},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP} arrivaldate = #{arrivaldate,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
<!-- <!--
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment