Skip to content

D
dc-java
Commit b6e7af01 by huluobin
Options

update

parent aff23183
Showing with 40 additions and 26 deletions
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseTransExpectarrivaltime.java
...@@ -66,7 +66,7 @@ public class DcBaseTransExpectarrivaltime { ...@@ -66,7 +66,7 @@ public class DcBaseTransExpectarrivaltime {
* *
* @mbg.generated * @mbg.generated
*/ */
private Integer purchaseId; private String purchaseId;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseTransExpectarrivaltimeExample.java
...@@ -770,52 +770,62 @@ public class DcBaseTransExpectarrivaltimeExample { ...@@ -770,52 +770,62 @@ public class DcBaseTransExpectarrivaltimeExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdEqualTo(Integer value) { public Criteria andPurchaseIdEqualTo(String value) {
addCriterion("purchase_id =", value, "purchaseId"); addCriterion("purchase_id =", value, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdNotEqualTo(Integer value) { public Criteria andPurchaseIdNotEqualTo(String value) {
addCriterion("purchase_id <>", value, "purchaseId"); addCriterion("purchase_id <>", value, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdGreaterThan(Integer value) { public Criteria andPurchaseIdGreaterThan(String value) {
addCriterion("purchase_id >", value, "purchaseId"); addCriterion("purchase_id >", value, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdGreaterThanOrEqualTo(Integer value) { public Criteria andPurchaseIdGreaterThanOrEqualTo(String value) {
addCriterion("purchase_id >=", value, "purchaseId"); addCriterion("purchase_id >=", value, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdLessThan(Integer value) { public Criteria andPurchaseIdLessThan(String value) {
addCriterion("purchase_id <", value, "purchaseId"); addCriterion("purchase_id <", value, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdLessThanOrEqualTo(Integer value) { public Criteria andPurchaseIdLessThanOrEqualTo(String value) {
addCriterion("purchase_id <=", value, "purchaseId"); addCriterion("purchase_id <=", value, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdIn(List<Integer> values) { public Criteria andPurchaseIdLike(String value) {
addCriterion("purchase_id like", value, "purchaseId");
return (Criteria) this;
}
public Criteria andPurchaseIdNotLike(String value) {
addCriterion("purchase_id not like", value, "purchaseId");
return (Criteria) this;
}
public Criteria andPurchaseIdIn(List<String> values) {
addCriterion("purchase_id in", values, "purchaseId"); addCriterion("purchase_id in", values, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdNotIn(List<Integer> values) { public Criteria andPurchaseIdNotIn(List<String> values) {
addCriterion("purchase_id not in", values, "purchaseId"); addCriterion("purchase_id not in", values, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdBetween(Integer value1, Integer value2) { public Criteria andPurchaseIdBetween(String value1, String value2) {
addCriterion("purchase_id between", value1, value2, "purchaseId"); addCriterion("purchase_id between", value1, value2, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPurchaseIdNotBetween(Integer value1, Integer value2) { public Criteria andPurchaseIdNotBetween(String value1, String value2) {
addCriterion("purchase_id not between", value1, value2, "purchaseId"); addCriterion("purchase_id not between", value1, value2, "purchaseId");
return (Criteria) this; return (Criteria) this;
} }
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseTransExpectarrivaltimeMapper.xml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<result column="expectarrivaltime" jdbcType="TIMESTAMP" property="expectarrivaltime" /> <result column="expectarrivaltime" jdbcType="TIMESTAMP" property="expectarrivaltime" />
<result column="count" jdbcType="INTEGER" property="count" /> <result column="count" jdbcType="INTEGER" property="count" />
<result column="transfer_order_id" jdbcType="VARCHAR" property="transferOrderId" /> <result column="transfer_order_id" jdbcType="VARCHAR" property="transferOrderId" />
<result column="purchase_id" jdbcType="INTEGER" property="purchaseId" /> <result column="purchase_id" jdbcType="VARCHAR" property="purchaseId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
purchase_id) purchase_id)
values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{expectarrivaltime,jdbcType=TIMESTAMP}, #{count,jdbcType=INTEGER}, #{transferOrderId,jdbcType=VARCHAR}, #{expectarrivaltime,jdbcType=TIMESTAMP}, #{count,jdbcType=INTEGER}, #{transferOrderId,jdbcType=VARCHAR},
#{purchaseId,jdbcType=INTEGER}) #{purchaseId,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseTransExpectarrivaltime"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseTransExpectarrivaltime">
<!-- <!--
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
#{transferOrderId,jdbcType=VARCHAR}, #{transferOrderId,jdbcType=VARCHAR},
</if> </if>
<if test="purchaseId != null"> <if test="purchaseId != null">
#{purchaseId,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR}, transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR},
</if> </if>
<if test="record.purchaseId != null"> <if test="record.purchaseId != null">
purchase_id = #{record.purchaseId,jdbcType=INTEGER}, purchase_id = #{record.purchaseId,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
expectarrivaltime = #{record.expectarrivaltime,jdbcType=TIMESTAMP}, expectarrivaltime = #{record.expectarrivaltime,jdbcType=TIMESTAMP},
count = #{record.count,jdbcType=INTEGER}, count = #{record.count,jdbcType=INTEGER},
transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR}, transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR},
purchase_id = #{record.purchaseId,jdbcType=INTEGER} purchase_id = #{record.purchaseId,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}, transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
</if> </if>
<if test="purchaseId != null"> <if test="purchaseId != null">
purchase_id = #{purchaseId,jdbcType=INTEGER}, purchase_id = #{purchaseId,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
expectarrivaltime = #{expectarrivaltime,jdbcType=TIMESTAMP}, expectarrivaltime = #{expectarrivaltime,jdbcType=TIMESTAMP},
count = #{count,jdbcType=INTEGER}, count = #{count,jdbcType=INTEGER},
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}, transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
purchase_id = #{purchaseId,jdbcType=INTEGER} purchase_id = #{purchaseId,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseTransExpectarrivaltime"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseTransExpectarrivaltime">
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
#{transferOrderId,jdbcType=VARCHAR}, #{transferOrderId,jdbcType=VARCHAR},
</if> </if>
<if test="purchaseId != null"> <if test="purchaseId != null">
#{purchaseId,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
on duplicate key update on duplicate key update
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}, transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
</if> </if>
<if test="purchaseId != null"> <if test="purchaseId != null">
purchase_id = #{purchaseId,jdbcType=INTEGER}, purchase_id = #{purchaseId,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
values values
(#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{expectarrivaltime,jdbcType=TIMESTAMP}, #{count,jdbcType=INTEGER}, #{transferOrderId,jdbcType=VARCHAR}, #{expectarrivaltime,jdbcType=TIMESTAMP}, #{count,jdbcType=INTEGER}, #{transferOrderId,jdbcType=VARCHAR},
#{purchaseId,jdbcType=INTEGER}) #{purchaseId,jdbcType=VARCHAR})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, bailun_sku = #{bailunSku,jdbcType=VARCHAR},
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
expectarrivaltime = #{expectarrivaltime,jdbcType=TIMESTAMP}, expectarrivaltime = #{expectarrivaltime,jdbcType=TIMESTAMP},
count = #{count,jdbcType=INTEGER}, count = #{count,jdbcType=INTEGER},
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}, transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
purchase_id = #{purchaseId,jdbcType=INTEGER} purchase_id = #{purchaseId,jdbcType=VARCHAR}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseTransExpectarrivaltimeExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseTransExpectarrivaltimeExample" resultMap="BaseResultMap">
<!-- <!--
......
data-common/src/main/java/com/bailuntec/mapper/SalesDayConfigMapper.xml
...@@ -549,6 +549,7 @@ ...@@ -549,6 +549,7 @@
<select id="selectTarget" resultType="com.bailuntec.domain.entity.SalesDayConfig"> <select id="selectTarget" resultType="com.bailuntec.domain.entity.SalesDayConfig">
select DISTINCT bailun_sku,warehouse_code from sales_day_config select DISTINCT bailun_sku,warehouse_code from sales_day_config
where create_date &gt; '2020-12-15'
</select> </select>
......
data-common/src/main/resources/init.properties
table-name=dc_base_trans_expectarrivaltime table-name=dc_base_trans_expectarrivaltime
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
...@@ -377,7 +377,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -377,7 +377,7 @@ public class AutoTurnoverJob extends PointJob {
turnoverDays = 4; turnoverDays = 4;
} }
} }
// turnoverDays = 90; // turnoverDays = 106;
int autoForecastDay = turnoverDays * Constant.TURNOVER_MULTIPLE < Constant.MIN_AUTO_FORECAST_DAY ? Constant.MIN_AUTO_FORECAST_DAY : turnoverDays * 2; int autoForecastDay = turnoverDays * Constant.TURNOVER_MULTIPLE < Constant.MIN_AUTO_FORECAST_DAY ? Constant.MIN_AUTO_FORECAST_DAY : turnoverDays * 2;
/* /*
...@@ -637,6 +637,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -637,6 +637,7 @@ public class AutoTurnoverJob extends PointJob {
forecastInventoryList, forecastInventoryList,
forecastInboundList, forecastInboundList,
forecastSalesList, forecastSalesList,
salesDetailItemList,
forecastShortSupplyList, forecastShortSupplyList,
forecastPurchaseAdvisedList, forecastPurchaseAdvisedList,
moqPurchaseAdvisedList, moqPurchaseAdvisedList,
...@@ -1811,6 +1812,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1811,6 +1812,7 @@ public class AutoTurnoverJob extends PointJob {
List<BigDecimal> forecastInventoryList, List<BigDecimal> forecastInventoryList,
List<Integer> forecastInboundList, List<Integer> forecastInboundList,
List<BigDecimal> forecastSalesList, List<BigDecimal> forecastSalesList,
List<SalesDetailItem> salesDetailItemList,
List<BigDecimal> forecastShortSupplyList, List<BigDecimal> forecastShortSupplyList,
List<BigDecimal> forecastPurchaseAdvisedList, List<BigDecimal> forecastPurchaseAdvisedList,
List<BigDecimal> moqPurchaseAdvisedList, List<BigDecimal> moqPurchaseAdvisedList,
...@@ -1878,9 +1880,11 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1878,9 +1880,11 @@ public class AutoTurnoverJob extends PointJob {
int n = dcAutoFastestStorage.getPurchaseDays() + dcAutoFastestStorage.getTransDays(); int n = dcAutoFastestStorage.getPurchaseDays() + dcAutoFastestStorage.getTransDays();
int x = Math.max(fbaTransferIndex - n, 0); int x = Math.max(fbaTransferIndex - n, 0);
BigDecimal multiSales = BigDecimal.valueOf(Math.min(1, Math.max(1 - n * 0.3, 0) + x * 0.1)); BigDecimal multiSales = BigDecimal.valueOf(Math.min(1, Math.max(1 - n * 0.3, 0) + x * 0.1));
if (x >= 1)
if (x >= 1 && salesDetailItemList.get(j) != null && salesDetailItemList.get(j).getSalesDayConfig() != null) {
forecastSalesList.set(j, forecastSalesItem.multiply(multiSales)); forecastSalesList.set(j, forecastSalesItem.multiply(multiSales));
} }
}
} finally { } finally {
SessionUtil.closeSession(); SessionUtil.closeSession();
} }
......
data-show/show-auto-turnover/src/main/resources/job.properties
...@@ -10,7 +10,7 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf ...@@ -10,7 +10,7 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
ZOOKEEPER_SERVER=172.31.255.120:2181 ZOOKEEPER_SERVER=172.31.255.120:2181
NAME_SPACE=data-center NAME_SPACE=data-center
JOB_NAME=show-auto-turnover30 JOB_NAME=show-auto-turnover31
JOB_CRON=0 0 3 * * ? JOB_CRON=0 0 3 * * ?
#JOB_CRON=0 16 8 * * ? #JOB_CRON=0 16 8 * * ?
SHARDING_TOTAL_COUNT=8 SHARDING_TOTAL_COUNT=8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment