diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 31a1e11..6fb6a2d 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1186;
+        public static int VersionCount = 1187;
         public static string MainPath = "29wx";
         //public static string MainPath = "29wx";
         //public static string MainPath = "29pdd";
diff --git a/TEMUKJD/BLL/PDDProdFormConverter.cs b/TEMUKJD/BLL/PDDProdFormConverter.cs
index 84c77ba..e047b82 100644
--- a/TEMUKJD/BLL/PDDProdFormConverter.cs
+++ b/TEMUKJD/BLL/PDDProdFormConverter.cs
@@ -1500,7 +1500,7 @@ namespace TemuKJD.BLL
                         multi_price_in_yuan = null,
                         price = wxEditSkuInfo.productSkuInfo.salePrice.ParseToInt() + 100,
                         price_in_yuan = null,
-                        quantity = wxEditSkuInfo.productSkuInfo.realStockInfo.stockNum,
+                        quantity = wxEditSkuInfo.productSkuInfo.realStockInfo?.stockNum ?? wxEditSkuInfo.productSkuInfo.stockInfo?.stockNum.ParseToInt(),
                         reserve_quantity = 0,
                         weight = 0,
                         thumb_url = wxEditSkuInfo.productSkuInfo.thumbImg,
diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
index 657e73d..5e5506c 100644
--- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
@@ -1504,7 +1504,7 @@ namespace TemuKJD.WXForms.ProductForms
                         var error = BaseRegex.GetStringJson(ref searchRst, "msg");
                         if (string.IsNullOrEmpty(error))
                             error = searchRst;
-                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询错误 " + error + "\"}";
+                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"已存在商品查询错误 " + error + "\"}";
                     }
                     try
                     {
@@ -1516,7 +1516,7 @@ namespace TemuKJD.WXForms.ProductForms
                     }
                     catch (Exception ex)
                     {
-                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询错误 " + ex.Message + "\"}";
+                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"已存在商品查询错误 " + ex.Message + "\"}";
                     }
                 }
                 // 非裂变商品按商品Id
@@ -1536,7 +1536,7 @@ namespace TemuKJD.WXForms.ProductForms
                         var error = BaseRegex.GetStringJson(ref searchRst, "msg");
                         if (string.IsNullOrEmpty(error))
                             error = searchRst;
-                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询错误 " + error + "\"}";
+                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"已存在商品查询错误 " + error + "\"}";
                     }
                     try
                     {
@@ -1548,7 +1548,7 @@ namespace TemuKJD.WXForms.ProductForms
                     }
                     catch (Exception ex)
                     {
-                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询错误 " + ex.Message + "\"}";
+                        return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"已存在商品查询错误 " + ex.Message + "\"}";
                     }
                 }
             }