提交 f4f4cfef authored 作者: 李瑞鑫's avatar 李瑞鑫

运单变化更新货单已装车吨数

上级 d7e63613
...@@ -2,14 +2,14 @@ package com.clx.performance.dao; ...@@ -2,14 +2,14 @@ package com.clx.performance.dao;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dto.CancelOrderGoodsWeightDTO; import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
import com.clx.performance.model.OrderGoodsFleetOpenTruck;
import com.clx.performance.param.app.AppGoodsOrderSearchParam;
import com.clx.performance.param.pc.OrderGoodsEditParams;
import com.clx.performance.param.pc.PageOrderGoodsListParam;
import com.clx.performance.mapper.OrderGoodsMapper; import com.clx.performance.mapper.OrderGoodsMapper;
import com.clx.performance.model.OrderGoods; import com.clx.performance.model.OrderGoods;
import com.clx.performance.model.OrderGoodsFleetOpenTruck;
import com.clx.performance.param.app.AppGoodsOrderSearchParam;
import com.clx.performance.param.app.OrderGoodsListPageParam; import com.clx.performance.param.app.OrderGoodsListPageParam;
import com.clx.performance.param.pc.GoodsOrderMapParam; import com.clx.performance.param.pc.GoodsOrderMapParam;
import com.clx.performance.param.pc.OrderGoodsEditParams;
import com.clx.performance.param.pc.PageOrderGoodsListParam;
import com.clx.performance.vo.app.OrderGoodsAPPVO; import com.clx.performance.vo.app.OrderGoodsAPPVO;
import com.clx.performance.vo.pc.OrderGoodsVO; import com.clx.performance.vo.pc.OrderGoodsVO;
import com.msl.common.base.Optional; import com.msl.common.base.Optional;
...@@ -108,4 +108,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int ...@@ -108,4 +108,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
void batchCancel(List<Integer> idList); void batchCancel(List<Integer> idList);
void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight); void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight);
void updateAlreadyLoadWeight(BigDecimal alreadyLoadWeight, String orderGoodsNo);
} }
...@@ -305,4 +305,9 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods, ...@@ -305,4 +305,9 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
public void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight) { public void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight) {
baseMapper.batchCancelOrderGoods(cancelOrderGoodsWeight); baseMapper.batchCancelOrderGoods(cancelOrderGoodsWeight);
} }
@Override
public void updateAlreadyLoadWeight(BigDecimal alreadyLoadWeight, String orderGoodsNo) {
baseMapper.updateAlreadyLoadWeight(alreadyLoadWeight,orderGoodsNo);
}
} }
...@@ -13,6 +13,7 @@ import com.clx.order.feign.OrderFeign; ...@@ -13,6 +13,7 @@ import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.feign.FeignOrderVO; import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.performance.config.ThirdAppConfig; import com.clx.performance.config.ThirdAppConfig;
import com.clx.performance.constant.RabbitKeyConstants; import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.dao.OrderGoodsDao;
import com.clx.performance.dto.dts.DataTransportDTO; import com.clx.performance.dto.dts.DataTransportDTO;
import com.clx.performance.enums.DtsOperationTypeEnum; import com.clx.performance.enums.DtsOperationTypeEnum;
import com.clx.performance.enums.OrderChildEnum; import com.clx.performance.enums.OrderChildEnum;
...@@ -32,6 +33,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; ...@@ -32,6 +33,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
...@@ -45,6 +47,8 @@ public class OrderChildDtsListener { ...@@ -45,6 +47,8 @@ public class OrderChildDtsListener {
private final ApplicationEventPublisher applicationEventPublisher; private final ApplicationEventPublisher applicationEventPublisher;
private final ThirdAppConfig thirdAppConfig; private final ThirdAppConfig thirdAppConfig;
private final OrderGoodsDao orderGoodsDao;
@RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE) @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
...@@ -206,12 +210,14 @@ public class OrderChildDtsListener { ...@@ -206,12 +210,14 @@ public class OrderChildDtsListener {
* @param after * @param after
*/ */
private void afterLogicalProcessing(OrderChildMessage before,OrderChildMessage after){ private void afterLogicalProcessing(OrderChildMessage before,OrderChildMessage after){
//运单取消处理 BigDecimal loadNet = after.getLoadNet();//装车净重
if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){ String orderGoodsNo = after.getOrderGoodsNo();//货单号
//如果运单有装车吨数,货单装车吨数需要扣除 if(Objects.nonNull(loadNet)) {//装车吨数不为空处理
if(Objects.nonNull(after.getLoadNet())){ if (OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())) {
//运单取消,货单装车吨数需要减掉
} loadNet = loadNet.negate();
}
orderGoodsDao.updateAlreadyLoadWeight(loadNet, orderGoodsNo);
} }
} }
......
...@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dto.CancelOrderGoodsWeightDTO; import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.model.OrderGoodsFleetOpenTruck; import com.clx.performance.model.OrderGoodsFleetOpenTruck;
import com.clx.performance.param.app.AppGoodsOrderSearchParam; import com.clx.performance.param.app.AppGoodsOrderSearchParam;
import com.clx.performance.param.pc.OrderGoodsEditParams; import com.clx.performance.param.pc.OrderGoodsEditParams;
import com.clx.performance.param.pc.PageOrderGoodsListParam; import com.clx.performance.param.pc.PageOrderGoodsListParam;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.sqlProvider.OrderGoodsSqlProvider; import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
import com.clx.performance.vo.app.OrderGoodsAPPVO; import com.clx.performance.vo.app.OrderGoodsAPPVO;
import com.clx.performance.vo.pc.OrderGoodsVO; import com.clx.performance.vo.pc.OrderGoodsVO;
...@@ -106,4 +106,9 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> { ...@@ -106,4 +106,9 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
@UpdateProvider(type = OrderGoodsSqlProvider.class, method = "batchCancelOrderGoods") @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "batchCancelOrderGoods")
void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight); void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight);
@UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateAlreadyLoadWeight")
void updateAlreadyLoadWeight(@Param(value = "alreadyLoadWeight") BigDecimal alreadyLoadWeight,@Param(value = "orderGoodsNo") String orderGoodsNo);
} }
...@@ -379,4 +379,16 @@ public class OrderGoodsSqlProvider { ...@@ -379,4 +379,16 @@ public class OrderGoodsSqlProvider {
} }
public String updateAlreadyLoadWeight(@Param(value = "alreadyLoadWeight") BigDecimal alreadyLoadWeight,@Param(value = "orderGoodsNo") String orderGoodsNo){
String sql = new SQL() {{
UPDATE("order_goods")
.SET("already_load_weight = already_load_weight + #{alreadyLoadWeight}")
.WHERE("order_goods_no = #{orderGoodsNo}");
}}.toString();
return sql;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论