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

Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi

Browse Source
master
leo 3 years ago
parent 051bf6acdf 16096d7f1f
commit bf259abae4
3 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File

20
FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
Unescape View File

@ -288,7 +288,7 @@ namespace FactorySystemApi.Controllers
//开始BOM下载
int dow = DockGetBomData(teamwork.FID, user.FID);
if (dow > 0 || editMaterialList.Count() > 0)
if (dow > 0)
{
MaterialTeamworkBll.HasMaterialTestCode(teamwork);
BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
@ -296,8 +296,13 @@ namespace FactorySystemApi.Controllers
}
else
{
BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
apiResult.Error("未能找到物料");
BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.BOM下载, 1, 1);
//BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
//apiResult.Error("未能找到物料");
//BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
//BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
}
@ -783,6 +788,15 @@ namespace FactorySystemApi.Controllers
FTestCode = item.SP_VALUE,
FVersionCode = item.SP_Version,
FParentID = parentId
//FID = DateTime.Now.DayOfYear * 10 + dataId,
//FPlmCode = item.Code,
//FName = item.Name,
////FCode = item.Code,
//FType = item.Type.ToLower(),
//FTestCode = item.TestNO,
//FVersionCode = item.Version,
//FParentID = parentId
};
TFS_ViewMaterial view = new TFS_ViewMaterial()

63
FactorySystemBll/HalfMaterialTeamworkBll.cs
Unescape View File

@ -489,7 +489,7 @@ namespace FactorySystemBll
mItem.FOldID = oldId;
mItem.FLevelID = vItem.FLevel;
mItem.FParentID = oldParent;
mItem.FTestCode = teamInfo.FNewTestCode;
//mItem.FTestCode = teamInfo.FNewTestCode;
if (mItem.FLevelID >= 1) formulaList.Add(mItem);
}
@ -782,40 +782,45 @@ namespace FactorySystemBll
{
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
List<TFS_Material> materialList = null;
List<int> factoryList = new List<int>();
if (factory != null)
materialList = db.Queryable<TFS_Material>().Where(m => m.FTestCode == testCode).ToList();
List<int> ids = materialList.Select(m => m.FID).ToList();
//更新配方
string sql = "";
if (string.IsNullOrWhiteSpace(idList))
{
if (factory.FType != (int)Constant.FactoryType.单工厂)
{
factoryList.Add(factory.FID);
factoryList.Add(factory.FFactoryID);
}
else
{
factoryList.Add(factory.FID);
}
sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_ViewMaterial set FHalfMaterialTeamID={2} WHERE FMaterialID in ({1})", testCode2, string.Join(",", ids), temId);
}
else
{
sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1})", testCode, idList);
}
if (materialList.Count() > 0)
{
db.Ado.ExecuteCommand(sql);
}
materialList = db.Queryable<TFS_Material>().Where(m => m.FTestCode == testCode&&string.Join(",", factoryList).Contains(m.FFactoryID.ToString())).ToList();
List<int> ids = materialList.Select(m => m.FID).ToList();
//更新配方
string sql = "";
//List<int> factoryList = new List<int>();
//if (factory != null)
//{
// if (factory.FType != (int)Constant.FactoryType.单工厂)
// {
// factoryList.Add(factory.FID);
// factoryList.Add(factory.FFactoryID);
// }
// else
// {
// factoryList.Add(factory.FID);
// }
if (string.IsNullOrWhiteSpace(idList))
{
sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_ViewMaterial set FHalfMaterialTeamID={2} WHERE FMaterialID in ({1})", testCode2, string.Join(",", ids), temId);
}
else
{
sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1})", testCode, idList);
}
if (materialList.Count() > 0)
{
db.Ado.ExecuteCommand(sql);
}
}
//}

7
FactorySystemBll/ViewBll.cs
Unescape View File

@ -772,6 +772,7 @@ namespace FactorySystemBll
break;
}
}
}
result += db.Updateable(viewList).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand();
@ -795,11 +796,12 @@ namespace FactorySystemBll
materialList[i].Add("FK3ShortCode", k3Code.ToString().Split('.').Last());
}
}
result += db.Updateable(materialList[i]).AS("TFS_Material").WhereColumns("FID").ExecuteCommand();
}
result += db.Updateable(materialList).AS("TFS_Material").WhereColumns("FID").ExecuteCommand();
result += HalfMaterialUnionModifyData(materialList, "TFS_Material", teamId, db);
}
if (infoList != null && infoList.Count > 0)
@ -810,8 +812,9 @@ namespace FactorySystemBll
infoList[i].Remove("FMaterialID");
infoList[i].Add("FType", 2);
infoList[i].Add("FType2", int.Parse(materialList[i]["FTypeID2"].ToString()));
result += db.Updateable(infoList[i]).AS("TFS_MaterialInfo").WhereColumns("FType", "FDataID").ExecuteCommand();
}
result += db.Updateable(infoList).AS("TFS_MaterialInfo").WhereColumns("FType", "FDataID").ExecuteCommand();
result += UnionModifyData(infoList, "TFS_MaterialInfo", teamId, db, "FDataID");
}
//result += CheckTaskComplete2(db, teamId, viewType, userId);

Write Preview
Loading…
Cancel
Save