# 周转需求 transfer_bale_delivery_source abroad_inbound_delivery_source transfer_delivery_source

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

@@ -20,6 +20,15 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.short_supply_details
+     *
+     * @mbg.generated
+     */
+    private String shortSupplyDetails;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_auto_turnover.sales_details_formula
      *
      * @mbg.generated
@@ -39,6 +48,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", salesDetails=").append(salesDetails);
+        sb.append(", shortSupplyDetails=").append(shortSupplyDetails);
         sb.append(", salesDetailsFormula=").append(salesDetailsFormula);
         sb.append("]");
         return sb.toString();
@@ -91,7 +101,6 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
             && (this.getForecastFourteendaySales() == null ? other.getForecastFourteendaySales() == null : this.getForecastFourteendaySales().equals(other.getForecastFourteendaySales()))
             && (this.getInboundDetails() == null ? other.getInboundDetails() == null : this.getInboundDetails().equals(other.getInboundDetails()))
             && (this.getInventoryDetails() == null ? other.getInventoryDetails() == null : this.getInventoryDetails().equals(other.getInventoryDetails()))
-            && (this.getShortSupplyDetails() == null ? other.getShortSupplyDetails() == null : this.getShortSupplyDetails().equals(other.getShortSupplyDetails()))
             && (this.getAdvisedDetails() == null ? other.getAdvisedDetails() == null : this.getAdvisedDetails().equals(other.getAdvisedDetails()))
             && (this.getSalesUpperLimit() == null ? other.getSalesUpperLimit() == null : this.getSalesUpperLimit().equals(other.getSalesUpperLimit()))
             && (this.getAverageOverdue() == null ? other.getAverageOverdue() == null : this.getAverageOverdue().equals(other.getAverageOverdue()))
@@ -102,8 +111,11 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
             && (this.getInspectionConfigDelivery() == null ? other.getInspectionConfigDelivery() == null : this.getInspectionConfigDelivery().equals(other.getInspectionConfigDelivery()))
             && (this.getInspectionDelivery() == null ? other.getInspectionDelivery() == null : this.getInspectionDelivery().equals(other.getInspectionDelivery()))
             && (this.getTransferDelivery() == null ? other.getTransferDelivery() == null : this.getTransferDelivery().equals(other.getTransferDelivery()))
+            && (this.getTransferDeliverySource() == null ? other.getTransferDeliverySource() == null : this.getTransferDeliverySource().equals(other.getTransferDeliverySource()))
             && (this.getTransferBaleDelivery() == null ? other.getTransferBaleDelivery() == null : this.getTransferBaleDelivery().equals(other.getTransferBaleDelivery()))
+            && (this.getTransferBaleDeliverySource() == null ? other.getTransferBaleDeliverySource() == null : this.getTransferBaleDeliverySource().equals(other.getTransferBaleDeliverySource()))
             && (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
+            && (this.getAbroadInboundDeliverySource() == null ? other.getAbroadInboundDeliverySource() == null : this.getAbroadInboundDeliverySource().equals(other.getAbroadInboundDeliverySource()))
             && (this.getSupplementarySales() == null ? other.getSupplementarySales() == null : this.getSupplementarySales().equals(other.getSupplementarySales()))
             && (this.getTurnoverSales() == null ? other.getTurnoverSales() == null : this.getTurnoverSales().equals(other.getTurnoverSales()))
             && (this.getTurnoverInbound() == null ? other.getTurnoverInbound() == null : this.getTurnoverInbound().equals(other.getTurnoverInbound()))
@@ -143,6 +155,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
             && (this.getHeadTransportLogisticsCode() == null ? other.getHeadTransportLogisticsCode() == null : this.getHeadTransportLogisticsCode().equals(other.getHeadTransportLogisticsCode()))
             && (this.getAutoReplaceLogisticsTaskId() == null ? other.getAutoReplaceLogisticsTaskId() == null : this.getAutoReplaceLogisticsTaskId().equals(other.getAutoReplaceLogisticsTaskId()))
             && (this.getSalesDetails() == null ? other.getSalesDetails() == null : this.getSalesDetails().equals(other.getSalesDetails()))
+            && (this.getShortSupplyDetails() == null ? other.getShortSupplyDetails() == null : this.getShortSupplyDetails().equals(other.getShortSupplyDetails()))
             && (this.getSalesDetailsFormula() == null ? other.getSalesDetailsFormula() == null : this.getSalesDetailsFormula().equals(other.getSalesDetailsFormula()));
     }
 
