Huabao
/
FactorySystemApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit by yzf

Browse Source
master
Yang 2 years ago
parent 010b0613d5
commit 08a3102b7b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
Unescape View File

@ -251,7 +251,9 @@ namespace FactorySystemApi.Controllers
//创建 TFS_FTeamwork
int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork");
TFS_Material tFS_Material = BaseBll.GetTempModel<TFS_Material>(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString()));
TeamworkBll TeamworkBll = new TeamworkBll();
List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(inParam["FNewTestCode"].ToString(), inParam["FVersionCode"].ToString());
//TFS_Material tFS_Material = BaseBll.GetTempModel<TFS_Material>(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString()));
List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory);
ids = editMaterialList.Select(m => m.FID).Distinct().ToList();
@ -274,7 +276,7 @@ namespace FactorySystemApi.Controllers
if (tFS_Material == null)
if (materialList.Count()==0)
{
//开始BOM下载
int dow = DockGetBomData(teamwork.FID, user.FID);

4
FactorySystemApi/Web.config
Unescape View File

@ -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.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=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="Sap_UserName" value="mcs_con" />
<add key="Sap_Upload_UserName" value="chenjie" />

Write Preview
Loading…
Cancel
Save