DeXun/GEAR-OA
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

原料管理优化

Browse Source
This commit is contained in:
朱昊天
2026-05-26 17:36:13 +08:00
parent a44497f92c
commit ae586d1fc2
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gear-oa/src/main/java/com/gear/oa/service/impl/GearStockIoOrderServiceImpl.java
View File

@@ -177,7 +177,7 @@ public class GearStockIoOrderServiceImpl implements IGearStockIoOrderService {
update.setOrderId(order.getOrderId());
update.setExecFlag("1");
update.setExecuteBy(LoginHelper.getNickName());
update.setExecuteTime(new Date());
update.setExecuteTime(order.getIoTime() != null ? order.getIoTime() : new Date());
baseMapper.updateById(update);
}
return order.getOrderId();
@@ -347,8 +347,8 @@ public class GearStockIoOrderServiceImpl implements IGearStockIoOrderService {
update.setOrderId(orderId);
update.setConfirmInFlag("1");
update.setConfirmInBy(LoginHelper.getNickName());
update.setConfirmInTime(new Date());
update.setActualArrivalTime(order.getActualArrivalTime() != null ? order.getActualArrivalTime() : new Date());
update.setConfirmInTime(order.getIoTime() != null ? order.getIoTime() : new Date());
update.setActualArrivalTime(order.getActualArrivalTime() != null ? order.getActualArrivalTime() : (order.getIoTime() != null ? order.getIoTime() : new Date()));
update.setExecFlag("1");
baseMapper.updateById(update);
}