diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
index aa51674..6176a9a 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
@@ -352,7 +352,8 @@ public class ToSAPServiceImpl {
             rcode = returnJsonObject.get("STATUS").toString();
             rmsg = returnJsonObject.get("MSGTXT").toString();
             if ("S".equals(rcode)) {
-                undoId2 = returnJsonObject.get("MBLNR").toString()+"_"+returnJsonObject.get("MJAHR").toString();//将物料凭证号与凭证年度拼在一起
+                undoId2 = returnJsonObject.get("MBLNR") == null ? "" : returnJsonObject.get("MBLNR").toString()
+                        +"_"+returnJsonObject.get("MJAHR") == null ? "" : returnJsonObject.get("MJAHR").toString();//将物料凭证号与凭证年度拼在一起
             }
         } catch (Exception e) {
             log.error("WMS请求SAP异常:" + e.getMessage(), e);
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java
index 8d4517e..a393bb6 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java
@@ -48,18 +48,26 @@ public class MESToWMSController {
 
     @ApiOperation(value = "取消物料入库请求")
     @RequestMapping(value = "/meswms_cancelship_request", method = RequestMethod.POST)
-    public AjaxResult cancelShipByMES(@RequestBody JSONArray in) throws Exception {
+    public AjaxResult cancelShipByMES(@RequestBody JSONArray in)  {
         log.info("Received cancel ship request: {}", in.toJSONString());
         String undoId = in.getJSONObject(0).getString("undoId");
         String userId = in.getJSONObject(0).getString("userId");
 //        return mesToWMSService.cancelShipByMES(in);
-        return mesToWMSService.sapcprkUndo(undoId, userId);
+        try {
+            return mesToWMSService.sapcprkUndo(undoId, userId);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @ApiOperation(value = "物料入库请求")
     @RequestMapping(value = "/meswms_ship_request", method = RequestMethod.POST)
-    public AjaxResult shipByMES(@RequestBody JSONArray in) throws Exception {
+    public AjaxResult shipByMES(@RequestBody JSONArray in)   {
         log.info("Received ship request: {}", in.toJSONString());
-        return mesToWMSService.shipByMES(in);
+        try {
+            return mesToWMSService.shipByMES(in);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 }
\ No newline at end of file