数据中心--过去30天入库、出库数、在途数

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

@@ -56,6 +56,24 @@ public class DcDailyTransitFrom {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_daily_transit_from.source_warehouse_code
+     *
+     * @mbg.generated
+     */
+    private String sourceWarehouseCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_daily_transit_from.quantity_transfer_delivery
+     *
+     * @mbg.generated
+     */
+    private Integer quantityTransferDelivery;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_daily_transit_from.quantity_transfer_inbound
      *
      * @mbg.generated
@@ -107,8 +125,6 @@ public class DcDailyTransitFrom {
      */
     private BigDecimal unitPrice;
 
-    private String sourceWarehouseCode;
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_daily_transit_from
@@ -126,6 +142,8 @@ public class DcDailyTransitFrom {
         sb.append(", gmtModified=").append(gmtModified);
         sb.append(", bailunSku=").append(bailunSku);
         sb.append(", warehouseCode=").append(warehouseCode);
+        sb.append(", sourceWarehouseCode=").append(sourceWarehouseCode);
+        sb.append(", quantityTransferDelivery=").append(quantityTransferDelivery);
         sb.append(", quantityTransferInbound=").append(quantityTransferInbound);
         sb.append(", quantityTransfer=").append(quantityTransfer);
         sb.append(", quantityTransferPlan=").append(quantityTransferPlan);
@@ -159,6 +177,8 @@ public class DcDailyTransitFrom {
             && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
             && (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
             && (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
+            && (this.getSourceWarehouseCode() == null ? other.getSourceWarehouseCode() == null : this.getSourceWarehouseCode().equals(other.getSourceWarehouseCode()))
+            && (this.getQuantityTransferDelivery() == null ? other.getQuantityTransferDelivery() == null : this.getQuantityTransferDelivery().equals(other.getQuantityTransferDelivery()))
             && (this.getQuantityTransferInbound() == null ? other.getQuantityTransferInbound() == null : this.getQuantityTransferInbound().equals(other.getQuantityTransferInbound()))
             && (this.getQuantityTransfer() == null ? other.getQuantityTransfer() == null : this.getQuantityTransfer().equals(other.getQuantityTransfer()))
             && (this.getQuantityTransferPlan() == null ? other.getQuantityTransferPlan() == null : this.getQuantityTransferPlan().equals(other.getQuantityTransferPlan()))
@@ -182,6 +202,8 @@ public class DcDailyTransitFrom {
         result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
         result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
         result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
+        result = prime * result + ((getSourceWarehouseCode() == null) ? 0 : getSourceWarehouseCode().hashCode());
+        result = prime * result + ((getQuantityTransferDelivery() == null) ? 0 : getQuantityTransferDelivery().hashCode());
         result = prime * result + ((getQuantityTransferInbound() == null) ? 0 : getQuantityTransferInbound().hashCode());
         result = prime * result + ((getQuantityTransfer() == null) ? 0 : getQuantityTransfer().hashCode());
         result = prime * result + ((getQuantityTransferPlan() == null) ? 0 : getQuantityTransferPlan().hashCode());

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

@@ -692,6 +692,136 @@ public class DcDailyTransitFromExample {
             return (Criteria) this;
         }
 
+        public Criteria andSourceWarehouseCodeIsNull() {
+            addCriterion("source_warehouse_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeIsNotNull() {
+            addCriterion("source_warehouse_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeEqualTo(String value) {
+            addCriterion("source_warehouse_code =", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeNotEqualTo(String value) {
+            addCriterion("source_warehouse_code <>", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeGreaterThan(String value) {
+            addCriterion("source_warehouse_code >", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("source_warehouse_code >=", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeLessThan(String value) {
+            addCriterion("source_warehouse_code <", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeLessThanOrEqualTo(String value) {
+            addCriterion("source_warehouse_code <=", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeLike(String value) {
+            addCriterion("source_warehouse_code like", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeNotLike(String value) {
+            addCriterion("source_warehouse_code not like", value, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeIn(List<String> values) {
+            addCriterion("source_warehouse_code in", values, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeNotIn(List<String> values) {
+            addCriterion("source_warehouse_code not in", values, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeBetween(String value1, String value2) {
+            addCriterion("source_warehouse_code between", value1, value2, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceWarehouseCodeNotBetween(String value1, String value2) {
+            addCriterion("source_warehouse_code not between", value1, value2, "sourceWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryIsNull() {
+            addCriterion("quantity_transfer_delivery is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryIsNotNull() {
+            addCriterion("quantity_transfer_delivery is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryEqualTo(Integer value) {
+            addCriterion("quantity_transfer_delivery =", value, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryNotEqualTo(Integer value) {
+            addCriterion("quantity_transfer_delivery <>", value, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryGreaterThan(Integer value) {
+            addCriterion("quantity_transfer_delivery >", value, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryGreaterThanOrEqualTo(Integer value) {
+            addCriterion("quantity_transfer_delivery >=", value, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryLessThan(Integer value) {
+            addCriterion("quantity_transfer_delivery <", value, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryLessThanOrEqualTo(Integer value) {
+            addCriterion("quantity_transfer_delivery <=", value, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryIn(List<Integer> values) {
+            addCriterion("quantity_transfer_delivery in", values, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryNotIn(List<Integer> values) {
+            addCriterion("quantity_transfer_delivery not in", values, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryBetween(Integer value1, Integer value2) {
+            addCriterion("quantity_transfer_delivery between", value1, value2, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityTransferDeliveryNotBetween(Integer value1, Integer value2) {
+            addCriterion("quantity_transfer_delivery not between", value1, value2, "quantityTransferDelivery");
+            return (Criteria) this;
+        }
+
         public Criteria andQuantityTransferInboundIsNull() {
             addCriterion("quantity_transfer_inbound is null");
             return (Criteria) this;

data-common/src/main/java/com/bailuntec/mapper/DcDailyTransitFromMapper.java

@@ -129,7 +129,13 @@ public interface DcDailyTransitFromMapper {
 
     int calculateTransferTransitFrom(@Param("list") List<TransferTransitQuantity> list, @Param("localDate") LocalDate localDate);
 
-    List<TransferTransitQuantity> selectQuantityTransferComplete(@Param("localDate") LocalDate localDate);
+    List<TransferTransitQuantity> selectQuantityTransferDelivery(@Param("localDate") LocalDate localDate);
+
+    List<TransferTransitQuantity> selectQuantityTransferInbound(@Param("localDate") LocalDate localDate);
+
+    int updateWarehouseName(@Param("localDate") LocalDate localDate);
+
+    int updateSourceWarehouseName(@Param("localDate") LocalDate localDate);
 
     int updateSkuUnitPrice(@Param("localDate") LocalDate localDate);
 }
\ No newline at end of file

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

@@ -11,6 +11,8 @@
     <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
     <result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" />
     <result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" />
+    <result column="quantity_transfer_delivery" jdbcType="INTEGER" property="quantityTransferDelivery" />
     <result column="quantity_transfer_inbound" jdbcType="INTEGER" property="quantityTransferInbound" />
     <result column="quantity_transfer" jdbcType="INTEGER" property="quantityTransfer" />
     <result column="quantity_transfer_plan" jdbcType="INTEGER" property="quantityTransferPlan" />
@@ -89,8 +91,9 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, gmt_create, gmt_modified, bailun_sku, warehouse_code, quantity_transfer_inbound, 
-    quantity_transfer, quantity_transfer_plan, record_time, company_id, unit_price
+    id, gmt_create, gmt_modified, bailun_sku, warehouse_code, source_warehouse_code, 
+    quantity_transfer_delivery, quantity_transfer_inbound, quantity_transfer, quantity_transfer_plan, 
+    record_time, company_id, unit_price
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcDailyTransitFromExample" resultMap="BaseResultMap">
     <!--
@@ -152,12 +155,14 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into dc_daily_transit_from (id, gmt_create, gmt_modified, 
-      bailun_sku, warehouse_code, quantity_transfer_inbound, 
+      bailun_sku, warehouse_code, source_warehouse_code, 
+      quantity_transfer_delivery, quantity_transfer_inbound, 
       quantity_transfer, quantity_transfer_plan, 
       record_time, company_id, unit_price
       )
     values (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
-      #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{quantityTransferInbound,jdbcType=INTEGER}, 
+      #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{sourceWarehouseCode,jdbcType=VARCHAR}, 
+      #{quantityTransferDelivery,jdbcType=INTEGER}, #{quantityTransferInbound,jdbcType=INTEGER}, 
       #{quantityTransfer,jdbcType=INTEGER}, #{quantityTransferPlan,jdbcType=INTEGER}, 
       #{recordTime,jdbcType=DATE}, #{companyId,jdbcType=INTEGER}, #{unitPrice,jdbcType=DECIMAL}
       )
@@ -184,6 +189,12 @@
       <if test="warehouseCode != null">
         warehouse_code,
       </if>
+      <if test="sourceWarehouseCode != null">
+        source_warehouse_code,
+      </if>
+      <if test="quantityTransferDelivery != null">
+        quantity_transfer_delivery,
+      </if>
       <if test="quantityTransferInbound != null">
         quantity_transfer_inbound,
       </if>
@@ -219,6 +230,12 @@
       <if test="warehouseCode != null">
         #{warehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="sourceWarehouseCode != null">
+        #{sourceWarehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="quantityTransferDelivery != null">
+        #{quantityTransferDelivery,jdbcType=INTEGER},
+      </if>
       <if test="quantityTransferInbound != null">
         #{quantityTransferInbound,jdbcType=INTEGER},
       </if>
@@ -271,6 +288,12 @@
       <if test="record.warehouseCode != null">
         warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.sourceWarehouseCode != null">
+        source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.quantityTransferDelivery != null">
+        quantity_transfer_delivery = #{record.quantityTransferDelivery,jdbcType=INTEGER},
+      </if>
       <if test="record.quantityTransferInbound != null">
         quantity_transfer_inbound = #{record.quantityTransferInbound,jdbcType=INTEGER},
       </if>
@@ -305,6 +328,8 @@
       gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
       bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
       warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
+      source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
+      quantity_transfer_delivery = #{record.quantityTransferDelivery,jdbcType=INTEGER},
       quantity_transfer_inbound = #{record.quantityTransferInbound,jdbcType=INTEGER},
       quantity_transfer = #{record.quantityTransfer,jdbcType=INTEGER},
       quantity_transfer_plan = #{record.quantityTransferPlan,jdbcType=INTEGER},
@@ -334,6 +359,12 @@
       <if test="warehouseCode != null">
         warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="sourceWarehouseCode != null">
+        source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="quantityTransferDelivery != null">
+        quantity_transfer_delivery = #{quantityTransferDelivery,jdbcType=INTEGER},
+      </if>
       <if test="quantityTransferInbound != null">
         quantity_transfer_inbound = #{quantityTransferInbound,jdbcType=INTEGER},
       </if>
@@ -365,6 +396,8 @@
       gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
       bailun_sku = #{bailunSku,jdbcType=VARCHAR},
       warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
+      source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR},
+      quantity_transfer_delivery = #{quantityTransferDelivery,jdbcType=INTEGER},
       quantity_transfer_inbound = #{quantityTransferInbound,jdbcType=INTEGER},
       quantity_transfer = #{quantityTransfer,jdbcType=INTEGER},
       quantity_transfer_plan = #{quantityTransferPlan,jdbcType=INTEGER},
@@ -399,6 +432,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code,
       </if>
+      <if test="quantityTransferDelivery != null">
+        quantity_transfer_delivery,
+      </if>
       <if test="quantityTransferInbound != null">
         quantity_transfer_inbound,
       </if>
@@ -438,6 +474,9 @@
       <if test="sourceWarehouseCode != null">
         #{sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="quantityTransferDelivery != null">
+        #{quantityTransferDelivery,jdbcType=INTEGER},
+      </if>
       <if test="quantityTransferInbound != null">
         #{quantityTransferInbound,jdbcType=INTEGER},
       </if>
@@ -477,6 +516,9 @@
       <if test="sourceWarehouseCode != null">
         source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR},
       </if>
+      <if test="quantityTransferDelivery != null">
+        quantity_transfer_delivery = #{quantityTransferDelivery,jdbcType=INTEGER},
+      </if>
       <if test="quantityTransferInbound != null">
         quantity_transfer_inbound = #{quantityTransferInbound,jdbcType=INTEGER},
       </if>
@@ -504,11 +546,13 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     insert into dc_daily_transit_from
-    (id, gmt_create, gmt_modified, bailun_sku, warehouse_code, quantity_transfer_inbound, 
-      quantity_transfer, quantity_transfer_plan, record_time, company_id, unit_price)
+    (id, gmt_create, gmt_modified, bailun_sku, warehouse_code, source_warehouse_code, 
+      quantity_transfer_delivery, quantity_transfer_inbound, quantity_transfer, quantity_transfer_plan, 
+      record_time, company_id, unit_price)
     values
     (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
-      #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{quantityTransferInbound,jdbcType=INTEGER}, 
+      #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{sourceWarehouseCode,jdbcType=VARCHAR}, 
+      #{quantityTransferDelivery,jdbcType=INTEGER}, #{quantityTransferInbound,jdbcType=INTEGER}, 
       #{quantityTransfer,jdbcType=INTEGER}, #{quantityTransferPlan,jdbcType=INTEGER}, 
       #{recordTime,jdbcType=DATE}, #{companyId,jdbcType=INTEGER}, #{unitPrice,jdbcType=DECIMAL}
       )
@@ -518,6 +562,8 @@
     gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, 
     bailun_sku = #{bailunSku,jdbcType=VARCHAR}, 
     warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, 
+    source_warehouse_code = #{sourceWarehouseCode,jdbcType=VARCHAR}, 
+    quantity_transfer_delivery = #{quantityTransferDelivery,jdbcType=INTEGER}, 
     quantity_transfer_inbound = #{quantityTransferInbound,jdbcType=INTEGER}, 
     quantity_transfer = #{quantityTransfer,jdbcType=INTEGER}, 
     quantity_transfer_plan = #{quantityTransferPlan,jdbcType=INTEGER}, 
@@ -645,7 +691,7 @@ GROUP BY
     </foreach>
   </insert>
 
-  <select id="selectQuantityTransferComplete" resultType="com.bailuntec.domain.dto.TransferTransitQuantity">
+  <select id="selectQuantityTransferDelivery" resultType="com.bailuntec.domain.dto.TransferTransitQuantity">
     select bailun_sku, warehouse_code, source_warehouse_code, sum(count) as count
     from dc_base_transfer_delivery
     where create_time &gt;= date_sub(#{localDate}, INTERVAL 30 day)
@@ -654,8 +700,73 @@ GROUP BY
     group by bailun_sku, source_warehouse_code, warehouse_code
   </select>
 
+  <select id="selectQuantityTransferInbound" resultType="com.bailuntec.domain.dto.TransferTransitQuantity">
+    select bailun_sku, warehouse_code, source_warehouse_code, sum(count) as count from
+    (SELECT
+    t1.bailun_sku,
+    t1.warehouse_code,
+    t1.source_warehouse_code,
+    t1.transfer_order_id,
+    t1.create_time,
+    sum(t1.count) as count
+    FROM
+    dc_base_transfer_complete t1
+    LEFT JOIN dc_base_transfer_inbound tb2 ON t1.transfer_order_id = tb2.transfer_order_id and t1.bailun_sku = tb2.bailun_sku and t1.warehouse_code = tb2.warehouse_code and t1.source_warehouse_code = tb2.source_warehouse_code and tb2.deleted = 0 and	tb2.create_time &lt; #{localDate} and tb2.create_time &gt;= date_sub(#{localDate}, INTERVAL 30 day)
+    WHERE
+    tb2.bailun_sku IS NULL
+    AND t1.deleted = 0
+    AND t1.create_time &gt;= date_sub(#{localDate}, INTERVAL 30 day)
+    AND t1.create_time &lt; #{localDate}
+    GROUP BY
+    t1.bailun_sku,
+    t1.warehouse_code,
+    t1.source_warehouse_code,
+    t1.transfer_order_id
+    UNION ALL
+    SELECT
+    t1.bailun_sku,
+    t1.warehouse_code,
+    t1.source_warehouse_code,
+    t1.transfer_order_id,
+    t1.create_time,
+    t2.count
+    FROM
+    (
+    SELECT
+    max(create_time) AS create_time,
+    bailun_sku,
+    warehouse_code,
+    source_warehouse_code,
+    transfer_order_id
+    FROM
+    dc_base_transfer_inbound
+    WHERE
+    deleted = 0
+    and create_time &gt;= date_sub(#{localDate}, INTERVAL 30 day)
+    and create_time &lt; #{localDate}
+    GROUP BY
+    bailun_sku,
+    warehouse_code,
+    source_warehouse_code,
+    transfer_order_id) t1
+    INNER JOIN dc_base_transfer_inbound t2 ON t1.bailun_sku = t2.bailun_sku
+    AND t1.warehouse_code = t2.warehouse_code
+    AND t1.source_warehouse_code = t2.source_warehouse_code
+    AND t1.transfer_order_id = t2.transfer_order_id
+    AND t1.create_time = t2.create_time) t
+    group by bailun_sku, source_warehouse_code, warehouse_code
+  </select>
+
   <update id="updateSkuUnitPrice">
          update dc_daily_transit_from t1, dc_base_sku t2 set t1.unit_price = t2.unit_price WHERE t1.record_time = #{localDate} and t1.bailun_sku=t2.bailun_sku
   </update>
 
+  <update id="updateWarehouseName">
+    update dc_daily_transit_from t1, dc_base_warehouse t2 set t1.warehouse_name = t2.warehouse_name where t1.warehouse_code = t2.warehouse_code and t1.record_time = #{localDate}
+  </update>
+
+  <update id="updateSourceWarehouseName">
+    update dc_daily_transit_from t1, dc_base_warehouse t2 set t1.source_warehouse_name = t2.warehouse_name where t1.source_warehouse_code = t2.warehouse_code and t1.record_time = #{localDate}
+  </update>
+
 </mapper>
\ No newline at end of file

data-mid/mid-daily-stock/src/main/java/com/bailuntec/job/DailyTransferJob.java

@@ -45,17 +45,31 @@ public class DailyTransferJob implements SimpleJob {
 
         try {
             DcDailyTransitFromMapper dcDailyTransitFromMapper = SessionUtil.getSession().getMapper(DcDailyTransitFromMapper.class);
-            List<TransferTransitQuantity> transferTransitQuantityList = dcDailyTransitFromMapper.selectQuantityTransferComplete(localDate);
+            List<TransferTransitQuantity> transferTransitQuantityList = dcDailyTransitFromMapper.selectQuantityTransferDelivery(localDate);
             for(TransferTransitQuantity transferTransitQuantity : transferTransitQuantityList) {
                 DcDailyTransitFrom dcDailyTransitFrom = new DcDailyTransitFrom();
                 dcDailyTransitFrom.setBailunSku(transferTransitQuantity.getBailunSku());
                 dcDailyTransitFrom.setWarehouseCode(transferTransitQuantity.getWarehouseCode());
+                dcDailyTransitFrom.setQuantityTransferDelivery(transferTransitQuantity.getCount());
+                dcDailyTransitFrom.setSourceWarehouseCode(transferTransitQuantity.getSourceWarehouseCode());
+                dcDailyTransitFrom.setRecordTime(lastLocalDate);
+                int result = dcDailyTransitFromMapper.upsertSelective(dcDailyTransitFrom);
+            }
+
+            dcDailyTransitFromMapper = SessionUtil.getSession().getMapper(DcDailyTransitFromMapper.class);
+            List<TransferTransitQuantity> transferTransitQuantityList1 = dcDailyTransitFromMapper.selectQuantityTransferInbound(localDate);
+            for(TransferTransitQuantity transferTransitQuantity : transferTransitQuantityList1) {
+                DcDailyTransitFrom dcDailyTransitFrom = new DcDailyTransitFrom();
+                dcDailyTransitFrom.setBailunSku(transferTransitQuantity.getBailunSku());
+                dcDailyTransitFrom.setWarehouseCode(transferTransitQuantity.getWarehouseCode());
                 dcDailyTransitFrom.setQuantityTransferInbound(transferTransitQuantity.getCount());
                 dcDailyTransitFrom.setSourceWarehouseCode(transferTransitQuantity.getSourceWarehouseCode());
                 dcDailyTransitFrom.setRecordTime(lastLocalDate);
                 int result = dcDailyTransitFromMapper.upsertSelective(dcDailyTransitFrom);
             }
 
+
+
         }catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("计算近30天入库失败", e);
@@ -66,6 +80,8 @@ public class DailyTransferJob implements SimpleJob {
         try{
             DcDailyTransitFromMapper dcDailyTransitFromMapper = SessionUtil.getSession().getMapper(DcDailyTransitFromMapper.class);
             dcDailyTransitFromMapper.updateSkuUnitPrice(lastLocalDate);
+            dcDailyTransitFromMapper.updateWarehouseName(lastLocalDate);
+            dcDailyTransitFromMapper.updateSourceWarehouseName(lastLocalDate);
         }catch (Exception e){
             e.printStackTrace();
             throw new RuntimeException("更改sku单价失败", e);