采购在途计算：陆运、海运、空运、铁路运输方式在途数

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

@@ -11,6 +11,10 @@ public class PurchaseTransitQuantity {
     private String bailunSku;
     private String warehouseCode;
     private Integer count;
+    private Integer landCount;
+    private Integer oceanCount;
+    private Integer airCount;
+    private Integer railwayCount;
     private BigDecimal amountPurchaseTransit;
     private LocalDateTime gmtPurchaseTransitModified;
 }

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

@@ -683,14 +683,14 @@
   </insert>
 
   <insert id="calculatePurchaseTransit">
-    insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_purchase,amount_purchase_transit,gmt_purchase_modified)
+    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)
      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}, #{localDateTime,jdbcType=TIMESTAMP}
+       #{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), 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_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)
   </insert>
 
   <insert id="calculateOutStock">
@@ -763,7 +763,11 @@
         bailun_sku as bailunSku,
         warehouse_code as warehouseCode,
         sum( count ) as count,
-        sum( count * price ) AS amountPurchaseTransit
+        sum( count * price ) AS amountPurchaseTransit,
+        sum(case when transport_type = 1 then count else 0 end) as landCount,
+            sum(case when transport_type = 2 then count else 0 end) as oceanCount,
+            sum(case when transport_type = 3 then count else 0 end) as airCount,
+            sum(case when transport_type = 4 then count else 0 end) as railwayCount
     FROM
         (
         SELECT
@@ -771,6 +775,7 @@
             tb1.warehouse_code AS warehouse_code,
             tb1.purchase_id AS purchase_id,
             sum(  if((tb1.count - IFNULL( tb2.count, 0 )) &lt; 0, 0, (tb1.count - IFNULL( tb2.count, 0 )))  ) AS count,
+            tb1.transport_type AS transport_type,
             price
         FROM
             (
@@ -782,7 +787,8 @@
                 estimated_arrival_time,
                 has_transfer,
                 sum( count ) AS count,
-                price
+                price,
+                transport_type
             FROM
                 dc_base_purchase
             WHERE
@@ -827,7 +833,7 @@
     update  dc_mid_transit set quantity_transfer =0, quantity_transfer_plan =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 where gmt_purchase_modified &lt; #{purchaseModified,jdbcType=TIMESTAMP}
+    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>
   <update id="updateOldUnshippedToZero">
     update  dc_mid_transit set quantity_unshipped =0 where gmt_unshipped_modified &lt; #{unshippedModified,jdbcType=TIMESTAMP}