@@ -185,7 +198,6 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
         result = prime * result + ((getForecastFourteendaySales() == null) ? 0 : getForecastFourteendaySales().hashCode());
         result = prime * result + ((getInboundDetails() == null) ? 0 : getInboundDetails().hashCode());
         result = prime * result + ((getInventoryDetails() == null) ? 0 : getInventoryDetails().hashCode());
-        result = prime * result + ((getShortSupplyDetails() == null) ? 0 : getShortSupplyDetails().hashCode());
         result = prime * result + ((getAdvisedDetails() == null) ? 0 : getAdvisedDetails().hashCode());
         result = prime * result + ((getSalesUpperLimit() == null) ? 0 : getSalesUpperLimit().hashCode());
         result = prime * result + ((getAverageOverdue() == null) ? 0 : getAverageOverdue().hashCode());
@@ -196,8 +208,11 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
         result = prime * result + ((getInspectionConfigDelivery() == null) ? 0 : getInspectionConfigDelivery().hashCode());
         result = prime * result + ((getInspectionDelivery() == null) ? 0 : getInspectionDelivery().hashCode());
         result = prime * result + ((getTransferDelivery() == null) ? 0 : getTransferDelivery().hashCode());
+        result = prime * result + ((getTransferDeliverySource() == null) ? 0 : getTransferDeliverySource().hashCode());
         result = prime * result + ((getTransferBaleDelivery() == null) ? 0 : getTransferBaleDelivery().hashCode());
+        result = prime * result + ((getTransferBaleDeliverySource() == null) ? 0 : getTransferBaleDeliverySource().hashCode());
         result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
+        result = prime * result + ((getAbroadInboundDeliverySource() == null) ? 0 : getAbroadInboundDeliverySource().hashCode());
         result = prime * result + ((getSupplementarySales() == null) ? 0 : getSupplementarySales().hashCode());
         result = prime * result + ((getTurnoverSales() == null) ? 0 : getTurnoverSales().hashCode());
         result = prime * result + ((getTurnoverInbound() == null) ? 0 : getTurnoverInbound().hashCode());
@@ -237,6 +252,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
         result = prime * result + ((getHeadTransportLogisticsCode() == null) ? 0 : getHeadTransportLogisticsCode().hashCode());
         result = prime * result + ((getAutoReplaceLogisticsTaskId() == null) ? 0 : getAutoReplaceLogisticsTaskId().hashCode());
         result = prime * result + ((getSalesDetails() == null) ? 0 : getSalesDetails().hashCode());
+        result = prime * result + ((getShortSupplyDetails() == null) ? 0 : getShortSupplyDetails().hashCode());
         result = prime * result + ((getSalesDetailsFormula() == null) ? 0 : getSalesDetailsFormula().hashCode());
         return result;
     }

data-common/src/main/resources/generatorConfig.xml

@@ -12,7 +12,7 @@
 
     <!-- 指定数据连接驱动jar地址 -->
     <classPathEntry
-            location="/Users/huluobin/IdeaProjects/dc-java/elastic-job-lite/elastic-job-lite-console/target/elastic-job-lite-console-3.0.0.M1-SNAPSHOT/lib/mysql-connector-java-5.1.30.jar"/>
+            location="/Users/huluobin/IdeaProjects/cedarsv-project/cedarvv-backend-parent/cloud_build_web/target/war/work/com.cedarsv.cloudplus/cedarsv-cloudplus-notify-services/WEB-INF/lib/mysql-connector-java-5.1.38.jar"/>
 
     <!-- 一个数据库一个context -->
     <!--targetRuntime="MyBatis3Simple" 不生成Mapper-->

data-common/src/main/resources/init.properties

-table-name=dc_auto_monitor_sku_type
+table-name=dc_auto_turnover

