diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
index 77d2169c..efdddf02 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
@@ -297,8 +297,8 @@ public class PackingController extends BaseController {
         WmsSrmOrderItem item = srmOrderItemService.lambdaQuery()
                 .eq(WmsSrmOrderItem::getNoteNum, request.getDeliveryNo())
                 .eq(WmsSrmOrderItem::getItemCode, materialCode)
-//                .eq(WmsSrmOrderItem::getPoNum, qrCodeMaster.getPoNumber())
-//                .eq(WmsSrmOrderItem::getPoLineNumber, qrCodeMaster.getPoLineNumber())
+                .eq(WmsSrmOrderItem::getPoNum, qrCodeMaster.getPoNumber())
+                .eq(WmsSrmOrderItem::getPoLineNumber, qrCodeMaster.getPoLineNumber())
                 .one();
 //和送货单进行验证
         srmOrderValidation(item, quantity);
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
index 3775467c..254396da 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
@@ -203,9 +203,9 @@
                          when c.packaging_type = 0 then c.delivery_line_no
                          else d.delivery_line_no end                                                    as delivery_line_no,
                      case when c.packaging_type = 0 then c.delivery_no else d.delivery_no end           as delivery_no,
-                     case
-                         when c.packaging_type = 0 then c.quantity
-                         else sum(d.quantity) end                                                       as packing_quantity
+                     sum( case
+                        when c.packaging_type = 0 then c.quantity
+                         else d.quantity end) as packing_quantity
               from wms_package a
                        inner join wms_package_item b on a.id = b.package_id
                        left join wms_qr_code_master c on b.barcode_code = c.barcode_code