WMS调拨计划单修改，调拨在途计算国内陆运、海运、空运、铁路运输在途数据

data-common/src/main/java/com/bailuntec/domain/dto/TransferTransitQuantity.java

@@ -12,5 +12,9 @@ public class TransferTransitQuantity {
     private String sourceWarehouseCode;
     private Integer count;
     private Integer countplan = 0;
+    private Integer landCount;
+    private Integer oceanCount;
+    private Integer airCount;
+    private Integer railwayCount;
     private LocalDateTime gmtTransferTransitModified;
 }

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

@@ -142,6 +142,15 @@ public class DcBaseTransferPlan {
     private String sourceWarehouseCode;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_transfer_plan.transport_type
+     *
+     * @mbg.generated
+     */
+    private String transportType;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_transfer_plan
      *
@@ -168,6 +177,7 @@ public class DcBaseTransferPlan {
         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();
     }
@@ -204,7 +214,8 @@ public class DcBaseTransferPlan {
             && (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()));
     }
 
     /**
@@ -232,6 +243,7 @@ public class DcBaseTransferPlan {
         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/DcBaseTransferPlanExample.java

@@ -1339,6 +1339,76 @@ public class DcBaseTransferPlanExample {
             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/DcBaseTransferPlanMapper.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">
     <!--
@@ -95,7 +96,7 @@
     -->
     id, gmt_create, gmt_modified, bailun_sku, transfer_plan_order_id, warehouse_code, 
     warehouse_name, status, update_time, count, sku_title, transfer_key, deleted, company_id, 
-    source_warehouse_code
+    source_warehouse_code, transport_type
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferPlanExample" resultMap="BaseResultMap">
     <!--
@@ -160,14 +161,14 @@
       bailun_sku, transfer_plan_order_id, warehouse_code, 
       warehouse_name, status, update_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}, #{transferPlanOrderId,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, 
       #{warehouseName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{updateTime,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.DcBaseTransferPlan">
     <!--
@@ -221,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">
@@ -268,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.DcBaseTransferPlanExample" resultType="java.lang.Long">
@@ -332,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" />
@@ -357,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>
@@ -411,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>
@@ -433,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.DcBaseTransferPlan">
@@ -489,6 +504,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code,
       </if>
+      <if test="transportType != null">
+        transport_type,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -537,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=",">
@@ -585,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.DcBaseTransferPlan">
@@ -596,14 +620,14 @@
     insert into dc_base_transfer_plan
     (id, gmt_create, gmt_modified, bailun_sku, transfer_plan_order_id, warehouse_code, 
       warehouse_name, status, update_time, count, sku_title, transfer_key, deleted, company_id, 
-      source_warehouse_code)
+      source_warehouse_code, transport_type)
     values
     (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{bailunSku,jdbcType=VARCHAR}, #{transferPlanOrderId,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, 
       #{warehouseName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{updateTime,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}, 
@@ -619,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.DcBaseTransferPlanExample" resultMap="BaseResultMap">
     <!--

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

@@ -594,7 +594,11 @@
             bailun_sku as bailunSku,
             warehouse_code as warehouseCode,
             sum( count ) as count,
-            sum(countplan) as countplan
+            sum(countplan) as countplan,
+            sum(case when transport_type = '国内陆运' then count else 0 end) as landCount,
+            sum(case when transport_type = '海运' then count else 0 end) as oceanCount,
+            sum(case when transport_type = '空运' then count else 0 end) as airCount,
+            sum(case when transport_type = '铁路运输' then count else 0 end) as railwayCount
         FROM
             (
             SELECT
@@ -602,13 +606,15 @@
                 tb5.warehouse_code warehouse_code,
                 (
                 tb5.count - IFNULL( tb4.count, 0 )) AS count,
-                0 as countplan
+                0 as countplan,
+                tb5.transport_type transport_type
             FROM
                 (
                 SELECT
                     tb1.bailun_sku,
                     tb1.warehouse_code,
-                    sum( tb1.count ) count
+                    sum( tb1.count ) count,
+                    tb1.transport_type
                 FROM
                     dc_base_transfer_bale tb1
                     LEFT JOIN dc_base_transfer_complete tb2 ON tb1.transfer_order_id = tb2.transfer_order_id
@@ -654,7 +660,8 @@
                 bailun_sku,
                 warehouse_code,
                 sum( count ) AS count,
-                sum( count ) AS countplan
+                sum( count ) AS countplan,
+                transport_type
             FROM
                 dc_base_transfer_plan
             WHERE
@@ -670,27 +677,28 @@
   </select>
 
   <insert id="calculateTransferTransit">
-     insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_transfer,quantity_transfer_plan, gmt_transfer_modified)
+     insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_transfer,quantity_transfer_plan,quantity_land_transfer,quantity_ocean_transfer,quantity_air_transfer,quantity_railway_transfer, gmt_transfer_modified)
         values
         <foreach collection="list" item="item" index="index" separator=",">
           (
-          #{item.bailunSku,jdbcType=VARCHAR}, #{item.warehouseCode,jdbcType=VARCHAR}, #{item.count,jdbcType=INTEGER},#{item.countplan,jdbcType=INTEGER}, #{localDateTime,jdbcType=TIMESTAMP}
+          #{item.bailunSku,jdbcType=VARCHAR}, #{item.warehouseCode,jdbcType=VARCHAR}, #{item.count,jdbcType=INTEGER},#{item.countplan,jdbcType=INTEGER},#{item.landCount,jdbcType=INTEGER},#{item.oceanCount,jdbcType=INTEGER},#{item.airCount,jdbcType=INTEGER},#{item.railwayCount,jdbcType=INTEGER}, #{localDateTime,jdbcType=TIMESTAMP}
           )
         </foreach>
         ON DUPLICATE KEY UPDATE quantity_transfer = values(quantity_transfer),
                                   quantity_transfer_plan = values(quantity_transfer_plan),
+    quantity_land_transfer = values(quantity_land_transfer),quantity_ocean_transfer = values(quantity_ocean_transfer),quantity_air_transfer = values(quantity_air_transfer),quantity_railway_transfer = values(quantity_railway_transfer),
                                 gmt_transfer_modified = values(gmt_transfer_modified)
   </insert>
 
   <insert id="calculatePurchaseTransit">
-    insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_purchase,amount_purchase_transit,quantity_land_transfer,quantity_ocean_transfer,quantity_air_transfer,quantity_railway_transfer,gmt_purchase_modified)
+    insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_purchase,amount_purchase_transit,quantity_land_purchase,quantity_ocean_purchase,quantity_air_purchase,quantity_railway_purchase,gmt_purchase_modified)
      values
      <foreach collection="list" item="item" index="index" separator=",">
        (
        #{item.bailunSku,jdbcType=VARCHAR}, #{item.warehouseCode,jdbcType=VARCHAR}, #{item.count,jdbcType=INTEGER}, #{item.amountPurchaseTransit,jdbcType=DECIMAL},#{item.landCount,jdbcType=INTEGER},#{item.oceanCount,jdbcType=INTEGER},#{item.airCount,jdbcType=INTEGER},#{item.railwayCount,jdbcType=INTEGER}, #{localDateTime,jdbcType=TIMESTAMP}
        )
      </foreach>
-    ON DUPLICATE KEY UPDATE  quantity_purchase = values(quantity_purchase), amount_purchase_transit = values(amount_purchase_transit),quantity_land_transfer = values(quantity_land_transfer),quantity_ocean_transfer = values(quantity_ocean_transfer),quantity_air_transfer = values(quantity_air_transfer),quantity_railway_transfer = values(quantity_railway_transfer), gmt_purchase_modified =  values(gmt_purchase_modified)
+    ON DUPLICATE KEY UPDATE  quantity_purchase = values(quantity_purchase), amount_purchase_transit = values(amount_purchase_transit),quantity_land_purchase = values(quantity_land_purchase),quantity_ocean_purchase = values(quantity_ocean_purchase),quantity_air_purchase = values(quantity_air_purchase),quantity_railway_purchase = values(quantity_railway_purchase), gmt_purchase_modified =  values(gmt_purchase_modified)
   </insert>
 
   <insert id="calculateOutStock">
@@ -830,10 +838,10 @@
     update  dc_mid_transit set quantity_out_stock =0, quantity_out_stock_aliexpress = 0 where gmt_out_stock_modified &lt; #{outStockModified,jdbcType=TIMESTAMP}
   </update>
   <update id="updateOldTransferToZero">
-    update  dc_mid_transit set quantity_transfer =0, quantity_transfer_plan =0 where gmt_transfer_modified &lt; #{transferModified,jdbcType=TIMESTAMP}
+    update  dc_mid_transit set quantity_transfer =0, quantity_transfer_plan =0, quantity_land_transfer = 0,quantity_ocean_transfer = 0,quantity_air_transfer = 0,quantity_railway_transfer = 0 where gmt_transfer_modified &lt; #{transferModified,jdbcType=TIMESTAMP}
   </update>
   <update id="updateOldPurchaseToZero">
-    update  dc_mid_transit set quantity_purchase =0,amount_purchase_transit=0, quantity_land_transfer = 0,quantity_ocean_transfer = 0,quantity_air_transfer = 0,quantity_railway_transfer = 0 where gmt_purchase_modified &lt; #{purchaseModified,jdbcType=TIMESTAMP}
+    update  dc_mid_transit set quantity_purchase =0,amount_purchase_transit=0, quantity_land_purchase = 0,quantity_ocean_purchase = 0,quantity_air_purchase = 0,quantity_railway_purchase = 0 where gmt_purchase_modified &lt; #{purchaseModified,jdbcType=TIMESTAMP}
   </update>
   <update id="updateOldUnshippedToZero">
     update  dc_mid_transit set quantity_unshipped =0 where gmt_unshipped_modified &lt; #{unshippedModified,jdbcType=TIMESTAMP}