#EQD-5843 国联民生-交易确认书编号规则, 客户编号规则, 以及确认书相关的一些调整

YLErpWeb/Controllers/TradeConfirmBookController.cs

@@ -782,9 +782,9 @@ namespace YLErp.Web.Controllers
         /// <summary>
         /// 将上传确认书做成页面
         /// </summary>
-        public ActionResult confirmBookUploadNew(string Id)
+        public ActionResult confirmBookUploadNew(int tradeId = 0)
         {
-            ViewBag.Id = Id;
+            ViewBag.TradeId = tradeId;
             return View();
         }
 
@@ -2631,4 +2631,4 @@ namespace YLErp.Web.Controllers
             }
         }
     }
-}
+}

YLErpWeb/Controllers/tradeController.cs

@@ -2032,22 +2032,16 @@ namespace YLErp.Web.Controllers
             }
             return JsonError(msg);
         }
-        public ActionResult UploadContractFileNew(string encryptId, bool isCounterpartyDoc = false)
-        {        
+        public ActionResult UploadContractFileNew(int tradeId, bool isCounterpartyDoc = false, bool useContractCode = false, string contractCode = null)
+        {
             var uploadFileModel = Request.Form.Files.Count > 0 ? Request.Form.Files[0].ToUploadFileModel() : null;
-            var docId = DataProtectHelper.DecryptInt(encryptId);
-            var contractDoc = db.trade_contract_document.FirstOrDefault(o => o.id == docId);
-            if (contractDoc == null)
-            {
-                return JsonError("未找到确认书数据");
-            }
-            var (flag, msg, optDate, stampPath) = new ConfirmationGenerateService(CurUser).UploadContractFileNew(contractDoc.Code, isCounterpartyDoc, uploadFileModel);
 
-            if (flag)
+            var result = new ConfirmationGenerateService(CurUser).UploadContractFileNew(tradeId, useContractCode, contractCode, isCounterpartyDoc, uploadFileModel);
+            if (result.Success)
             {
-                return JsonSuccess(msg);
+                return JsonSuccess(result.Message);
             }
-            return JsonError(msg);
+            return JsonError(result.Message);
         }
 
         public ActionResult tradeContractManagementQuery(string tradeNumber)
@@ -8967,4 +8961,4 @@ namespace YLErp.Web.Controllers
 
         #endregion
     }
-}
+}