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

Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor

This commit is contained in:
曹鹏飞 2025-09-23 08:01:52 +08:00
parent 93a8819d8d 5f0f40404c
commit c5d2811c97
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -427,8 +427,7 @@ public class NormalPGIController extends BaseController {
List<SAPSyncParamsDTO> sapSyncParamsDTOS = new ArrayList<>();
uniqueCombinations.forEach(triple -> {
List<SAPSyncParamsDTO> items = sapCommonService.getMaterialInfoInOrder(triple.getLeft(), triple.getMiddle(), triple.getRight());
if(CollectionUtil.isNotEmpty( items))
{
if (CollectionUtil.isNotEmpty(items)) {
sapSyncParamsDTOS.addAll(items);
}
});
@ -733,7 +732,7 @@ public class NormalPGIController extends BaseController {
String codeContent = item.getItemCode() + "&" + item.getPoNum() + "&" + item.getPoLineNumber() + "&" + item.getLineNumber()
+ "&" + item.getNoteNum() + "&" + item.getIuCode() + "&" + item.getSupplierNum() + "&" + item.getUnRecieveQty()
+ "&" + item.getUomCode() + "&" + item.getReceivedWarehouse() + "&" + item.getBatchNumber()
+ "&" + item.getSerialNumbers();
+ "&" + item.getSerialNumbers() + "&" + LocalDateTime.now();
String codeId = DigestUtil.md5Hex(codeContent);
srmMaterialReceiptScanCodes.add(new SrmMaterialReceiptNoScanCodes()
.setCodeId(codeId)
@ -764,7 +763,7 @@ public class NormalPGIController extends BaseController {
+ "&" + item.getLineNumber()
+ "&" + item.getNoteNum() + "&" + item.getIuCode() + "&" + item.getSupplierNum() + "&1"
+ "&" + item.getUomCode() + "&" + item.getReceivedWarehouse() + "&" + item.getBatchNumber()
+ "&" + serialNumbers[i];
+ "&" + serialNumbers[i] + "&" + LocalDateTime.now();
String codeId = DigestUtil.md5Hex(codeContent);
srmMaterialReceiptScanCodes.add(new SrmMaterialReceiptNoScanCodes()
.setCodeId(codeId)
@ -796,7 +795,6 @@ public class NormalPGIController extends BaseController {
}
/**
* 一键收货（无码）
*
@ -1044,8 +1042,6 @@ public class NormalPGIController extends BaseController {
}
}
normalPGIControllerService.takeDeliveryConfirmUnScan(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getId(), scanCodes);
// normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId(), scanCodes);
return ApiResult.success();
}

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

@ -272,9 +272,9 @@ public class NormalQMController extends BaseController {
if (CollectionUtil.isNotEmpty(tasks)) {
for (QCTaskItemVO item : tasks) {
QCReceiveTaskConfirmQO taskConfirmQO = new QCReceiveTaskConfirmQO();
taskConfirmQO.setId(qcReceive.getId())
taskConfirmQO.setId(item.getId())
.setFactoryCode(qcReceive.getFactoryCode())
.setPoNum(qcReceive.getOrderNo())
.setPoNum(item.getPoNum())
.setStorageLocation(item.getStorageLocation())
.setReceivedWarehouse(item.getReceivedWarehouse())
.setStorageLocationNew(item.getStorageLocation())

11
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
View File

@ -351,6 +351,11 @@ public class NormalPGIControllerService {
wmsPoReceiptService.save(wmsPoReceipt);
wmsPoReceiptItemService.saveBatch(items);
// 修改收货单的数量
for (WmsPoReceiptItem wmsPoReceiptItem : items) {
wmsSrmOrderItemService.addReceiveQty(wmsPoReceiptItem.getOrderItemId(), wmsPoReceiptItem.getReceiptNum());
}
}
}
}
@ -363,11 +368,17 @@ public class NormalPGIControllerService {
if (CollectionUtil.isNotEmpty(items)) {
wmsQcReceiveService.save(wmsQcReceive);
wmsQcReceiveItemService.saveBatch(items);
// 修改收货单的数量
for (WmsQcReceiveItem wmsQcReceiveItem : items) {
wmsSrmOrderItemService.addReceiveQty(wmsQcReceiveItem.getOrderItemId(), wmsQcReceiveItem.getReceiptNum());
}
}
}
}
for (Long orderId : orderIds) {
//更新收货单的完结状态
List<WmsSrmOrder> orders = wmsSrmOrderService.getUnCompletedItem(orderId);

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java
View File

@ -83,9 +83,6 @@ public class NormalQMControllerService {
}
}
return tasks;
// return tasks.stream()
// .filter(task -> task.getInQty().compareTo(BigDecimal.ZERO) > 0)
// .toList();
}
@Transactional