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 4cde393..3214661 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
@@ -563,7 +563,8 @@ public class MaterialReceiveActController {
 			SDKMaterialPackingServiceImpl.updateMaterialPackingUndoIdByReceive(receiveRequestName, undoId);
 			// 更新库存状态
 			SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate);
-			SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode,erpLocation, erpFactory1);
+//			SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode,erpLocation, erpFactory1);
+			SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode);
 		}
 		// 到货单据更新状态
 		if (Objects.nonNull(materialDelivery)) {
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
index 8482750..2ccc440 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
@@ -3353,12 +3353,13 @@ public class InvoiceServiceImpl implements InvoiceService {
 						Boolean success = untils.sendMaterialInfoToMES_NEW2(shipRequestName, "", materialPackingKeyList,billCode,eventUser);
 
 						if (!success) {
-
 							String undo = cancelShipInter(billCode, eventUser);
 							if (undo == null || undo.isEmpty()) {
 								throw new GlobalException("下发mes失败后冲销失败！");
+							}else {
+								throw new GlobalException("发送到mes失败！");
 							}
-							throw new GlobalException("发送到mes失败！");
+
 						}
 
 						WlySaveUnDoInfo( billCode,commitDate);
@@ -3380,8 +3381,9 @@ public class InvoiceServiceImpl implements InvoiceService {
 							String undo = cancelShipInter(billCode, eventUser);
 							if (undo == null || undo.isEmpty()) {
 								throw new GlobalException("下发mes失败后冲销失败！");
+							}else {
+								throw new GlobalException("发送到mes失败！");
 							}
-							throw new GlobalException("发送到mes失败！");
 					     }
 
 						untils.SaveUnDoInfo_ForSap(materialPackingKeyList, billCode, makeEventInfo);
@@ -3396,12 +3398,12 @@ public class InvoiceServiceImpl implements InvoiceService {
 				Boolean success = untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList,billCode,eventUser);
 
 				if (!success) {
-
 					String undo = cancelShipInter(billCode, eventUser);
 					if (undo == null || undo.isEmpty()) {
 						throw new GlobalException("下发mes失败后冲销失败！");
+					}else {
+						throw new GlobalException("发送到mes失败！");
 					}
-					throw new GlobalException("发送到mes失败！");
 				}
 
 				//更新MES管芯数据