成品采购-推送、调拨状态

data-base/base-sync-purchase-details/src/main/java/com/bailuntec/domain/dto/PurchaseDetailDTO.java

@@ -339,5 +339,11 @@ public class PurchaseDetailDTO {
     @JSONField(name = "ExpressCompany")
     private String logisticsCompanyName;
 
+    @JSONField(name = "ispush")
+    private Integer ispush;
+
+    @JSONField(name = "isallot")
+    private Integer isallot;
+
 }
 

data-common/src/main/java/com/bailuntec/domain/entity/DcBasePurchaseDetails.java

@@ -341,6 +341,15 @@ public class DcBasePurchaseDetails {
     private String logisticsCompanyName;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_purchase_details.company_id
+     *
+     * @mbg.generated
+     */
+    private Integer companyId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_purchase_details
      *
@@ -389,6 +398,7 @@ public class DcBasePurchaseDetails {
         sb.append(", alibabaOrderId=").append(alibabaOrderId);
         sb.append(", logisticsOrderId=").append(logisticsOrderId);
         sb.append(", logisticsCompanyName=").append(logisticsCompanyName);
+        sb.append(", companyId=").append(companyId);
         sb.append("]");
         return sb.toString();
     }
@@ -447,7 +457,8 @@ public class DcBasePurchaseDetails {
             && (this.getQuantityNotInbound() == null ? other.getQuantityNotInbound() == null : this.getQuantityNotInbound().equals(other.getQuantityNotInbound()))
             && (this.getAlibabaOrderId() == null ? other.getAlibabaOrderId() == null : this.getAlibabaOrderId().equals(other.getAlibabaOrderId()))
             && (this.getLogisticsOrderId() == null ? other.getLogisticsOrderId() == null : this.getLogisticsOrderId().equals(other.getLogisticsOrderId()))
-            && (this.getLogisticsCompanyName() == null ? other.getLogisticsCompanyName() == null : this.getLogisticsCompanyName().equals(other.getLogisticsCompanyName()));
+            && (this.getLogisticsCompanyName() == null ? other.getLogisticsCompanyName() == null : this.getLogisticsCompanyName().equals(other.getLogisticsCompanyName()))
+            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
     }
 
     /**
@@ -497,6 +508,7 @@ public class DcBasePurchaseDetails {
         result = prime * result + ((getAlibabaOrderId() == null) ? 0 : getAlibabaOrderId().hashCode());
         result = prime * result + ((getLogisticsOrderId() == null) ? 0 : getLogisticsOrderId().hashCode());
         result = prime * result + ((getLogisticsCompanyName() == null) ? 0 : getLogisticsCompanyName().hashCode());
+        result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBasePurchaseDetailsExample.java

@@ -2730,6 +2730,66 @@ public class DcBasePurchaseDetailsExample {
             addCriterion("logistics_company_name not between", value1, value2, "logisticsCompanyName");
             return (Criteria) this;
         }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/mapper/DcBasePurchaseDetailsMapper.xml

@@ -43,6 +43,7 @@
     <result column="alibaba_order_id" jdbcType="VARCHAR" property="alibabaOrderId" />
     <result column="logistics_order_id" jdbcType="VARCHAR" property="logisticsOrderId" />
     <result column="logistics_company_name" jdbcType="VARCHAR" property="logisticsCompanyName" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -122,7 +123,7 @@
     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
+    logistics_company_name, company_id
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
     <!--
@@ -195,8 +196,8 @@
       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
-      )
+      alibaba_order_id, logistics_order_id, logistics_company_name, 
+      company_id)
     values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
       #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, 
       #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR}, #{warehouseFromName,jdbcType=VARCHAR}, 
@@ -209,8 +210,8 @@
       #{quantityWaitTransfer,jdbcType=INTEGER}, #{quantityExchange,jdbcType=INTEGER}, 
       #{quantityLoseInbound,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{quantityNotInbound,jdbcType=INTEGER}, 
-      #{alibabaOrderId,jdbcType=VARCHAR}, #{logisticsOrderId,jdbcType=VARCHAR}, #{logisticsCompanyName,jdbcType=VARCHAR}
-      )
+      #{alibabaOrderId,jdbcType=VARCHAR}, #{logisticsOrderId,jdbcType=VARCHAR}, #{logisticsCompanyName,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
     <!--
@@ -330,6 +331,9 @@
       <if test="logisticsCompanyName != null">
         logistics_company_name,
       </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -443,6 +447,9 @@
       <if test="logisticsCompanyName != null">
         #{logisticsCompanyName,jdbcType=VARCHAR},
       </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long">
@@ -573,6 +580,9 @@
       <if test="record.logisticsCompanyName != null">
         logistics_company_name = #{record.logisticsCompanyName,jdbcType=VARCHAR},
       </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -620,7 +630,8 @@
       quantity_not_inbound = #{record.quantityNotInbound,jdbcType=INTEGER},
       alibaba_order_id = #{record.alibabaOrderId,jdbcType=VARCHAR},
       logistics_order_id = #{record.logisticsOrderId,jdbcType=VARCHAR},
-      logistics_company_name = #{record.logisticsCompanyName,jdbcType=VARCHAR}
+      logistics_company_name = #{record.logisticsCompanyName,jdbcType=VARCHAR},
+      company_id = #{record.companyId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -740,6 +751,9 @@
       <if test="logisticsCompanyName != null">
         logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR},
       </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -784,7 +798,8 @@
       quantity_not_inbound = #{quantityNotInbound,jdbcType=INTEGER},
       alibaba_order_id = #{alibabaOrderId,jdbcType=VARCHAR},
       logistics_order_id = #{logisticsOrderId,jdbcType=VARCHAR},
-      logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR}
+      logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR},
+      company_id = #{companyId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
@@ -906,6 +921,9 @@
       <if test="logisticsCompanyName != null">
         logistics_company_name,
       </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1020,6 +1038,9 @@
       <if test="logisticsCompanyName != null">
         #{logisticsCompanyName,jdbcType=VARCHAR},
       </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -1134,6 +1155,9 @@
       <if test="logisticsCompanyName != null">
         logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR},
       </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
@@ -1150,7 +1174,7 @@
       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)
+      logistics_order_id, logistics_company_name, company_id)
     values
     (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
       #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, 
@@ -1164,8 +1188,8 @@
       #{quantityWaitTransfer,jdbcType=INTEGER}, #{quantityExchange,jdbcType=INTEGER}, 
       #{quantityLoseInbound,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{quantityNotInbound,jdbcType=INTEGER}, 
-      #{alibabaOrderId,jdbcType=VARCHAR}, #{logisticsOrderId,jdbcType=VARCHAR}, #{logisticsCompanyName,jdbcType=VARCHAR}
-      )
+      #{alibabaOrderId,jdbcType=VARCHAR}, #{logisticsOrderId,jdbcType=VARCHAR}, #{logisticsCompanyName,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=INTEGER})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     purchase_id = #{purchaseId,jdbcType=VARCHAR}, 
@@ -1203,7 +1227,8 @@
     quantity_not_inbound = #{quantityNotInbound,jdbcType=INTEGER}, 
     alibaba_order_id = #{alibabaOrderId,jdbcType=VARCHAR}, 
     logistics_order_id = #{logisticsOrderId,jdbcType=VARCHAR}, 
-    logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR}
+    logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR}, 
+    company_id = #{companyId,jdbcType=INTEGER}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
     <!--