WMS调拨打包：交运方式

data-base/base-sync-transfer/src/main/java/com/bailuntec/domain/pojo/TransferStreamPOJO.java

@@ -137,4 +137,7 @@ public class TransferStreamPOJO {
 
        @JSONField(name = "sourceWareNo")
        private String sourceWarehouseCode;
+
+       @JSONField(name = "TransportType")
+       private String transportType;
 }

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

 package com.bailuntec.domain.entity;
 
-import java.time.LocalDateTime;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class DcBaseTransferBale {
     /**
@@ -141,6 +142,15 @@ public class DcBaseTransferBale {
     private String sourceWarehouseCode;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_transfer_bale.transport_type
+     *
+     * @mbg.generated
+     */
+    private String transportType;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_transfer_bale
      *
@@ -167,6 +177,7 @@ public class DcBaseTransferBale {
         sb.append(", deleted=").append(deleted);
         sb.append(", companyId=").append(companyId);
         sb.append(", sourceWarehouseCode=").append(sourceWarehouseCode);
+        sb.append(", transportType=").append(transportType);
         sb.append("]");
         return sb.toString();
     }
@@ -203,7 +214,8 @@ public class DcBaseTransferBale {
             && (this.getTransferKey() == null ? other.getTransferKey() == null : this.getTransferKey().equals(other.getTransferKey()))
             && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
-            && (this.getSourceWarehouseCode() == null ? other.getSourceWarehouseCode() == null : this.getSourceWarehouseCode().equals(other.getSourceWarehouseCode()));
+            && (this.getSourceWarehouseCode() == null ? other.getSourceWarehouseCode() == null : this.getSourceWarehouseCode().equals(other.getSourceWarehouseCode()))
+            && (this.getTransportType() == null ? other.getTransportType() == null : this.getTransportType().equals(other.getTransportType()));
     }
 
     /**
@@ -231,6 +243,7 @@ public class DcBaseTransferBale {
         result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getSourceWarehouseCode() == null) ? 0 : getSourceWarehouseCode().hashCode());
+        result = prime * result + ((getTransportType() == null) ? 0 : getTransportType().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -1339,6 +1339,76 @@ public class DcBaseTransferBaleExample {
             addCriterion("source_warehouse_code not between", value1, value2, "sourceWarehouseCode");
             return (Criteria) this;
         }
+
+        public Criteria andTransportTypeIsNull() {
+            addCriterion("transport_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeIsNotNull() {
+            addCriterion("transport_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeEqualTo(String value) {
+            addCriterion("transport_type =", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotEqualTo(String value) {
+            addCriterion("transport_type <>", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeGreaterThan(String value) {
+            addCriterion("transport_type >", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("transport_type >=", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeLessThan(String value) {
+            addCriterion("transport_type <", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeLessThanOrEqualTo(String value) {
+            addCriterion("transport_type <=", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeLike(String value) {
+            addCriterion("transport_type like", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotLike(String value) {
+            addCriterion("transport_type not like", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeIn(List<String> values) {
+            addCriterion("transport_type in", values, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotIn(List<String> values) {
+            addCriterion("transport_type not in", values, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeBetween(String value1, String value2) {
+            addCriterion("transport_type between", value1, value2, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotBetween(String value1, String value2) {
+            addCriterion("transport_type not between", value1, value2, "transportType");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -21,6 +21,7 @@
     <result column="deleted" jdbcType="BIT" property="deleted" />
     <result column="company_id" jdbcType="INTEGER" property="companyId" />
     <result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" />
+    <result column="transport_type" jdbcType="VARCHAR" property="transportType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -94,7 +95,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, gmt_create, gmt_modified, bailun_sku, transfer_order_id, warehouse_code, warehouse_name, 
-    status, create_time, count, sku_title, transfer_key, deleted, company_id, source_warehouse_code
+    status, create_time, count, sku_title, transfer_key, deleted, company_id, source_warehouse_code, 
+    transport_type
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferBaleExample" resultMap="BaseResultMap">
     <!--
@@ -159,14 +161,14 @@
       bailun_sku, transfer_order_id, warehouse_code, 
       warehouse_name, status, create_time, 
       count, sku_title, transfer_key, 
-      deleted, company_id, source_warehouse_code
-      )
+      deleted, company_id, source_warehouse_code, 
+      transport_type)
     values (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{bailunSku,jdbcType=VARCHAR}, #{transferOrderId,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, 
       #{warehouseName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{count,jdbcType=INTEGER}, #{skuTitle,jdbcType=VARCHAR}, #{transferKey,jdbcType=INTEGER}, 
-      #{deleted,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{sourceWarehouseCode,jdbcType=VARCHAR}
-      )
+      #{deleted,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{sourceWarehouseCode,jdbcType=VARCHAR}, 
+      #{transportType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseTransferBale">
     <!--
@@ -220,6 +222,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code,
       </if>
+      <if test="transportType != null">
+        transport_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -267,6 +272,9 @@
       <if test="sourceWarehouseCode != null">
         #{sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="transportType != null">
+        #{transportType,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferBaleExample" resultType="java.lang.Long">
@@ -331,6 +339,9 @@
       <if test="record.sourceWarehouseCode != null">
         source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.transportType != null">
+        transport_type = #{record.transportType,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -356,7 +367,8 @@
       transfer_key = #{record.transferKey,jdbcType=INTEGER},
       deleted = #{record.deleted,jdbcType=BIT},
       company_id = #{record.companyId,jdbcType=INTEGER},
-      source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR}
+      source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
+      transport_type = #{record.transportType,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -410,6 +422,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="transportType != null">
+        transport_type = #{transportType,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -432,7 +447,8 @@
       transfer_key = #{transferKey,jdbcType=INTEGER},
       deleted = #{deleted,jdbcType=BIT},
       company_id = #{companyId,jdbcType=INTEGER},
-      source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR}
+      source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR},
+      transport_type = #{transportType,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseTransferBale">
@@ -488,6 +504,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code,
       </if>
+      <if test="transportType != null">
+        transport_type,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -536,6 +555,9 @@
       <if test="sourceWarehouseCode != null">
         #{sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="transportType != null">
+        #{transportType,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -584,6 +606,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="transportType != null">
+        transport_type = #{transportType,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseTransferBale">
@@ -594,15 +619,15 @@
     -->
     insert into dc_base_transfer_bale
     (id, gmt_create, gmt_modified, bailun_sku, transfer_order_id, warehouse_code, warehouse_name, 
-      status, create_time, count, sku_title, transfer_key, deleted, company_id, source_warehouse_code
-      )
+      status, create_time, count, sku_title, transfer_key, deleted, company_id, source_warehouse_code, 
+      transport_type)
     values
     (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{bailunSku,jdbcType=VARCHAR}, #{transferOrderId,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, 
       #{warehouseName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{count,jdbcType=INTEGER}, #{skuTitle,jdbcType=VARCHAR}, #{transferKey,jdbcType=INTEGER}, 
-      #{deleted,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{sourceWarehouseCode,jdbcType=VARCHAR}
-      )
+      #{deleted,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{sourceWarehouseCode,jdbcType=VARCHAR}, 
+      #{transportType,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, 
@@ -618,7 +643,8 @@
     transfer_key = #{transferKey,jdbcType=INTEGER}, 
     deleted = #{deleted,jdbcType=BIT}, 
     company_id = #{companyId,jdbcType=INTEGER}, 
-    source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR}
+    source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR}, 
+    transport_type = #{transportType,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferBaleExample" resultMap="BaseResultMap">
     <!--