Commit 9e4313ea by yinyong

数据中心--采购详情信息新增-付款方式、付款状态、最后签收时间、到货状态

parent 6fa0878a
......@@ -4,6 +4,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class PurchaseDetailDTO {
......@@ -357,5 +359,17 @@ public class PurchaseDetailDTO {
@JSONField(name = "detail_delstatus")
private Boolean detailDelstatus;
@JSONField(name = "paytype")
private Integer payType;
@JSONField(name = "paystatus")
private Integer payStatus;
@JSONField(name = "lastsigntime")
private Date lastSigntime;
@JSONField(name = "arrivalstatus")
private Integer arrivalStatus;
}
......@@ -4,6 +4,7 @@ import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class DcBasePurchaseDetails {
......@@ -386,6 +387,42 @@ public class DcBasePurchaseDetails {
private Integer isaims;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.pay_type
*
* @mbg.generated
*/
private Integer payType;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.pay_status
*
* @mbg.generated
*/
private Integer payStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.last_signtime
*
* @mbg.generated
*/
private Date lastSigntime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.arrival_status
*
* @mbg.generated
*/
private Integer arrivalStatus;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_purchase_details
*
......@@ -439,6 +476,10 @@ public class DcBasePurchaseDetails {
sb.append(", ispush=").append(ispush);
sb.append(", isallot=").append(isallot);
sb.append(", isaims=").append(isaims);
sb.append(", payType=").append(payType);
sb.append(", payStatus=").append(payStatus);
sb.append(", lastSigntime=").append(lastSigntime);
sb.append(", arrivalStatus=").append(arrivalStatus);
sb.append("]");
return sb.toString();
}
......@@ -502,7 +543,11 @@ public class DcBasePurchaseDetails {
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getIspush() == null ? other.getIspush() == null : this.getIspush().equals(other.getIspush()))
&& (this.getIsallot() == null ? other.getIsallot() == null : this.getIsallot().equals(other.getIsallot()))
&& (this.getIsaims() == null ? other.getIsaims() == null : this.getIsaims().equals(other.getIsaims()));
&& (this.getIsaims() == null ? other.getIsaims() == null : this.getIsaims().equals(other.getIsaims()))
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getLastSigntime() == null ? other.getLastSigntime() == null : this.getLastSigntime().equals(other.getLastSigntime()))
&& (this.getArrivalStatus() == null ? other.getArrivalStatus() == null : this.getArrivalStatus().equals(other.getArrivalStatus()));
}
/**
......@@ -557,6 +602,10 @@ public class DcBasePurchaseDetails {
result = prime * result + ((getIspush() == null) ? 0 : getIspush().hashCode());
result = prime * result + ((getIsallot() == null) ? 0 : getIsallot().hashCode());
result = prime * result + ((getIsaims() == null) ? 0 : getIsaims().hashCode());
result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getLastSigntime() == null) ? 0 : getLastSigntime().hashCode());
result = prime * result + ((getArrivalStatus() == null) ? 0 : getArrivalStatus().hashCode());
return result;
}
}
\ No newline at end of file
......@@ -3030,6 +3030,246 @@ public class DcBasePurchaseDetailsExample {
addCriterion("isaims not between", value1, value2, "isaims");
return (Criteria) this;
}
public Criteria andPayTypeIsNull() {
addCriterion("pay_type is null");
return (Criteria) this;
}
public Criteria andPayTypeIsNotNull() {
addCriterion("pay_type is not null");
return (Criteria) this;
}
public Criteria andPayTypeEqualTo(Integer value) {
addCriterion("pay_type =", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeNotEqualTo(Integer value) {
addCriterion("pay_type <>", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeGreaterThan(Integer value) {
addCriterion("pay_type >", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) {
addCriterion("pay_type >=", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeLessThan(Integer value) {
addCriterion("pay_type <", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeLessThanOrEqualTo(Integer value) {
addCriterion("pay_type <=", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeIn(List<Integer> values) {
addCriterion("pay_type in", values, "payType");
return (Criteria) this;
}
public Criteria andPayTypeNotIn(List<Integer> values) {
addCriterion("pay_type not in", values, "payType");
return (Criteria) this;
}
public Criteria andPayTypeBetween(Integer value1, Integer value2) {
addCriterion("pay_type between", value1, value2, "payType");
return (Criteria) this;
}
public Criteria andPayTypeNotBetween(Integer value1, Integer value2) {
addCriterion("pay_type not between", value1, value2, "payType");
return (Criteria) this;
}
public Criteria andPayStatusIsNull() {
addCriterion("pay_status is null");
return (Criteria) this;
}
public Criteria andPayStatusIsNotNull() {
addCriterion("pay_status is not null");
return (Criteria) this;
}
public Criteria andPayStatusEqualTo(Integer value) {
addCriterion("pay_status =", value, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusNotEqualTo(Integer value) {
addCriterion("pay_status <>", value, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusGreaterThan(Integer value) {
addCriterion("pay_status >", value, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("pay_status >=", value, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusLessThan(Integer value) {
addCriterion("pay_status <", value, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusLessThanOrEqualTo(Integer value) {
addCriterion("pay_status <=", value, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusIn(List<Integer> values) {
addCriterion("pay_status in", values, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusNotIn(List<Integer> values) {
addCriterion("pay_status not in", values, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusBetween(Integer value1, Integer value2) {
addCriterion("pay_status between", value1, value2, "payStatus");
return (Criteria) this;
}
public Criteria andPayStatusNotBetween(Integer value1, Integer value2) {
addCriterion("pay_status not between", value1, value2, "payStatus");
return (Criteria) this;
}
public Criteria andLastSigntimeIsNull() {
addCriterion("last_signtime is null");
return (Criteria) this;
}
public Criteria andLastSigntimeIsNotNull() {
addCriterion("last_signtime is not null");
return (Criteria) this;
}
public Criteria andLastSigntimeEqualTo(LocalDateTime value) {
addCriterion("last_signtime =", value, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeNotEqualTo(LocalDateTime value) {
addCriterion("last_signtime <>", value, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeGreaterThan(LocalDateTime value) {
addCriterion("last_signtime >", value, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeGreaterThanOrEqualTo(LocalDateTime value) {
addCriterion("last_signtime >=", value, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeLessThan(LocalDateTime value) {
addCriterion("last_signtime <", value, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeLessThanOrEqualTo(LocalDateTime value) {
addCriterion("last_signtime <=", value, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeIn(List<LocalDateTime> values) {
addCriterion("last_signtime in", values, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeNotIn(List<LocalDateTime> values) {
addCriterion("last_signtime not in", values, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("last_signtime between", value1, value2, "lastSigntime");
return (Criteria) this;
}
public Criteria andLastSigntimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("last_signtime not between", value1, value2, "lastSigntime");
return (Criteria) this;
}
public Criteria andArrivalStatusIsNull() {
addCriterion("arrival_status is null");
return (Criteria) this;
}
public Criteria andArrivalStatusIsNotNull() {
addCriterion("arrival_status is not null");
return (Criteria) this;
}
public Criteria andArrivalStatusEqualTo(Integer value) {
addCriterion("arrival_status =", value, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusNotEqualTo(Integer value) {
addCriterion("arrival_status <>", value, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusGreaterThan(Integer value) {
addCriterion("arrival_status >", value, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("arrival_status >=", value, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusLessThan(Integer value) {
addCriterion("arrival_status <", value, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusLessThanOrEqualTo(Integer value) {
addCriterion("arrival_status <=", value, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusIn(List<Integer> values) {
addCriterion("arrival_status in", values, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusNotIn(List<Integer> values) {
addCriterion("arrival_status not in", values, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusBetween(Integer value1, Integer value2) {
addCriterion("arrival_status between", value1, value2, "arrivalStatus");
return (Criteria) this;
}
public Criteria andArrivalStatusNotBetween(Integer value1, Integer value2) {
addCriterion("arrival_status not between", value1, value2, "arrivalStatus");
return (Criteria) this;
}
}
/**
......
......@@ -48,6 +48,10 @@
<result column="ispush" jdbcType="INTEGER" property="ispush" />
<result column="isallot" jdbcType="TINYINT" property="isallot" />
<result column="isaims" jdbcType="INTEGER" property="isaims" />
<result column="pay_type" jdbcType="INTEGER" property="payType" />
<result column="pay_status" jdbcType="INTEGER" property="payStatus" />
<result column="last_signtime" jdbcType="TIMESTAMP" property="lastSigntime" />
<result column="arrival_status" jdbcType="INTEGER" property="arrivalStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -127,7 +131,8 @@
quantity_not_arrival, quantity_inspect, quantity_qualified_inspect, quantity_unqualified_inspect,
quantity_wait_transfer, quantity_exchange, quantity_lose_inbound, create_time, update_time,
gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, logistics_order_id,
logistics_company_name, company_id, ispush, isallot, isaims
logistics_company_name, company_id, ispush, isallot, isaims, pay_type, pay_status,
last_signtime, arrival_status
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
<!--
......@@ -203,7 +208,8 @@
gmt_modified, quantity_not_inbound, alibaba_order_id,
logistics_order_id, logistics_company_name,
company_id, ispush, isallot,
isaims)
isaims, pay_type, pay_status,
last_signtime, arrival_status)
values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT},
#{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR},
#{deliverValue,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR},
......@@ -219,7 +225,8 @@
#{gmtModified,jdbcType=TIMESTAMP}, #{quantityNotInbound,jdbcType=INTEGER}, #{alibabaOrderId,jdbcType=VARCHAR},
#{logisticsOrderId,jdbcType=VARCHAR}, #{logisticsCompanyName,jdbcType=VARCHAR},
#{companyId,jdbcType=INTEGER}, #{ispush,jdbcType=INTEGER}, #{isallot,jdbcType=TINYINT},
#{isaims,jdbcType=INTEGER})
#{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER},
#{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
<!--
......@@ -354,6 +361,18 @@
<if test="isaims != null">
isaims,
</if>
<if test="payType != null">
pay_type,
</if>
<if test="payStatus != null">
pay_status,
</if>
<if test="lastSigntime != null">
last_signtime,
</if>
<if test="arrivalStatus != null">
arrival_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -482,6 +501,18 @@
<if test="isaims != null">
#{isaims,jdbcType=INTEGER},
</if>
<if test="payType != null">
#{payType,jdbcType=INTEGER},
</if>
<if test="payStatus != null">
#{payStatus,jdbcType=INTEGER},
</if>
<if test="lastSigntime != null">
#{lastSigntime,jdbcType=TIMESTAMP},
</if>
<if test="arrivalStatus != null">
#{arrivalStatus,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long">
......@@ -627,6 +658,18 @@
<if test="record.isaims != null">
isaims = #{record.isaims,jdbcType=INTEGER},
</if>
<if test="record.payType != null">
pay_type = #{record.payType,jdbcType=INTEGER},
</if>
<if test="record.payStatus != null">
pay_status = #{record.payStatus,jdbcType=INTEGER},
</if>
<if test="record.lastSigntime != null">
last_signtime = #{record.lastSigntime,jdbcType=TIMESTAMP},
</if>
<if test="record.arrivalStatus != null">
arrival_status = #{record.arrivalStatus,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -679,7 +722,11 @@
company_id = #{record.companyId,jdbcType=INTEGER},
ispush = #{record.ispush,jdbcType=INTEGER},
isallot = #{record.isallot,jdbcType=TINYINT},
isaims = #{record.isaims,jdbcType=INTEGER}
isaims = #{record.isaims,jdbcType=INTEGER},
pay_type = #{record.payType,jdbcType=INTEGER},
pay_status = #{record.payStatus,jdbcType=INTEGER},
last_signtime = #{record.lastSigntime,jdbcType=TIMESTAMP},
arrival_status = #{record.arrivalStatus,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -814,6 +861,18 @@
<if test="isaims != null">
isaims = #{isaims,jdbcType=INTEGER},
</if>
<if test="payType != null">
pay_type = #{payType,jdbcType=INTEGER},
</if>
<if test="payStatus != null">
pay_status = #{payStatus,jdbcType=INTEGER},
</if>
<if test="lastSigntime != null">
last_signtime = #{lastSigntime,jdbcType=TIMESTAMP},
</if>
<if test="arrivalStatus != null">
arrival_status = #{arrivalStatus,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -863,7 +922,11 @@
company_id = #{companyId,jdbcType=INTEGER},
ispush = #{ispush,jdbcType=INTEGER},
isallot = #{isallot,jdbcType=TINYINT},
isaims = #{isaims,jdbcType=INTEGER}
isaims = #{isaims,jdbcType=INTEGER},
pay_type = #{payType,jdbcType=INTEGER},
pay_status = #{payStatus,jdbcType=INTEGER},
last_signtime = #{lastSigntime,jdbcType=TIMESTAMP},
arrival_status = #{arrivalStatus,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
......@@ -1000,6 +1063,18 @@
<if test="isaims != null">
isaims,
</if>
<if test="payType != null">
pay_type,
</if>
<if test="payStatus != null">
pay_status,
</if>
<if test="lastSigntime != null">
last_signtime,
</if>
<if test="arrivalStatus != null">
arrival_status,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -1129,6 +1204,18 @@
<if test="isaims != null">
#{isaims,jdbcType=INTEGER},
</if>
<if test="payType != null">
#{payType,jdbcType=INTEGER},
</if>
<if test="payStatus != null">
#{payStatus,jdbcType=INTEGER},
</if>
<if test="lastSigntime != null">
#{lastSigntime,jdbcType=TIMESTAMP},
</if>
<if test="arrivalStatus != null">
#{arrivalStatus,jdbcType=INTEGER},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -1258,6 +1345,18 @@
<if test="isaims != null">
isaims = #{isaims,jdbcType=INTEGER},
</if>
<if test="payType != null">
pay_type = #{payType,jdbcType=INTEGER},
</if>
<if test="payStatus != null">
pay_status = #{payStatus,jdbcType=INTEGER},
</if>
<if test="lastSigntime != null">
last_signtime = #{lastSigntime,jdbcType=TIMESTAMP},
</if>
<if test="arrivalStatus != null">
arrival_status = #{arrivalStatus,jdbcType=INTEGER},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
......@@ -1274,8 +1373,8 @@
quantity_not_arrival, quantity_inspect, quantity_qualified_inspect, quantity_unqualified_inspect,
quantity_wait_transfer, quantity_exchange, quantity_lose_inbound, create_time,
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)
values
(#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT},
#{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR},
......@@ -1292,7 +1391,8 @@
#{gmtModified,jdbcType=TIMESTAMP}, #{quantityNotInbound,jdbcType=INTEGER}, #{alibabaOrderId,jdbcType=VARCHAR},
#{logisticsOrderId,jdbcType=VARCHAR}, #{logisticsCompanyName,jdbcType=VARCHAR},
#{companyId,jdbcType=INTEGER}, #{ispush,jdbcType=INTEGER}, #{isallot,jdbcType=TINYINT},
#{isaims,jdbcType=INTEGER})
#{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER},
#{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER})
on duplicate key update
id = #{id,jdbcType=INTEGER},
purchase_id = #{purchaseId,jdbcType=VARCHAR},
......@@ -1335,7 +1435,11 @@
company_id = #{companyId,jdbcType=INTEGER},
ispush = #{ispush,jdbcType=INTEGER},
isallot = #{isallot,jdbcType=TINYINT},
isaims = #{isaims,jdbcType=INTEGER}
isaims = #{isaims,jdbcType=INTEGER},
pay_type = #{payType,jdbcType=INTEGER},
pay_status = #{payStatus,jdbcType=INTEGER},
last_signtime = #{lastSigntime,jdbcType=TIMESTAMP},
arrival_status = #{arrivalStatus,jdbcType=INTEGER}
</insert>
<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