|
|
@@ -3146,19 +3146,19 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
if (Arrays.asList("待开工", "加工中", "部分取消", "已完工").contains(productCardVo.getStatus())) {
|
|
|
DateTime endDate = null;
|
|
|
if (Arrays.asList("待开工", "加工中").contains(productCardVo.getStatus())) {
|
|
|
- endDate = DateTime.of(apsDeliveryOffsetDo.getPlanenddate());
|
|
|
+ endDate = DateTime.of(apsDeliveryOffsetDo.getGuessenddate());
|
|
|
} else {
|
|
|
endDate = DateTime.of(apsDeliveryOffsetDo.getActualenddate());
|
|
|
}
|
|
|
if (endDate != null) {
|
|
|
- //如果料卷计划完工时间的日期<坯料计划承诺交货期起，则=料卷计划完工时间的日期-坯料计划承诺交货期起
|
|
|
+ //如果料卷计划完工时间的日期<坯料计划承诺交货期起，则=料卷预计完工时间的日期-坯料计划承诺交货期起
|
|
|
if (endDate.before(promiseStartDate)) {
|
|
|
long between = DateUtil.between(promiseStartDate, endDate, DateUnit.HOUR, false);
|
|
|
//取整
|
|
|
BigDecimal divide = new BigDecimal(between).divide(new BigDecimal(24), RoundingMode.UP);
|
|
|
int offsetDay = divide.intValue();
|
|
|
apsDeliveryOffsetDo.setDeliveryoffset(offsetDay);
|
|
|
- // 如果料卷计划完工时间的日期>坯料计划承诺交货期止，则=料卷计划完工时间的日期-坯料计划承诺交货期止
|
|
|
+ // 如果料卷计划完工时间的日期>坯料计划承诺交货期止，则=料卷预计完工时间的日期-坯料计划承诺交货期止
|
|
|
} else if (endDate.after(promiseEndDate)) {
|
|
|
long between = DateUtil.between(promiseEndDate, endDate, DateUnit.HOUR, false);
|
|
|
//取整
|
sucheng