Skip to content

D
dc-java
Commit cd3b91d5 by yinyong
Options

dc_base_oms_sku表新增 bailun_sku_quantity_pushed 百伦SKU配货推送第三方仓库(易仓)数量 

dc_base_oms_pick表新增has_pushed 是否推送第三方仓库(易仓)字段
parent 456c1d54
Showing with 239 additions and 25 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/Payment.java
......@@ -3,6 +3,8 @@ package com.bailuntec.domain.pojo;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class Payment {
......@@ -14,7 +16,7 @@ public class Payment {
* @mbg.generated
*/
@JSONField(name = "payTimeUtc")
private String payTime;
private LocalDateTime payTime;
/**
*
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/PickingOrder.java
......@@ -130,4 +130,7 @@ public class PickingOrder {
*/
@JSONField(name = "outputWeight_KG")
private BigDecimal outboundWeight;
@JSONField(name = "isPushedThirdSys")
private Boolean hasPushed;
}
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
......@@ -709,6 +709,9 @@ public class OrderSyncJob extends PointJob {
BigDecimal totalCostPackaging = BigDecimal.ZERO;
BigDecimal totalCostShipping = BigDecimal.ZERO;
if (pickingOrderList != null && pickingOrderList.size() > 0) {
/*
* 遍历配货单信息
*/
for (PickingOrder pickingOrder : pickingOrderList) {
BigDecimal skuCostShipping = pickingOrder.getCostShipping() != null ? pickingOrder.getCostShipping() : BigDecimal.ZERO;
BigDecimal skuCostPackaging = pickingOrder.getCostPackaging() != null ? pickingOrder.getCostPackaging() : BigDecimal.ZERO;
......@@ -724,6 +727,9 @@ public class OrderSyncJob extends PointJob {
pickOrderTotalWeight = pickOrderTotalWeight.add(bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(pickingItem.getQuantityPicked())));
}
}
/*
* 遍历配货单的所有SKU
*/
for (PickingItem pickingItem : pickingItems) {
BigDecimal quantityPickedBigDecimal = BigDecimal.valueOf(pickingItem.getQuantityPicked());
DcBaseOmsPick dcBaseOmsPick = new DcBaseOmsPick();
......@@ -759,10 +765,14 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsPick.setTrackingOrderId(pickingOrder.getTrackingOrderId());
dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider());
dcBaseOmsPick.setCompanyId(omsResult.getCompanyId());
dcBaseOmsPick.setHasPushed(pickingOrder.getHasPushed());
if (bailunSkuStructure != null) {
DcBaseOmsSku dcBaseOmsSku = bailunSkuStructure.getDcBaseOmsSku();
dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped());
dcBaseOmsSku.setBailunSkuQuantityPicked(dcBaseOmsSku.getBailunSkuQuantityPicked() != null ? dcBaseOmsSku.getBailunSkuQuantityPicked() + dcBaseOmsPick.getQuantityPicked() : dcBaseOmsPick.getQuantityPicked());
if(pickingOrder.getHasPushed()) {
dcBaseOmsSku.setBailunSkuQuantityPushed(dcBaseOmsSku.getBailunSkuQuantityPushed() != null ? dcBaseOmsSku.getBailunSkuQuantityPushed() + dcBaseOmsPick.getQuantityPicked() : dcBaseOmsPick.getQuantityPicked());
}
dcBaseOmsSku.setCostHandlePlatform(dcBaseOmsSku.getCostHandlePlatform() != null ? dcBaseOmsSku.getCostHandlePlatform().add(dcBaseOmsPick.getBailunSkuCostPackaging()) : dcBaseOmsPick.getBailunSkuCostPackaging());
dcBaseOmsSku.setCostTail(dcBaseOmsSku.getCostTail() != null ? dcBaseOmsSku.getCostTail().add(dcBaseOmsPick.getBailunSkuCostShipping()) : dcBaseOmsPick.getBailunSkuCostShipping());
}
......@@ -895,9 +905,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setSellerEmail(omsResult.getSeller().getSellerEmail());
}
if (omsResult.getPayment() != null) {
if (omsResult.getPayment().getPayTime() != null) {
dcBaseOmsOrder.setPayTime(LocalDateTime.parse(omsResult.getPayment().getPayTime(), DateTimeFormatter.ofPattern("M/d/yy h:m:s a", Locale.US)));
}
dcBaseOmsOrder.setPayTime(omsResult.getPayment().getPayTime());
dcBaseOmsOrder.setPayMethod(omsResult.getPayment().getPayMethod());
dcBaseOmsOrder.setPayAccount(omsResult.getPayment().getPayAccount());
dcBaseOmsOrder.setPayStatus(omsResult.getPayment().getPayStatus());
......@@ -980,6 +988,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setCompanyId(omsResult.getCompanyId());
dcBaseOmsSku.setBailunSkuQuantityShipped(0);
dcBaseOmsSku.setBailunSkuQuantityPicked(0);
dcBaseOmsSku.setBailunSkuQuantityPushed(0);
dcBaseOmsSku.setCostHandlePlatform(BigDecimal.ZERO);
dcBaseOmsSku.setCostTail(BigDecimal.ZERO);
dcBaseOmsSku.setBailunInterceptionStatus(dcBaseOmsOrder.getBailunInterceptionStatus());
......@@ -1028,9 +1037,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setSellerEmail(omsResult.getSeller().getSellerEmail());
}
if (omsResult.getPayment() != null) {
if (omsResult.getPayment().getPayTime() != null) {
dcBaseOmsSku.setPayTime(LocalDateTime.parse(omsResult.getPayment().getPayTime(), DateTimeFormatter.ofPattern("M/d/yy h:m:s a", Locale.US)));
}
dcBaseOmsSku.setPayTime(omsResult.getPayment().getPayTime());
dcBaseOmsSku.setPayMethod(omsResult.getPayment().getPayMethod());
dcBaseOmsSku.setPayAccount(omsResult.getPayment().getPayAccount());
dcBaseOmsSku.setPayStatus(omsResult.getPayment().getPayStatus());
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsPickMapper.xml
......@@ -34,6 +34,7 @@
<result column="bailun_sku_outbound_weight" jdbcType="DECIMAL" property="bailunSkuOutboundWeight" />
<result column="has_delete" jdbcType="BIT" property="hasDelete" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="has_pushed" jdbcType="BIT" property="hasPushed" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -111,7 +112,7 @@
logistics_order_id, logistics_order_name, gmt_create, gmt_modified, quantity_picked,
quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging, outbound_weight,
bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete, company_id
has_delete, company_id, has_pushed
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap">
<!--
......@@ -181,7 +182,8 @@
bailun_sku, declare_price, cost_shipping,
cost_packaging, outbound_weight, bailun_sku_cost_shipping,
bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete, company_id)
has_delete, company_id, has_pushed
)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR},
#{trackingOrderId,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
......@@ -191,7 +193,8 @@
#{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL},
#{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER})
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasPushed,jdbcType=BIT}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
<!--
......@@ -284,6 +287,9 @@
<if test="companyId != null">
company_id,
</if>
<if test="hasPushed != null">
has_pushed,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -370,6 +376,9 @@
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
<if test="hasPushed != null">
#{hasPushed,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultType="java.lang.Long">
......@@ -473,6 +482,9 @@
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</if>
<if test="record.hasPushed != null">
has_pushed = #{record.hasPushed,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -511,7 +523,8 @@
bailun_sku_cost_packaging = #{record.bailunSkuCostPackaging,jdbcType=DECIMAL},
bailun_sku_outbound_weight = #{record.bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{record.hasDelete,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER}
company_id = #{record.companyId,jdbcType=INTEGER},
has_pushed = #{record.hasPushed,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -604,6 +617,9 @@
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
<if test="hasPushed != null">
has_pushed = #{hasPushed,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -639,7 +655,8 @@
bailun_sku_cost_packaging = #{bailunSkuCostPackaging,jdbcType=DECIMAL},
bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{hasDelete,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
company_id = #{companyId,jdbcType=INTEGER},
has_pushed = #{hasPushed,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
......@@ -734,6 +751,9 @@
<if test="companyId != null">
company_id,
</if>
<if test="hasPushed != null">
has_pushed,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -821,6 +841,9 @@
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
<if test="hasPushed != null">
#{hasPushed,jdbcType=BIT},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -908,6 +931,9 @@
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
<if test="hasPushed != null">
has_pushed = #{hasPushed,jdbcType=BIT},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
......@@ -922,7 +948,7 @@
warehouse_code, logistics_order_id, logistics_order_name, gmt_create, gmt_modified,
quantity_picked, quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging,
outbound_weight, bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete, company_id)
has_delete, company_id, has_pushed)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR},
......@@ -933,7 +959,8 @@
#{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL},
#{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER})
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasPushed,jdbcType=BIT}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -962,7 +989,8 @@
bailun_sku_cost_packaging = #{bailunSkuCostPackaging,jdbcType=DECIMAL},
bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{hasDelete,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
company_id = #{companyId,jdbcType=INTEGER},
has_pushed = #{hasPushed,jdbcType=BIT}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap">
<!--
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
......@@ -115,6 +115,7 @@
<result column="refund_type" jdbcType="VARCHAR" property="refundType" />
<result column="refund_reference_id" jdbcType="VARCHAR" property="refundReferenceId" />
<result column="has_fba_s" jdbcType="BIT" property="hasFbaS" />
<result column="bailun_sku_quantity_pushed" jdbcType="INTEGER" property="bailunSkuQuantityPushed" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -207,7 +208,7 @@
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s
bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -307,7 +308,8 @@
has_delete, has_scalp, logistics_method_code,
logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type,
refund_reference_id, has_fba_s)
refund_reference_id, has_fba_s, bailun_sku_quantity_pushed
)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -347,7 +349,8 @@
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!--
......@@ -683,6 +686,9 @@
<if test="hasFbaS != null">
has_fba_s,
</if>
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -1012,6 +1018,9 @@
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
<if test="bailunSkuQuantityPushed != null">
#{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
......@@ -1358,6 +1367,9 @@
<if test="record.hasFbaS != null">
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
</if>
<if test="record.bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1477,7 +1489,8 @@
refund_obj = #{record.refundObj,jdbcType=VARCHAR},
refund_type = #{record.refundType,jdbcType=VARCHAR},
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{record.hasFbaS,jdbcType=BIT}
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1813,6 +1826,9 @@
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1929,7 +1945,8 @@
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2267,6 +2284,9 @@
<if test="hasFbaS != null">
has_fba_s,
</if>
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2597,6 +2617,9 @@
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
<if test="bailunSkuQuantityPushed != null">
#{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2927,6 +2950,9 @@
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2957,7 +2983,7 @@
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id,
has_fba_s)
has_fba_s, bailun_sku_quantity_pushed)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2998,7 +3024,8 @@
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -3108,7 +3135,8 @@
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsPick.java
......@@ -260,6 +260,15 @@ public class DcBaseOmsPick {
private Integer companyId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.has_pushed
*
* @mbg.generated
*/
private Boolean hasPushed;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_pick
*
......@@ -299,6 +308,7 @@ public class DcBaseOmsPick {
sb.append(", bailunSkuOutboundWeight=").append(bailunSkuOutboundWeight);
sb.append(", hasDelete=").append(hasDelete);
sb.append(", companyId=").append(companyId);
sb.append(", hasPushed=").append(hasPushed);
sb.append("]");
return sb.toString();
}
......@@ -348,7 +358,8 @@ public class DcBaseOmsPick {
&& (this.getBailunSkuCostPackaging() == null ? other.getBailunSkuCostPackaging() == null : this.getBailunSkuCostPackaging().equals(other.getBailunSkuCostPackaging()))
&& (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight()))
&& (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getHasPushed() == null ? other.getHasPushed() == null : this.getHasPushed().equals(other.getHasPushed()));
}
/**
......@@ -389,6 +400,7 @@ public class DcBaseOmsPick {
result = prime * result + ((getBailunSkuOutboundWeight() == null) ? 0 : getBailunSkuOutboundWeight().hashCode());
result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getHasPushed() == null) ? 0 : getHasPushed().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
......@@ -989,6 +989,15 @@ public class DcBaseOmsSku {
private Boolean hasFbaS;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.bailun_sku_quantity_pushed
*
* @mbg.generated
*/
private Integer bailunSkuQuantityPushed;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku
*
......@@ -1109,6 +1118,7 @@ public class DcBaseOmsSku {
sb.append(", refundType=").append(refundType);
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append(", hasFbaS=").append(hasFbaS);
sb.append(", bailunSkuQuantityPushed=").append(bailunSkuQuantityPushed);
sb.append("]");
return sb.toString();
}
......@@ -1239,7 +1249,8 @@ public class DcBaseOmsSku {
&& (this.getRefundObj() == null ? other.getRefundObj() == null : this.getRefundObj().equals(other.getRefundObj()))
&& (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()))
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()));
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()))
&& (this.getBailunSkuQuantityPushed() == null ? other.getBailunSkuQuantityPushed() == null : this.getBailunSkuQuantityPushed().equals(other.getBailunSkuQuantityPushed()));
}
/**
......@@ -1361,6 +1372,7 @@ public class DcBaseOmsSku {
result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode());
result = prime * result + ((getBailunSkuQuantityPushed() == null) ? 0 : getBailunSkuQuantityPushed().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsPickExample.java
......@@ -2160,6 +2160,66 @@ public class DcBaseOmsPickExample {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andHasPushedIsNull() {
addCriterion("has_pushed is null");
return (Criteria) this;
}
public Criteria andHasPushedIsNotNull() {
addCriterion("has_pushed is not null");
return (Criteria) this;
}
public Criteria andHasPushedEqualTo(Boolean value) {
addCriterion("has_pushed =", value, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedNotEqualTo(Boolean value) {
addCriterion("has_pushed <>", value, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedGreaterThan(Boolean value) {
addCriterion("has_pushed >", value, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_pushed >=", value, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedLessThan(Boolean value) {
addCriterion("has_pushed <", value, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedLessThanOrEqualTo(Boolean value) {
addCriterion("has_pushed <=", value, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedIn(List<Boolean> values) {
addCriterion("has_pushed in", values, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedNotIn(List<Boolean> values) {
addCriterion("has_pushed not in", values, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedBetween(Boolean value1, Boolean value2) {
addCriterion("has_pushed between", value1, value2, "hasPushed");
return (Criteria) this;
}
public Criteria andHasPushedNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_pushed not between", value1, value2, "hasPushed");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
......@@ -7410,6 +7410,66 @@ public class DcBaseOmsSkuExample {
addCriterion("has_fba_s not between", value1, value2, "hasFbaS");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedIsNull() {
addCriterion("bailun_sku_quantity_pushed is null");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedIsNotNull() {
addCriterion("bailun_sku_quantity_pushed is not null");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedEqualTo(Integer value) {
addCriterion("bailun_sku_quantity_pushed =", value, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedNotEqualTo(Integer value) {
addCriterion("bailun_sku_quantity_pushed <>", value, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedGreaterThan(Integer value) {
addCriterion("bailun_sku_quantity_pushed >", value, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedGreaterThanOrEqualTo(Integer value) {
addCriterion("bailun_sku_quantity_pushed >=", value, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedLessThan(Integer value) {
addCriterion("bailun_sku_quantity_pushed <", value, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedLessThanOrEqualTo(Integer value) {
addCriterion("bailun_sku_quantity_pushed <=", value, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedIn(List<Integer> values) {
addCriterion("bailun_sku_quantity_pushed in", values, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedNotIn(List<Integer> values) {
addCriterion("bailun_sku_quantity_pushed not in", values, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedBetween(Integer value1, Integer value2) {
addCriterion("bailun_sku_quantity_pushed between", value1, value2, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andBailunSkuQuantityPushedNotBetween(Integer value1, Integer value2) {
addCriterion("bailun_sku_quantity_pushed not between", value1, value2, "bailunSkuQuantityPushed");
return (Criteria) this;
}
}
/**
......
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