数据中心--过去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-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);