diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 714cf9a4..e66d8797 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -172,6 +172,7 @@ public class TransferCompanyController extends BaseController { lockVOS.addAll(itemLocks); } else { WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item); + data.setId(IdUtil.getSnowflakeNextId()); data.setOrderId(order.getId()); data.setLeft(data.getNum()); transferCompanyItemService.save(data); @@ -642,7 +643,7 @@ public class TransferCompanyController extends BaseController { if (CollectionUtil.isNotEmpty(item.getDatas())) { item.getDatas().forEach(data -> { temRecords.add(new TransferCompanyNoScanRecord() - .setOrderId(request.getId()) + .setOrderId(order.getId()) .setItemId(item.getOrderItemId()) .setNum(data.getNum()) .setBatchNo(data.getBatchNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index edf95118..aa31d05b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -119,7 +119,6 @@ public class TransferFactoryController extends BaseController { @Resource private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository; - ; /** * 查询SAP领料订单数据 @@ -171,6 +170,7 @@ public class TransferFactoryController extends BaseController { lockVOS.addAll(itemLocks); } else { WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item); + data.setId(IdUtil.getSnowflakeNextId()); data.setOrderId(order.getId()); data.setLeft(data.getNum()); transferFactoryItemService.save(data); @@ -674,7 +674,7 @@ public class TransferFactoryController extends BaseController { if (CollectionUtil.isNotEmpty(item.getDatas())) { item.getDatas().forEach(data -> { temRecords.add(new TransferFactoryNoScanRecord() - .setOrderId(request.getId()) + .setOrderId(order.getId()) .setItemId(item.getOrderItemId()) .setNum(data.getNum()) .setBatchNo(data.getBatchNo())