diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
index 31f43297..081c9b6e 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
@@ -99,9 +99,6 @@ public class NormalPGIController extends BaseController {
     @Resource
     private IWmsPackageItemService wmsPackageItemService;
 
-    @Resource
-    private IWmsQrCodeMasterService wmsQrCodeMasterService;
-
     @Resource
     private IWmsQrCodeMasterService qrCodeMasterService;
 
@@ -641,6 +638,7 @@ public class NormalPGIController extends BaseController {
      * @return
      */
     //收货确认
+    @Transactional
     @PostMapping("PDA/takeDelivery")
     @ApiMark(moduleName = "送货单管理", apiName = "收货确认")
     public ApiResult<Void> takeDelivery(@Valid @RequestBody List<SrmMaterialReceiptQO> request) {
@@ -679,7 +677,7 @@ public class NormalPGIController extends BaseController {
 
         for (SrmMaterialReceiptQO item : request) {
 
-            if (item.getReceiptNum().equals(BigDecimal.ZERO))
+            if (item.getReceiptNum().compareTo(BigDecimal.ZERO)==0)
                 continue;
 // 处理二维码
             List<PDAScanCodeQO> autoFindChildCodes = Lists.newArrayList();
@@ -726,7 +724,7 @@ public class NormalPGIController extends BaseController {
                 setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId);
                 for (PDAScanCodeQO code : item.getScanCodes()) {
                     // 处理条码
-                    WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
+                    WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
                             .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
                             .one();
                     VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");
@@ -745,7 +743,7 @@ public class NormalPGIController extends BaseController {
                 setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId);
                 for (PDAScanCodeQO code : item.getScanCodes()) {
                     // 处理条码
-                    WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
+                    WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
                             .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
                             .one();
                     VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");
@@ -1656,7 +1654,7 @@ public class NormalPGIController extends BaseController {
 
             if (CollectionUtil.isNotEmpty(scanCode)) {
                 scanCode.forEach(code -> {
-                    WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.getByCode(code.getCodeId());
+                    WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.getByCode(code.getCodeId());
                     VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("条码不存在:" + code.getCodeId());
                     // 库存
                     InventoryInDTO inventoryDTO = inventories.stream()
@@ -2016,7 +2014,7 @@ public class NormalPGIController extends BaseController {
                 .map(WmsPackageItemDetailDTO::getBarcodeId).collect(Collectors.toList());
 
         if (CollectionUtil.isNotEmpty(parentIds)) {
-            List<WmsQrCodeMaster> childMasters = wmsQrCodeMasterService.lambdaQuery()
+            List<WmsQrCodeMaster> childMasters = qrCodeMasterService.lambdaQuery()
                     .in(WmsQrCodeMaster::getParentBarcodeId, parentIds).list();
             childMasters.forEach(child -> {
                 WmsPackageItemDetailDTO dto = new WmsPackageItemDetailDTO();
@@ -2136,7 +2134,7 @@ public class NormalPGIController extends BaseController {
                     setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId);
                     for (PDAScanCodeQO code : item.getScanCodes()) {
                         // 处理条码
-                        WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
+                        WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
                                 .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
                                 .one();
                         VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");
@@ -2155,7 +2153,7 @@ public class NormalPGIController extends BaseController {
                     setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId);
                     for (PDAScanCodeQO code : item.getScanCodes()) {
                         // 处理条码
-                        WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
+                        WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
                                 .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
                                 .one();
                         VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");