rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
yf001217 2026-06-15 14:47:47 +08:00
parent 71d8178fd7 77b0f12912
commit b34823958d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -172,6 +172,7 @@ public class TransferCompanyController extends BaseController {
lockVOS.addAll(itemLocks); lockVOS.addAll(itemLocks);
} else { } else {
WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item); WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item);
data.setId(IdUtil.getSnowflakeNextId());
data.setOrderId(order.getId()); data.setOrderId(order.getId());
data.setLeft(data.getNum()); data.setLeft(data.getNum());
transferCompanyItemService.save(data); transferCompanyItemService.save(data);
@ -642,7 +643,7 @@ public class TransferCompanyController extends BaseController {
if (CollectionUtil.isNotEmpty(item.getDatas())) { if (CollectionUtil.isNotEmpty(item.getDatas())) {
item.getDatas().forEach(data -> { item.getDatas().forEach(data -> {
temRecords.add(new TransferCompanyNoScanRecord() temRecords.add(new TransferCompanyNoScanRecord()
.setOrderId(request.getId()) .setOrderId(order.getId())
.setItemId(item.getOrderItemId()) .setItemId(item.getOrderItemId())
.setNum(data.getNum()) .setNum(data.getNum())
.setBatchNo(data.getBatchNo()) .setBatchNo(data.getBatchNo())

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -119,7 +119,6 @@ public class TransferFactoryController extends BaseController {
@Resource @Resource
private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository; private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository;
;
/** /**
* 查询SAP领料订单数据 * 查询SAP领料订单数据
@ -171,6 +170,7 @@ public class TransferFactoryController extends BaseController {
lockVOS.addAll(itemLocks); lockVOS.addAll(itemLocks);
} else { } else {
WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item); WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item);
data.setId(IdUtil.getSnowflakeNextId());
data.setOrderId(order.getId()); data.setOrderId(order.getId());
data.setLeft(data.getNum()); data.setLeft(data.getNum());
transferFactoryItemService.save(data); transferFactoryItemService.save(data);
@ -674,7 +674,7 @@ public class TransferFactoryController extends BaseController {
if (CollectionUtil.isNotEmpty(item.getDatas())) { if (CollectionUtil.isNotEmpty(item.getDatas())) {
item.getDatas().forEach(data -> { item.getDatas().forEach(data -> {
temRecords.add(new TransferFactoryNoScanRecord() temRecords.add(new TransferFactoryNoScanRecord()
.setOrderId(request.getId()) .setOrderId(order.getId())
.setItemId(item.getOrderItemId()) .setItemId(item.getOrderItemId())
.setNum(data.getNum()) .setNum(data.getNum())
.setBatchNo(data.getBatchNo()) .setBatchNo(data.getBatchNo())