data-show/show-auto-turnover/src/main/dotnet-docker/Dockerfile

-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
-WORKDIR /app
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
-EXPOSE 80
-EXPOSE 443
-
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends libgdiplus libc6-dev 
-
-FROM microsoft/dotnet:2.2-sdk-alpine AS build
-WORKDIR /src
-COPY ["SalaryAutoServices/SalaryAutoServices.csproj", "SalaryAutoServices/"]
-COPY ["SalaryAIServices/SalaryAIServices.csproj", "SalaryAIServices/"]
-COPY ["DapperDao/DapperDao.csproj", "DapperDao/"]
-COPY ["Utility/Utility.csproj", "Utility/"]
-COPY ["EFCore/EFCore.csproj", "EFCore/"]
-COPY ["CommonServics/CommonServics.csproj", "CommonServics/"]
-RUN dotnet restore "SalaryAutoServices/SalaryAutoServices.csproj"
-COPY . .
-WORKDIR "/src/SalaryAutoServices"
-RUN dotnet build "SalaryAutoServices.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "SalaryAutoServices.csproj" -c Release -o /app/publish
-
-FROM base AS final
-WORKDIR /app
-COPY fonts/simkai.ttf .
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "SalaryAutoServices.dll"]
\ No newline at end of file

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -339,7 +339,7 @@ public class AutoTurnoverJob extends PointJob {
             }
         }
 
-        Integer bailunFirstLevelCatagoryId = getBailunCatagoryId(turnoverSku); //百伦第一级分类Id, 可以为null
+        Integer bailunFirstLevelCatagoryId = getBailCategoryId(); //百伦第一级分类Id, 可以为null
         // 获取调拨头程 + 调拨打包 + 海外仓入库天数 的配置
         DcAutoConfigDelivery dcAutoConfigDelivery = getDcAutoConfigDelivery(bailunSku, warehouseCode, dcBaseWarehouse);
         //获取周转天数计算配置, 数据来源于.net同事计算的均值
