diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
index f459824..5318951 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
@@ -286,20 +286,23 @@ public class MaterialReceiveActController {
 					int result = a.compareTo(b);
 					hashMap2.put("QTY", mathMaterialQuantity);
 					IDMFrameServiceProxy.getSqlTemplate().update(insertSql, hashMap2);
-					IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap2);
+					// 去掉接受收数量更新
+//					IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap2);
 					break;
 				} else if (mathMaterialQuantity.compareTo(mathQty) == 1) {//条码数量大于剩余数量
 					hashMap2.put("QTY", qty);
 					mathMaterialQuantity = mathMaterialQuantity.subtract(mathQty);
 					IDMFrameServiceProxy.getSqlTemplate().update(insertSql, hashMap2);
-					IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap2);
+					// 去掉接受收数量更新
+//					IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap2);
 					System.out.println("a is greater than b");
 					continue;
 				} else {//条码数量小于订单剩余数量
 					System.out.println("a is less than b");
 					hashMap2.put("QTY", mathMaterialQuantity);
 					IDMFrameServiceProxy.getSqlTemplate().update(insertSql, hashMap2);
-					IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap2);
+					// 去掉接受收数量更新
+//					IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap2);
 					break;
 				}
 			}
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java
index cba3ce8..3ff00b9 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java
@@ -48,9 +48,10 @@ public class MaterialPackingServiceServiceImpl implements IMaterialPackingServic
             hashMap.put("RECEIVEREQUESTNAME", item.get("RECEIVEREQUESTNAME").toString());
             hashMap.put("RECEIVEREQUESTDETAILNAME", item.get("RECEIVEREQUESTDETAILNAME").toString());
             hashMap.put("QTY", item.get("QTY").toString());
-            String updateSql = "UPDATE MATERIALRECEIVEREQUESTDETAIL T SET T.RECEIVEDQUANTITY = T.RECEIVEDQUANTITY  - :QTY "
-                    + "WHERE T.RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND T.RECEIVEREQUESTDETAILNAME  = :RECEIVEREQUESTDETAILNAME";
-            IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap);
+            // 去掉接受收数量更新
+//            String updateSql = "UPDATE MATERIALRECEIVEREQUESTDETAIL T SET T.RECEIVEDQUANTITY = T.RECEIVEDQUANTITY  - :QTY "
+//                    + "WHERE T.RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND T.RECEIVEREQUESTDETAILNAME  = :RECEIVEREQUESTDETAILNAME";
+//            IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap);
 
             String deleteSql = "DELETE FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME AND RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME";
             IDMFrameServiceProxy.getSqlTemplate().update(deleteSql, hashMap);
diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
index a3eb8a9..5bbe706 100644
--- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
+++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
@@ -159,8 +159,8 @@
             AND AA.SDK_ID = m.SDK_ID AND AA.PHASE = m3.PHASE
         LEFT JOIN BB ON BB.RECEIVEREQUESTNAME = m.RECEIVEREQUESTNAME
             AND BB.MATERIALSPECNAME = m.MATERIALSPECNAME
-            AND BB.SDK_ID = m.SDK_ID
-            AND BB.PHASE = m3.PHASE
+            AND COALESCE(BB.SDK_ID, 'N/A') = COALESCE(m.SDK_ID, 'N/A')
+            AND COALESCE(BB.PHASE, 'N/A') = COALESCE(m3.PHASE, 'N/A')
         <if test="deliveryName != null">
             INNER JOIN DELIVERY ON DELIVERY.MATERIALSPECNAME = m.MATERIALSPECNAME
         </if>