Merge branch 'master' of http://119.3.29.177:3000/Jjie/DeYiShiBase

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs

@@ -1010,7 +1010,7 @@ LEFT JOIN ICSConfiguration conWhCode ON conWhCode.Code='ERPWHCode' AND a.WorkPoi
                         foreach (var item in res)
                         {
                             JObject jo = (JObject)item;
-                            JArray resdetail = (JArray)JsonConvert.DeserializeObject(jo["details"].ToString());
+                            JArray resdetail = (JArray)JsonConvert.DeserializeObject(jo["osArriveorderDetailRet"].ToString());
                             foreach (var detail in resdetail)
                             {
                                 JObject det = (JObject)detail;
@@ -1018,7 +1018,7 @@ LEFT JOIN ICSConfiguration conWhCode ON conWhCode.Code='ERPWHCode' AND a.WorkPoi
                                 string ERPupdate = @"update ICSODeliveryNotice set ODNCode='{0}',Sequence='{1}',ODNID='{2}',ODNDetailID='{3}'
                                         where OODetailID='{4}' AND ODNType='1'  AND ODNCode='{5}' and Sequence='{6}'";
                                 ERPupdate = string.Format(ERPupdate, jo["ODNCode"], det["Sequence"], jo["ID"], det["DetailID"], det["OODetailID"], ODNCode, det["Sequence"].ToString().Substring(0, det["Sequence"].ToString().Length - 1));
-
+                                log.Debug("到货单回写sql："+ERPupdate);
                                 if (!DBHelper.ExecuteNonQuery(ERPupdate, cmd))
                                 {
                                     throw new Exception(language.GetNameByCode("WMSAPIInfo079"));//"到货单更新失败！");