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

Merge branch 'v19.6_carrier_optimization_20240717' into test

...@@ -226,7 +226,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild, ...@@ -226,7 +226,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
public List<OrderChild> getOrderChildInfoByOrderGoodsNo(QueryOrderChildsListByParam param) { public List<OrderChild> getOrderChildInfoByOrderGoodsNo(QueryOrderChildsListByParam param) {
return list(lQrWrapper() return list(lQrWrapper()
.eq(OrderChild::getOrderGoodsNo, param.getOrderGoodsNo()) .eq(OrderChild::getOrderGoodsNo, param.getOrderGoodsNo())
.in(CollectionUtil.isNotEmpty(param.getStatusList()),OrderChild::getOrderGoodsNo,param.getStatusList())); .in(CollectionUtil.isNotEmpty(param.getStatusList()),OrderChild::getStatus,param.getStatusList()));
} }
@Override @Override
......
...@@ -262,6 +262,7 @@ public class OrderChildDtsListener { ...@@ -262,6 +262,7 @@ public class OrderChildDtsListener {
private void afterLogicalProcessing(OrderChildMessage before,OrderChildMessage after){ private void afterLogicalProcessing(OrderChildMessage before,OrderChildMessage after){
BigDecimal loadNet = after.getLoadNet();//装车净重 BigDecimal loadNet = after.getLoadNet();//装车净重
String orderGoodsNo = after.getOrderGoodsNo();//货单号 String orderGoodsNo = after.getOrderGoodsNo();//货单号
log.info("装车净重:{},货单号:{}",loadNet,orderGoodsNo);
if(Objects.nonNull(loadNet)) {//装车吨数不为空处理 if(Objects.nonNull(loadNet)) {//装车吨数不为空处理
if (OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())) { if (OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())) {
//运单取消,货单装车吨数需要减掉 //运单取消,货单装车吨数需要减掉
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论