Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yf001217 2026-03-24 11:16:11 +08:00
commit 4b4c98c262
1 changed files with 4 additions and 0 deletions

View File

@ -254,8 +254,12 @@ public class StructuralPackageOrderController extends BaseController {
order.setOrderNo(orderNo); order.setOrderNo(orderNo);
if (Objects.isNull(order.getId())) { if (Objects.isNull(order.getId())) {
order.setId(IdUtil.getSnowflakeNextId()); order.setId(IdUtil.getSnowflakeNextId());
order.setCreateBy(UserUtil.getUserName());
order.setCreateTime(LocalDateTime.now());
ordersForAdd.add(order); ordersForAdd.add(order);
} else { } else {
order.setUpdateBy(UserUtil.getUserName());
order.setUpdateTime(LocalDateTime.now());
ordersForUpdate.add(order); ordersForUpdate.add(order);
} }
GenerateTrayVO trayVO = generateTray(orderQO.getPackageId(), orderQO.getNum(), orderQO.getPlanNum()); GenerateTrayVO trayVO = generateTray(orderQO.getPackageId(), orderQO.getNum(), orderQO.getPlanNum());