提交 d9564cfe authored 作者: 刘海泉's avatar 刘海泉

Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test

# Conflicts: # performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java
......@@ -229,14 +229,14 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
change = true;
}
}else{
//今日预计完成吨数从有变成无
if(todayExpectComplete.compareTo(BigDecimal.ZERO) != 0){
PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
"-",userNo,userName);
logs.add(log);
change = true;
}
//今日预计完成吨数从有变成无
if(todayExpectComplete.compareTo(BigDecimal.ZERO) != 0){
PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
"-",userNo,userName);
logs.add(log);
change = true;
}
}
String tradeRequireArriveStationTime = StringUtils.isBlank(param.getTradeRequireArriveStationTime())
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论