成品采购状态修改

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

@@ -339,6 +339,9 @@ public class PurchaseDetailDTO {
     @JSONField(name = "ExpressCompany")
     private String logisticsCompanyName;
 
+    @JSONField(name = "no")
+    private Integer companyId;
+
     @JSONField(name = "ispush")
     private Integer ispush;
 

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

@@ -350,6 +350,24 @@ public class DcBasePurchaseDetails {
     private Integer companyId;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_purchase_details.ispush
+     *
+     * @mbg.generated
+     */
+    private Boolean ispush;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_purchase_details.isallot
+     *
+     * @mbg.generated
+     */
+    private Boolean isallot;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_purchase_details
      *
@@ -399,6 +417,8 @@ public class DcBasePurchaseDetails {
         sb.append(", logisticsOrderId=").append(logisticsOrderId);
         sb.append(", logisticsCompanyName=").append(logisticsCompanyName);
         sb.append(", companyId=").append(companyId);
+        sb.append(", ispush=").append(ispush);
+        sb.append(", isallot=").append(isallot);
         sb.append("]");
         return sb.toString();
     }
@@ -458,7 +478,9 @@ public class DcBasePurchaseDetails {
             && (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.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
+            && (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()));
     }
 
     /**
@@ -509,6 +531,8 @@ public class DcBasePurchaseDetails {
         result = prime * result + ((getLogisticsOrderId() == null) ? 0 : getLogisticsOrderId().hashCode());
         result = prime * result + ((getLogisticsCompanyName() == null) ? 0 : getLogisticsCompanyName().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
+        result = prime * result + ((getIspush() == null) ? 0 : getIspush().hashCode());
+        result = prime * result + ((getIsallot() == null) ? 0 : getIsallot().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -2790,6 +2790,126 @@ public class DcBasePurchaseDetailsExample {
             addCriterion("company_id not between", value1, value2, "companyId");
             return (Criteria) this;
         }
+
+        public Criteria andIspushIsNull() {
+            addCriterion("ispush is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushIsNotNull() {
+            addCriterion("ispush is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushEqualTo(Boolean value) {
+            addCriterion("ispush =", value, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushNotEqualTo(Boolean value) {
+            addCriterion("ispush <>", value, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushGreaterThan(Boolean value) {
+            addCriterion("ispush >", value, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("ispush >=", value, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushLessThan(Boolean value) {
+            addCriterion("ispush <", value, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushLessThanOrEqualTo(Boolean value) {
+            addCriterion("ispush <=", value, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushIn(List<Boolean> values) {
+            addCriterion("ispush in", values, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushNotIn(List<Boolean> values) {
+            addCriterion("ispush not in", values, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushBetween(Boolean value1, Boolean value2) {
+            addCriterion("ispush between", value1, value2, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIspushNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("ispush not between", value1, value2, "ispush");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotIsNull() {
+            addCriterion("isallot is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotIsNotNull() {
+            addCriterion("isallot is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotEqualTo(Boolean value) {
+            addCriterion("isallot =", value, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotNotEqualTo(Boolean value) {
+            addCriterion("isallot <>", value, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotGreaterThan(Boolean value) {
+            addCriterion("isallot >", value, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("isallot >=", value, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotLessThan(Boolean value) {
+            addCriterion("isallot <", value, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotLessThanOrEqualTo(Boolean value) {
+            addCriterion("isallot <=", value, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotIn(List<Boolean> values) {
+            addCriterion("isallot in", values, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotNotIn(List<Boolean> values) {
+            addCriterion("isallot not in", values, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotBetween(Boolean value1, Boolean value2) {
+            addCriterion("isallot between", value1, value2, "isallot");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsallotNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("isallot not between", value1, value2, "isallot");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -44,6 +44,8 @@
     <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" />
+    <result column="ispush" jdbcType="BIT" property="ispush" />
+    <result column="isallot" jdbcType="BIT" property="isallot" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -123,7 +125,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, company_id
+    logistics_company_name, company_id, ispush, isallot
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
     <!--
@@ -197,7 +199,7 @@
       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)
+      company_id, ispush, isallot)
     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}, 
@@ -211,7 +213,7 @@
       #{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}, 
-      #{companyId,jdbcType=INTEGER})
+      #{companyId,jdbcType=INTEGER}, #{ispush,jdbcType=BIT}, #{isallot,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
     <!--
@@ -334,6 +336,12 @@
       <if test="companyId != null">
         company_id,
       </if>
+      <if test="ispush != null">
+        ispush,
+      </if>
+      <if test="isallot != null">
+        isallot,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -450,6 +458,12 @@
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="ispush != null">
+        #{ispush,jdbcType=BIT},
+      </if>
+      <if test="isallot != null">
+        #{isallot,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long">
@@ -583,6 +597,12 @@
       <if test="record.companyId != null">
         company_id = #{record.companyId,jdbcType=INTEGER},
       </if>
+      <if test="record.ispush != null">
+        ispush = #{record.ispush,jdbcType=BIT},
+      </if>
+      <if test="record.isallot != null">
+        isallot = #{record.isallot,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -631,7 +651,9 @@
       alibaba_order_id = #{record.alibabaOrderId,jdbcType=VARCHAR},
       logistics_order_id = #{record.logisticsOrderId,jdbcType=VARCHAR},
       logistics_company_name = #{record.logisticsCompanyName,jdbcType=VARCHAR},
-      company_id = #{record.companyId,jdbcType=INTEGER}
+      company_id = #{record.companyId,jdbcType=INTEGER},
+      ispush = #{record.ispush,jdbcType=BIT},
+      isallot = #{record.isallot,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -754,6 +776,12 @@
       <if test="companyId != null">
         company_id = #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="ispush != null">
+        ispush = #{ispush,jdbcType=BIT},
+      </if>
+      <if test="isallot != null">
+        isallot = #{isallot,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -799,7 +827,9 @@
       alibaba_order_id = #{alibabaOrderId,jdbcType=VARCHAR},
       logistics_order_id = #{logisticsOrderId,jdbcType=VARCHAR},
       logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR},
-      company_id = #{companyId,jdbcType=INTEGER}
+      company_id = #{companyId,jdbcType=INTEGER},
+      ispush = #{ispush,jdbcType=BIT},
+      isallot = #{isallot,jdbcType=BIT}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
@@ -924,6 +954,12 @@
       <if test="companyId != null">
         company_id,
       </if>
+      <if test="ispush != null">
+        ispush,
+      </if>
+      <if test="isallot != null">
+        isallot,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1041,6 +1077,12 @@
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="ispush != null">
+        #{ispush,jdbcType=BIT},
+      </if>
+      <if test="isallot != null">
+        #{isallot,jdbcType=BIT},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -1158,6 +1200,12 @@
       <if test="companyId != null">
         company_id = #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="ispush != null">
+        ispush = #{ispush,jdbcType=BIT},
+      </if>
+      <if test="isallot != null">
+        isallot = #{isallot,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
@@ -1174,7 +1222,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, company_id)
+      logistics_order_id, logistics_company_name, company_id, ispush, isallot)
     values
     (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
       #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, 
@@ -1189,7 +1237,7 @@
       #{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}, 
-      #{companyId,jdbcType=INTEGER})
+      #{companyId,jdbcType=INTEGER}, #{ispush,jdbcType=BIT}, #{isallot,jdbcType=BIT})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     purchase_id = #{purchaseId,jdbcType=VARCHAR}, 
@@ -1228,7 +1276,9 @@
     alibaba_order_id = #{alibabaOrderId,jdbcType=VARCHAR}, 
     logistics_order_id = #{logisticsOrderId,jdbcType=VARCHAR}, 
     logistics_company_name = #{logisticsCompanyName,jdbcType=VARCHAR}, 
-    company_id = #{companyId,jdbcType=INTEGER}
+    company_id = #{companyId,jdbcType=INTEGER}, 
+    ispush = #{ispush,jdbcType=BIT}, 
+    isallot = #{isallot,jdbcType=BIT}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
     <!--