diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
index 982b3ba6..8ad2f3e4 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
@@ -75,6 +75,7 @@ public class NormalQMController extends BaseController {
     @Resource
     private IWmsQrCodeMasterService qrCodeMasterService;
 
+    @Resource
     private SapService sapService;
 
     /**
@@ -137,8 +138,7 @@ public class NormalQMController extends BaseController {
     @PostMapping("PDA/task/confirm")
     @ApiMark(moduleName = "质检物料管理", apiName = "质检任务上架确认")
     public ApiResult<Void> confirm(@Valid @RequestBody List<QCReceiveTaskConfirmQO> request) {
-        if (CollectionUtil.isEmpty(request))
-            VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("入库参数为空");
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("入库参数为空");
 
         //根据详情ID 获取到相应的入库单信息
         List<Long> uniqueIds = request.stream()
@@ -151,7 +151,7 @@ public class NormalQMController extends BaseController {
                 .apply("check_qty>in_qty")
                 .list();
 
-        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("不存在待入库的物料(或此物料已入库)");
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(wmsQcReceiveItems)).throwMessage("不存在待入库的物料(或此物料已入库)");
 
         List<String> qrCodes = CollectionUtil.unionAll(
                 request.stream()
@@ -232,14 +232,14 @@ public class NormalQMController extends BaseController {
 
         List<QCReceiveDTO> qcReceiveDTOS = new ArrayList<>();
         for (String poNum : poNums) {
-            //封装一个数据
-            QCReceiveDTO qcReceiveDTO = new QCReceiveDTO()
-//                    .setUnqualifiedInventories(new ArrayList<>())
-                    .setQcIdList(new ArrayList<>())
-                    .setReceiveIds(new ArrayList<>())
-                    .setWaitModifyItems(new ArrayList<>())
-                    .setStorageLocationDTOS(new ArrayList<>())
-                    .setQualifiednventories(new ArrayList<>());
+//            //封装一个数据
+//            QCReceiveDTO qcReceiveDTO = new QCReceiveDTO()
+////                    .setUnqualifiedInventories(new ArrayList<>())
+//                    .setQcIdList(new ArrayList<>())
+//                    .setReceiveIds(new ArrayList<>())
+//                    .setWaitModifyItems(new ArrayList<>())
+//                    .setStorageLocationDTOS(new ArrayList<>())
+//                    .setQualifiednventories(new ArrayList<>());
             List<QCReceiveTaskConfirmQO> qcReceiveTaskConfirmQOS = request.stream()
                     .filter(q -> q.getPoNum().equals(poNum))
                     .collect(Collectors.toList());
@@ -252,6 +252,15 @@ public class NormalQMController extends BaseController {
                     if (Objects.isNull(wmsQcReceiveItem)) {
                         continue;
                     }
+                    //封装一个数据
+                    QCReceiveDTO qcReceiveDTO = new QCReceiveDTO()
+//                    .setUnqualifiedInventories(new ArrayList<>())
+                            .setQcIdList(new ArrayList<>())
+                            .setReceiveIds(new ArrayList<>())
+                            .setWaitModifyItems(new ArrayList<>())
+                            .setStorageLocationDTOS(new ArrayList<>())
+                            .setQualifiednventories(new ArrayList<>());
+                    qcReceiveDTOS.add(qcReceiveDTO);
                     if (!qcReceiveDTO.getReceiveIds().stream().anyMatch(id -> id.equals(wmsQcReceiveItem.getReceiveId()))) {
                         qcReceiveDTO.getReceiveIds().add(wmsQcReceiveItem.getReceiveId());
                     }
@@ -366,7 +375,7 @@ public class NormalQMController extends BaseController {
                     }
                 }
             }
-            qcReceiveDTOS.add(qcReceiveDTO);
+//            qcReceiveDTOS.add(qcReceiveDTO);
         }
         qrCodeMasterService.updateBarCode(qrCodeMasters);
         normalQMControllerService.confirmReceive(qcReceiveDTOS);