1

SGGL/BLL/Common/Const.cs

@@ -4820,6 +4820,10 @@ namespace BLL
         /// 排产计划导出模板
         /// </summary>
         public const string HJGL_ProductionSchedulingPlanPath = "File\\Excel\\DataOut\\排产计划导出模板.xlsx";
+        /// <summary>
+        /// 材料颜色标识导入模板
+        /// </summary>
+        public const string HJGL_MaterialColorDataImportPath = "File\\Excel\\DataIn\\管道颜色标识库导入模板.xlsx";
 
         /// <summary>
         /// 试压包导入文件路径

SGGL/BLL/HSSE/CostGoods/CostManageService.cs

@@ -109,6 +109,7 @@ namespace BLL
                     newCostManage.CompileDate = costManage.CompileDate;
                     newCostManage.NextManId = costManage.NextManId;
                     db.SubmitChanges();
+
                 }
             }
         }
@@ -416,7 +417,7 @@ namespace BLL
                     headers.Add("Authorization", "Bearer " + accessToken);
                     #region 先获取当前费用是否已经推送过
                     var getRequestUrl = url + "/pu_api/payCraftAmountToHSE/get";
-                    var getRequestbody = $"{{\"projectNumber\":\"{projectModel.ProjectCode}\",\"contractNo\":\"{contractNum}\"}}";
+                    var getRequestbody = $"{{\"projectNumber\":\"{projectModel.ContractNo}\",\"contractNo\":\"{contractNum}\"}}";
                     APICommonService.SaveSysHttpLog("PU_GetPuPayCraftAmount", getRequestUrl, getRequestbody, "Requset");
                     var getResponse = Funs.RequestPost(getRequestUrl, headers, getRequestbody);
                     APICommonService.SaveSysHttpLog("PU_GetPuPayCraftAmount", getRequestUrl, getResponse, "Response");
@@ -452,7 +453,7 @@ namespace BLL
                     {
                         new PuAddApiInput()
                         {
-                            projectNumber = projectModel.ProjectCode,
+                            projectNumber = projectModel.ContractNo,
                             itemId= costManageId,
                             contractNo = contractNum,
                             amountHSE = contractModel.SumMoney.ToString(),