Skip to content

D
dc-java
Commit 46f6b0da by wutong
Options

自动周转修复财务付款日期没插入的问题

parent 6c51e4dc
Showing with 41 additions and 20 deletions
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
...@@ -123,7 +123,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -123,7 +123,6 @@ public class AutoTurnoverJob extends PointJob {
DcAutoSalesMapper dcAutoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class); DcAutoSalesMapper dcAutoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
dcAutoSales = new DcAutoSales(bailunSku, warehouseCode); dcAutoSales = new DcAutoSales(bailunSku, warehouseCode);
dcAutoSalesMapper.upsertSelective(dcAutoSales); dcAutoSalesMapper.upsertSelective(dcAutoSales);
SessionUtil.getSession().commit();
} else { } else {
dcAutoSales = autoSalesServiceImpl.forecastSalesBySalesVolumeDTO(salesVolumeDTO); dcAutoSales = autoSalesServiceImpl.forecastSalesBySalesVolumeDTO(salesVolumeDTO);
} }
...@@ -467,8 +466,10 @@ public class AutoTurnoverJob extends PointJob { ...@@ -467,8 +466,10 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setQuantitySafeInventory(safeInventory); dcAutoTurnover.setQuantitySafeInventory(safeInventory);
try { try {
DcAutoTurnoverMapper autoTurnoverMapper = SessionUtil.getSession().getMapper(DcAutoTurnoverMapper.class); DcAutoTurnoverMapper autoTurnoverMapper = SessionUtil.getSession().getMapper(DcAutoTurnoverMapper.class);
autoTurnoverMapper.upsertSelective(dcAutoTurnover); int i = autoTurnoverMapper.updateByExampleSelective(dcAutoTurnover, DcAutoTurnoverExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoTurnover.getBailunSku()).andWarehouseCodeEqualTo(dcAutoTurnover.getWarehouseCode()).example());
SessionUtil.getSession().commit(); if (i == 0) {
autoTurnoverMapper.insertSelective(dcAutoTurnover);
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("Mybatis操作DB失败", e); throw new RuntimeException("Mybatis操作DB失败", e);
...@@ -566,7 +567,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -566,7 +567,6 @@ public class AutoTurnoverJob extends PointJob {
} else { } else {
mapper.insertSelective(autoForecastFluctuation); mapper.insertSelective(autoForecastFluctuation);
} }
SessionUtil.getSession().commit();
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -1484,7 +1484,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1484,7 +1484,6 @@ public class AutoTurnoverJob extends PointJob {
dcAutoSales.setForecastTwentyNinedaySales(forecastSalesList.get(29)); dcAutoSales.setForecastTwentyNinedaySales(forecastSalesList.get(29));
dcAutoSales.setForecastThirtydaySales(forecastSalesList.get(30)); dcAutoSales.setForecastThirtydaySales(forecastSalesList.get(30));
autoSalesMapper1.updateByPrimaryKeySelective(dcAutoSales); autoSalesMapper1.updateByPrimaryKeySelective(dcAutoSales);
SessionUtil.getSession().commit();
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -1537,7 +1536,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1537,7 +1536,6 @@ public class AutoTurnoverJob extends PointJob {
try { try {
DcAutoShortSupplyMapper autoShortSupplyMapper = SessionUtil.getSession().getMapper(DcAutoShortSupplyMapper.class); DcAutoShortSupplyMapper autoShortSupplyMapper = SessionUtil.getSession().getMapper(DcAutoShortSupplyMapper.class);
autoShortSupplyMapper.upsertSelective(dcAutoShortSupply); autoShortSupplyMapper.upsertSelective(dcAutoShortSupply);
SessionUtil.getSession().commit();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("Mybatis操作DB失败", e); throw new RuntimeException("Mybatis操作DB失败", e);
...@@ -1590,7 +1588,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1590,7 +1588,6 @@ public class AutoTurnoverJob extends PointJob {
try { try {
DcAutoInboundMapper autoInboundMapper = SessionUtil.getSession().getMapper(DcAutoInboundMapper.class); DcAutoInboundMapper autoInboundMapper = SessionUtil.getSession().getMapper(DcAutoInboundMapper.class);
autoInboundMapper.upsertSelective(dcAutoInbound); autoInboundMapper.upsertSelective(dcAutoInbound);
SessionUtil.getSession().commit();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("Mybatis操作DB失败", e); throw new RuntimeException("Mybatis操作DB失败", e);
...@@ -1642,7 +1639,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1642,7 +1639,6 @@ public class AutoTurnoverJob extends PointJob {
try { try {
DcAutoInventoryMapper dcAutoInventoryMapper = SessionUtil.getSession().getMapper(DcAutoInventoryMapper.class); DcAutoInventoryMapper dcAutoInventoryMapper = SessionUtil.getSession().getMapper(DcAutoInventoryMapper.class);
dcAutoInventoryMapper.upsertSelective(dcAutoInventory); dcAutoInventoryMapper.upsertSelective(dcAutoInventory);
SessionUtil.getSession().commit();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("Mybatis操作DB失败", e); throw new RuntimeException("Mybatis操作DB失败", e);
......
data-show/show-auto-turnover/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.java
...@@ -122,7 +122,6 @@ public interface DcAutoTurnoverMapper { ...@@ -122,7 +122,6 @@ public interface DcAutoTurnoverMapper {
*/ */
int upsertSelective(DcAutoTurnover record); int upsertSelective(DcAutoTurnover record);
void truncateAutoInboundTable(); void truncateAutoInboundTable();
void truncateAutoInventoryTable(); void truncateAutoInventoryTable();
......
data-show/show-auto-turnover/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.xml
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<result column="stock_up_sales" jdbcType="DECIMAL" property="stockUpSales" /> <result column="stock_up_sales" jdbcType="DECIMAL" property="stockUpSales" />
<result column="quantity_begin_advise" jdbcType="DECIMAL" property="quantityBeginAdvise" /> <result column="quantity_begin_advise" jdbcType="DECIMAL" property="quantityBeginAdvise" />
<result column="stock_up_days" jdbcType="INTEGER" property="stockUpDays" /> <result column="stock_up_days" jdbcType="INTEGER" property="stockUpDays" />
<result column="payment_before_delivery" jdbcType="INTEGER" property="paymentBeforeDelivery" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -142,7 +143,7 @@ ...@@ -142,7 +143,7 @@
inspection_delivery, transfer_delivery, transfer_bale_delivery, abroad_inbound_delivery, inspection_delivery, transfer_delivery, transfer_bale_delivery, abroad_inbound_delivery,
supplementary_sales, turnover_sales, turnover_inbound, history_sevenday_sales, history_fourteenday_sales, supplementary_sales, turnover_sales, turnover_inbound, history_sevenday_sales, history_fourteenday_sales,
sales_explain_details, forecast_turnoverday_sales, stock_up_sales, quantity_begin_advise, sales_explain_details, forecast_turnoverday_sales, stock_up_sales, quantity_begin_advise,
stock_up_days stock_up_days, payment_before_delivery
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -223,7 +224,8 @@ ...@@ -223,7 +224,8 @@
turnover_sales, turnover_inbound, history_sevenday_sales, turnover_sales, turnover_inbound, history_sevenday_sales,
history_fourteenday_sales, sales_explain_details, history_fourteenday_sales, sales_explain_details,
forecast_turnoverday_sales, stock_up_sales, forecast_turnoverday_sales, stock_up_sales,
quantity_begin_advise, stock_up_days) quantity_begin_advise, stock_up_days, payment_before_delivery
)
values (#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
#{quantityFinalAdvise,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{quantityPromotion,jdbcType=INTEGER}, #{quantityFinalAdvise,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{quantityPromotion,jdbcType=INTEGER},
...@@ -244,7 +246,8 @@ ...@@ -244,7 +246,8 @@
#{turnoverSales,jdbcType=DECIMAL}, #{turnoverInbound,jdbcType=DECIMAL}, #{historySevendaySales,jdbcType=DECIMAL}, #{turnoverSales,jdbcType=DECIMAL}, #{turnoverInbound,jdbcType=DECIMAL}, #{historySevendaySales,jdbcType=DECIMAL},
#{historyFourteendaySales,jdbcType=DECIMAL}, #{salesExplainDetails,jdbcType=VARCHAR}, #{historyFourteendaySales,jdbcType=DECIMAL}, #{salesExplainDetails,jdbcType=VARCHAR},
#{forecastTurnoverdaySales,jdbcType=DECIMAL}, #{stockUpSales,jdbcType=DECIMAL}, #{forecastTurnoverdaySales,jdbcType=DECIMAL}, #{stockUpSales,jdbcType=DECIMAL},
#{quantityBeginAdvise,jdbcType=DECIMAL}, #{stockUpDays,jdbcType=INTEGER}) #{quantityBeginAdvise,jdbcType=DECIMAL}, #{stockUpDays,jdbcType=INTEGER}, #{paymentBeforeDelivery,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
<!-- <!--
...@@ -412,6 +415,9 @@ ...@@ -412,6 +415,9 @@
<if test="stockUpDays != null"> <if test="stockUpDays != null">
stock_up_days, stock_up_days,
</if> </if>
<if test="paymentBeforeDelivery != null">
payment_before_delivery,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -573,6 +579,9 @@ ...@@ -573,6 +579,9 @@
<if test="stockUpDays != null"> <if test="stockUpDays != null">
#{stockUpDays,jdbcType=INTEGER}, #{stockUpDays,jdbcType=INTEGER},
</if> </if>
<if test="paymentBeforeDelivery != null">
#{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultType="java.lang.Long">
...@@ -751,6 +760,9 @@ ...@@ -751,6 +760,9 @@
<if test="record.stockUpDays != null"> <if test="record.stockUpDays != null">
stock_up_days = #{record.stockUpDays,jdbcType=INTEGER}, stock_up_days = #{record.stockUpDays,jdbcType=INTEGER},
</if> </if>
<if test="record.paymentBeforeDelivery != null">
payment_before_delivery = #{record.paymentBeforeDelivery,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -814,7 +826,8 @@ ...@@ -814,7 +826,8 @@
forecast_turnoverday_sales = #{record.forecastTurnoverdaySales,jdbcType=DECIMAL}, forecast_turnoverday_sales = #{record.forecastTurnoverdaySales,jdbcType=DECIMAL},
stock_up_sales = #{record.stockUpSales,jdbcType=DECIMAL}, stock_up_sales = #{record.stockUpSales,jdbcType=DECIMAL},
quantity_begin_advise = #{record.quantityBeginAdvise,jdbcType=DECIMAL}, quantity_begin_advise = #{record.quantityBeginAdvise,jdbcType=DECIMAL},
stock_up_days = #{record.stockUpDays,jdbcType=INTEGER} stock_up_days = #{record.stockUpDays,jdbcType=INTEGER},
payment_before_delivery = #{record.paymentBeforeDelivery,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -982,6 +995,9 @@ ...@@ -982,6 +995,9 @@
<if test="stockUpDays != null"> <if test="stockUpDays != null">
stock_up_days = #{stockUpDays,jdbcType=INTEGER}, stock_up_days = #{stockUpDays,jdbcType=INTEGER},
</if> </if>
<if test="paymentBeforeDelivery != null">
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1042,7 +1058,8 @@ ...@@ -1042,7 +1058,8 @@
forecast_turnoverday_sales = #{forecastTurnoverdaySales,jdbcType=DECIMAL}, forecast_turnoverday_sales = #{forecastTurnoverdaySales,jdbcType=DECIMAL},
stock_up_sales = #{stockUpSales,jdbcType=DECIMAL}, stock_up_sales = #{stockUpSales,jdbcType=DECIMAL},
quantity_begin_advise = #{quantityBeginAdvise,jdbcType=DECIMAL}, quantity_begin_advise = #{quantityBeginAdvise,jdbcType=DECIMAL},
stock_up_days = #{stockUpDays,jdbcType=INTEGER} stock_up_days = #{stockUpDays,jdbcType=INTEGER},
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
...@@ -1212,6 +1229,9 @@ ...@@ -1212,6 +1229,9 @@
<if test="stockUpDays != null"> <if test="stockUpDays != null">
stock_up_days, stock_up_days,
</if> </if>
<if test="paymentBeforeDelivery != null">
payment_before_delivery,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -1374,6 +1394,9 @@ ...@@ -1374,6 +1394,9 @@
<if test="stockUpDays != null"> <if test="stockUpDays != null">
#{stockUpDays,jdbcType=INTEGER}, #{stockUpDays,jdbcType=INTEGER},
</if> </if>
<if test="paymentBeforeDelivery != null">
#{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -1536,6 +1559,9 @@ ...@@ -1536,6 +1559,9 @@
<if test="stockUpDays != null"> <if test="stockUpDays != null">
stock_up_days = #{stockUpDays,jdbcType=INTEGER}, stock_up_days = #{stockUpDays,jdbcType=INTEGER},
</if> </if>
<if test="paymentBeforeDelivery != null">
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAutoTurnover"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
...@@ -1556,7 +1582,7 @@ ...@@ -1556,7 +1582,7 @@
inspection_config_delivery, inspection_delivery, transfer_delivery, transfer_bale_delivery, inspection_config_delivery, inspection_delivery, transfer_delivery, transfer_bale_delivery,
abroad_inbound_delivery, supplementary_sales, turnover_sales, turnover_inbound, abroad_inbound_delivery, supplementary_sales, turnover_sales, turnover_inbound,
history_sevenday_sales, history_fourteenday_sales, sales_explain_details, forecast_turnoverday_sales, history_sevenday_sales, history_fourteenday_sales, sales_explain_details, forecast_turnoverday_sales,
stock_up_sales, quantity_begin_advise, stock_up_days) stock_up_sales, quantity_begin_advise, stock_up_days, payment_before_delivery)
values values
(#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
...@@ -1578,7 +1604,8 @@ ...@@ -1578,7 +1604,8 @@
#{turnoverSales,jdbcType=DECIMAL}, #{turnoverInbound,jdbcType=DECIMAL}, #{historySevendaySales,jdbcType=DECIMAL}, #{turnoverSales,jdbcType=DECIMAL}, #{turnoverInbound,jdbcType=DECIMAL}, #{historySevendaySales,jdbcType=DECIMAL},
#{historyFourteendaySales,jdbcType=DECIMAL}, #{salesExplainDetails,jdbcType=VARCHAR}, #{historyFourteendaySales,jdbcType=DECIMAL}, #{salesExplainDetails,jdbcType=VARCHAR},
#{forecastTurnoverdaySales,jdbcType=DECIMAL}, #{stockUpSales,jdbcType=DECIMAL}, #{forecastTurnoverdaySales,jdbcType=DECIMAL}, #{stockUpSales,jdbcType=DECIMAL},
#{quantityBeginAdvise,jdbcType=DECIMAL}, #{stockUpDays,jdbcType=INTEGER}) #{quantityBeginAdvise,jdbcType=DECIMAL}, #{stockUpDays,jdbcType=INTEGER}, #{paymentBeforeDelivery,jdbcType=INTEGER}
)
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR}, purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR},
...@@ -1632,7 +1659,8 @@ ...@@ -1632,7 +1659,8 @@
forecast_turnoverday_sales = #{forecastTurnoverdaySales,jdbcType=DECIMAL}, forecast_turnoverday_sales = #{forecastTurnoverdaySales,jdbcType=DECIMAL},
stock_up_sales = #{stockUpSales,jdbcType=DECIMAL}, stock_up_sales = #{stockUpSales,jdbcType=DECIMAL},
quantity_begin_advise = #{quantityBeginAdvise,jdbcType=DECIMAL}, quantity_begin_advise = #{quantityBeginAdvise,jdbcType=DECIMAL},
stock_up_days = #{stockUpDays,jdbcType=INTEGER} stock_up_days = #{stockUpDays,jdbcType=INTEGER},
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -1652,6 +1680,7 @@ ...@@ -1652,6 +1680,7 @@
limit 1 limit 1
</select> </select>
<delete id="truncateAutoInboundTable"> <delete id="truncateAutoInboundTable">
TRUNCATE dc_auto_inbound TRUNCATE dc_auto_inbound
</delete> </delete>
...@@ -1670,5 +1699,4 @@ ...@@ -1670,5 +1699,4 @@
<delete id="truncateAutoExceptionTable"> <delete id="truncateAutoExceptionTable">
TRUNCATE dc_auto_exception TRUNCATE dc_auto_exception
</delete> </delete>
</mapper> </mapper>
\ No newline at end of file
data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java
...@@ -50,7 +50,6 @@ public class AutoTurnoverTest { ...@@ -50,7 +50,6 @@ public class AutoTurnoverTest {
try { try {
DcBaseStockMapper mapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class); DcBaseStockMapper mapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
// dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("322572421").andWarehouseCodeEqualTo("QYBLZZ").example()); // dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("322572421").andWarehouseCodeEqualTo("QYBLZZ").example());
dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("278308409").andWarehouseCodeEqualTo("GZBLYS").example());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
......
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