1、修改了供应商的代码

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

@@ -424,11 +424,10 @@ public class NormalPGIController extends BaseController {
                 .distinct()
                 .collect(Collectors.toList());
         //重新读取SAP的接口，更新物料信息(已收货数、仓库信息、储位信息 等)
-        List<SAPSyncParamsDTO> sapSyncParamsDTOS=new ArrayList<>();
+        List<SAPSyncParamsDTO> sapSyncParamsDTOS = new ArrayList<>();
         uniqueCombinations.forEach(triple -> {
-            List<SAPSyncParamsDTO> items=  sapCommonService.getMaterialInfoInOrder(triple.getLeft(), triple.getMiddle(), triple.getRight());
+            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 {
     }
 
 
-
     /**
      * 一键收货（无码）
      *
@@ -919,7 +917,7 @@ public class NormalPGIController extends BaseController {
     @PostMapping("unscan/task/confirm")
     @ApiMark(moduleName = "送货单管理", apiName = "普通物料任务上架确认")
     public ApiResult<Void> takeDeliveryConfirm(@Valid @RequestBody ReceiveQO request) {
-        WmsPoReceipt wmsPoReceipt=wmsPoReceiptService.getById(request.getId());
+        WmsPoReceipt wmsPoReceipt = wmsPoReceiptService.getById(request.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(wmsPoReceipt)).throwMessage("无此任务");
         VUtil.trueThrowBusinessError(!wmsPoReceipt.getSourceType().equals(1)).throwMessage("不属于无码收货的采购单");
 
@@ -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();
     }
 

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

@@ -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())

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

@@ -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);

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

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