@@ -1094,35 +1094,52 @@ public class AutoTurnoverJob extends PointJob {
         //质检入库天数-配置值(实际还没用上)
         dcAutoTurnover.setInspectionConfigDelivery(turnoverInboundDelivery);
         //调拨头程
+        // lms、aims配置、读取产品库
+        // - case aims配置
         Integer turnoverTransferHeadDelivery = dcAutoConfigDelivery.getTranferHead();
         dcAutoTurnover.setTransferConfigDelivery(turnoverTransferHeadDelivery);
+        dcAutoTurnover.setTransferDeliverySource(DcAutoTurnover.SOURCE_AIMS);
         //调拨打包
         Integer turnoverTransferBaleDelivery = dcAutoConfigDelivery.getTranferBale();
         dcAutoTurnover.setTransferBaleConfigDelivery(turnoverTransferBaleDelivery);
+        dcAutoTurnover.setTransferBaleDeliverySource(DcAutoTurnover.SOURCE_AIMS);
+
         //海外仓入库
         Integer turnoverAbroadInboundDelivery = dcAutoConfigDelivery.getAbroadInbound();
         dcAutoTurnover.setAbroadInboundConfigDelivery(turnoverAbroadInboundDelivery);
+        dcAutoTurnover.setAbroadInboundDeliverySource(DcAutoTurnover.SOURCE_AIMS);
 
 
         if (dcAverageWarehouse != null) {
+            //- case lms
             if (dcAverageWarehouse.getInboundDays() != null && dcAverageWarehouse.getInboundDays() > 0) {
                 turnoverInboundDelivery = dcAverageWarehouse.getInboundDays();
             }
             if (dcAverageWarehouse.getTransferDelivery() != null && dcAverageWarehouse.getTransferDelivery().compareTo(BigDecimal.ZERO) > 0) {
+                dcAutoTurnover.setTransferDeliverySource(DcAutoTurnover.SOURCE_LMS);
                 turnoverTransferHeadDelivery = dcAverageWarehouse.getTransferDelivery().intValue();
             }
             if (dcAverageWarehouse.getTransferBaleDelivery() != null && dcAverageWarehouse.getTransferBaleDelivery().compareTo(BigDecimal.ZERO) > 0) {
+                dcAutoTurnover.setTransferBaleDeliverySource(DcAutoTurnover.SOURCE_LMS);
                 turnoverTransferBaleDelivery = dcAverageWarehouse.getTransferBaleDelivery().intValue();
             }
             if (dcAverageWarehouse.getAbroadInboundDelivery() != null && dcAverageWarehouse.getAbroadInboundDelivery().compareTo(BigDecimal.ZERO) > 0) {
+                dcAutoTurnover.setAbroadInboundDeliverySource(DcAutoTurnover.SOURCE_LMS);
                 turnoverAbroadInboundDelivery = dcAverageWarehouse.getAbroadInboundDelivery().intValue();
             }
         }
         if (ReplaceLogisticJob.logisticsTaskThreadLocal.get() != null) {
+            // case 切换空运
             DcAutoReplaceLogisticsTask dcAutoReplaceLogisticsTask = ReplaceLogisticJob.logisticsTaskThreadLocal.get();
+
             turnoverTransferHeadDelivery = dcAutoReplaceLogisticsTask.getTransferDelivery().intValue();
+            dcAutoTurnover.setTransferDeliverySource(DcAutoTurnover.SOURCE_AIR);
+
             turnoverTransferBaleDelivery = dcAutoReplaceLogisticsTask.getTransferBaleDelivery().intValue();
+            dcAutoTurnover.setTransferBaleDeliverySource(DcAutoTurnover.SOURCE_AIR);
+
             turnoverAbroadInboundDelivery = dcAutoReplaceLogisticsTask.getAbroadInboundDelivery().intValue();
+            dcAutoTurnover.setAbroadInboundDeliverySource(DcAutoTurnover.SOURCE_AIR);
             dcAutoTurnover.setAutoReplaceLogisticsTaskId(dcAutoReplaceLogisticsTask.getId());
         } else {
             dcAutoTurnover.setAutoReplaceLogisticsTaskId(0);
@@ -1133,6 +1150,7 @@ public class AutoTurnoverJob extends PointJob {
         dcAutoTurnover.setSupplierDelivery(turnoverSupplierDelivery);
         //质检天数
         dcAutoTurnover.setInspectionDelivery(turnoverInboundDelivery);
+        //
         dcAutoTurnover.setTransferDelivery(turnoverTransferHeadDelivery);
         dcAutoTurnover.setTransferBaleDelivery(turnoverTransferBaleDelivery);
         dcAutoTurnover.setAbroadInboundDelivery(turnoverAbroadInboundDelivery);
@@ -1143,26 +1161,11 @@ public class AutoTurnoverJob extends PointJob {
     /**
      * 获取百伦一级分类Id
      *
-     * @param turnoverSku
      * @return
      * @throws Exception
      */
-    private Integer getBailunCatagoryId(DcBaseSku turnoverSku) throws Exception {
-        Integer bailunFirstLevelCatagoryId = null;
-        /*String parentCategories = null;
-        if (turnoverSku != null && turnoverSku.getBailunCategoryId() != null) {
-            parentCategories = skuMSRequest(turnoverSku.getBailunCategoryId());
-            List<CatagoryDTO> catagoryDTOS = JSON.parseObject(parentCategories, new TypeReference<List<CatagoryDTO>>() {
-            });
-            if (catagoryDTOS != null && catagoryDTOS.size() > 0) {
-                for (CatagoryDTO catagoryDTO : catagoryDTOS) {
-                    if (catagoryDTO.getC_level() == 1) {
-                        bailunFirstLevelCatagoryId = catagoryDTO.getC_id();
-                    }
-                }
-            }
-        }*/
-        return bailunFirstLevelCatagoryId;
+    private Integer getBailCategoryId() throws Exception {
+        return null;
     }
 
     private BigDecimal caculateWeightingAvgSales(BigDecimal weightingCoefficientSeven, BigDecimal weightingCoefficientFourteen, BigDecimal weightingCoefficientThirty, List<BigDecimal> salesList) {