commit by yzf

FactorySystemApi/Controllers/SapUploadController.cs

@@ -392,7 +392,8 @@ namespace FactorySystemApi.Controllers
             {
                 return ExceptionHelper.TryReturnException(() =>
                 {
-                    apiResult.Data = -1;
+                    apiResult.Data = -2;
+                    apiResult.Message = "未查到视图";
                 }, apiResult, Request, inParam);
             }
             

FactorySystemApi/Controllers/TeamworkController.cs

@@ -1231,6 +1231,15 @@ namespace FactorySystemApi.Controllers
                     if (hasField[1]) dataList.Rows[i]["子项序号"] = (i + 1) * 10;
                     if (hasField[2]) dataList.Rows[i]["组件损耗率"] = "";
                     if (hasField[3]) dataList.Rows[i]["固定损耗数量"] = "";
+
+                    if (dataList.Rows[i]["计量单位"].ToString() == "G") 
+                    {
+                        dataList.Rows[i]["组件数量"] = int.Parse(dataList.Rows[i]["组件数量"].ToString()) * 100;
+                    }
+                    if (dataList2.Rows[i]["计量单位"].ToString() == "G")
+                    {
+                        dataList2.Rows[i]["组件数量"] = int.Parse(dataList2.Rows[i]["组件数量"].ToString()) * 100;
+                    }
                     dataList.Rows[i]["可选文本"] = "生产组装BOM";
                 }
                 NPOIHelper.ExportDTtoExcel(dataList, "Sheet1", savePath.Replace(".xlsx", "1.xlsx"));
@@ -1245,7 +1254,7 @@ namespace FactorySystemApi.Controllers
                     }
                     if (hasField[3] && !string.IsNullOrEmpty(dataList2.Rows[i]["固定损耗数量"].ToString()) && !dataList2.Rows[i]["固定损耗数量"].ToString().Equals("0")) 
                     {
-                        dataList3.Rows[i]["组件数量"] = "";
+                        dataList3.Rows[i]["组件数量"] = dataList2.Rows[i]["固定损耗数量"].ToString();
                         dataList3.Rows[i]["组件损耗率"] = "";
                         dataList3.Rows[i]["固定损耗数量"] = "X";
                         if (hasField[1]) dataList3.Rows[i]["子项序号"] = (i + rowCount + 1) * 10;

FactorySystemApi/Web.config

@@ -12,8 +12,8 @@
   <appSettings>
     <add key="ApiAuthSecretKey" value="zhkxfs" />
     <!--<add key="ConnectionString" value="server=49.235.68.145,3456;uid=sa;pwd=zhenxuan@2019;database=FactorySystem" />-->
-	  <!--<add key="ConnectionString" value="server=192.168.8.156,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />-->
+	  <add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />
-	  <add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />
+	  <!--<add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />-->
 
     <add key="Sap_UserName" value="mcs_con" />
 	<add key="Sap_Upload_UserName" value="plm_com" />