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
Yang 2 years ago
parent a657f8e301 dd87d33da1
commit a0a417bb98
2 changed files with 92 additions and 83 deletions
Show Stats Download Patch File Download Diff File

173
FactorySystemApi/Controllers/MaterialTeamworkController.cs
Unescape View File

@ -66,109 +66,118 @@ namespace FactorySystemApi.Controllers
string materialName = inParam["FMaterialName"].ToString(); string materialName = inParam["FMaterialName"].ToString();
inParam.TryGetValue("FState", out object state); TFS_Material existMaterial = BaseBll.GetTempModel<TFS_Material>("FName='" + materialName + "'");
if (null == state)
{
inParam["FState"] = state = 1;
}
if (inParam.ContainsKey("FAddUser")) if (existMaterial != null)
{ {
inParam["FAddUser"] = user.FID; result.Add("TaskId", -8);
} }
else else
{ {
inParam.Add("FAddUser", user.FID); inParam.TryGetValue("FState", out object state);
} if (null == state)
{
inParam["FState"] = state = 1;
}
if (inParam.ContainsKey("FAddDate")) if (inParam.ContainsKey("FAddUser"))
{ {
inParam["FAddDate"] = DateTime.Now; inParam["FAddUser"] = user.FID;
} }
else else
{ {
inParam.Add("FAddDate", DateTime.Now); inParam.Add("FAddUser", user.FID);
} }
if (inParam.ContainsKey("FEditUser")) if (inParam.ContainsKey("FAddDate"))
{ {
inParam["FEditUser"] = user.FID; inParam["FAddDate"] = DateTime.Now;
} }
else else
{ {
inParam.Add("FEditUser", user.FID); inParam.Add("FAddDate", DateTime.Now);
} }
if (inParam.ContainsKey("FEditDate")) if (inParam.ContainsKey("FEditUser"))
{ {
inParam["FEditDate"] = DateTime.Now; inParam["FEditUser"] = user.FID;
} }
else else
{ {
inParam.Add("FEditDate", DateTime.Now); inParam.Add("FEditUser", user.FID);
} }
if (inParam.ContainsKey("FCreateFactoryID")) if (inParam.ContainsKey("FEditDate"))
{ {
inParam.Remove("FCreateFactoryID"); inParam["FEditDate"] = DateTime.Now;
} }
inParam.Add("FCreateFactoryID", factory.FID); else
inParam.Add("FCreateFactoryCode", factory.FCode); {
inParam.Add("FCreateFactoryType", factory.FType); inParam.Add("FEditDate", DateTime.Now);
if (factory.FType != (int)Constant.FactoryType.单工厂) }
{
TFS_Factory prodFactory = BaseBll.GetTempModel<TFS_Factory>(factory.FFactoryID);
inParam.Add("FProdFactoryID", prodFactory.FID);
inParam.Add("FProdFactoryCode", prodFactory.FCode);
}
else
{
inParam.Add("FProdFactoryID", factory.FID);
inParam.Add("FProdFactoryCode", factory.FCode);
}
inParam.Add("FTeamworkType", 1); if (inParam.ContainsKey("FCreateFactoryID"))
{
// 获取具备相应权限的用户 inParam.Remove("FCreateFactoryID");
List<TUser> users = MaterialTaskBll.GetTaskUsers(0, "10", factory.FID); }
inParam.Add("FCreateFactoryID", factory.FID);
inParam.Add("FCreateFactoryCode", factory.FCode);
inParam.Add("FCreateFactoryType", factory.FType);
if (factory.FType != (int)Constant.FactoryType.单工厂)
{
TFS_Factory prodFactory = BaseBll.GetTempModel<TFS_Factory>(factory.FFactoryID);
inParam.Add("FProdFactoryID", prodFactory.FID);
inParam.Add("FProdFactoryCode", prodFactory.FCode);
}
else
{
inParam.Add("FProdFactoryID", factory.FID);
inParam.Add("FProdFactoryCode", factory.FCode);
}
// 如果没有获取到用户，则不创建路线、任务、物料和视图 inParam.Add("FTeamworkType", 1);
if (users != null && users.Count > 0)
{ // 获取具备相应权限的用户
int teamId = BaseBll.InsertDataModel(inParam, "TFS_FMaterialTeamwork"); List<TUser> users = MaterialTaskBll.GetTaskUsers(0, "10", factory.FID);
result.Add("TeamId", teamId);
if (teamId > 0) // 如果没有获取到用户，则不创建路线、任务、物料和视图
if (users != null && users.Count > 0)
{ {
inParam.Add("FID", teamId); int teamId = BaseBll.InsertDataModel(inParam, "TFS_FMaterialTeamwork");
result.Add("TeamId", teamId);
if (state.ToString().Contains("1")) if (teamId > 0)
{ {
TFS_FMaterialTeamwork teamwork = BaseBll.GetTempModel<TFS_FMaterialTeamwork>(teamId); inParam.Add("FID", teamId);
// 创建物料和物料视图 if (state.ToString().Contains("1"))
Dictionary<string, object> materialInfo = CreateMaterialData(inParam, factory, teamwork);
if (materialInfo.ContainsKey("FMaterialCode") && !string.IsNullOrEmpty(materialInfo["FMaterialCode"].ToString()))
{ {
teamwork.FMaterialCode = materialInfo["FMaterialCode"].ToString(); TFS_FMaterialTeamwork teamwork = BaseBll.GetTempModel<TFS_FMaterialTeamwork>(teamId);
MaterialTeamworkBll.UpdateMaterialTeamwork(teamwork);
}
foreach (string key in materialInfo.Keys) // 创建物料和物料视图
{ Dictionary<string, object> materialInfo = CreateMaterialData(inParam, factory, teamwork);
result.Add(key, materialInfo[key]);
} if (materialInfo.ContainsKey("FMaterialCode") && !string.IsNullOrEmpty(materialInfo["FMaterialCode"].ToString()))
{
teamwork.FMaterialCode = materialInfo["FMaterialCode"].ToString();
MaterialTeamworkBll.UpdateMaterialTeamwork(teamwork);
}
foreach (string key in materialInfo.Keys)
{
result.Add(key, materialInfo[key]);
}
// 创建物料分类任务 // 创建物料分类任务
int taskId = MaterialTaskBll.CreateMaterialTask(teamId, 1, user.FID, 0, factory.FID, users); int taskId = MaterialTaskBll.CreateMaterialTask(teamId, 1, user.FID, 0, factory.FID, users);
result.Add("TaskId", taskId); result.Add("TaskId", taskId);
}
} }
} }
} else
else {
{ result.Add("TaskId", -9);
result.Add("TaskId", -9); }
} }
apiResult.Data = result; apiResult.Data = result;

2
FactorySystemBll/TaskBll.cs
Unescape View File

@ -124,7 +124,7 @@ namespace FactorySystemBll
public int SureTeamWork(int teamId) public int SureTeamWork(int teamId)
{ {
return AppSettingsHelper.GetSqlSugar().Ado.ExecuteCommand(string.Format(@" return AppSettingsHelper.GetSqlSugar().Ado.ExecuteCommand(string.Format(@"
if(select count(1) from TFS_Task where FTeamID={0} and FState!=2)=0 if(select count(1) from TFS_Task where FTeamID={0} and FState!=2 and FType!=13)=0
begin begin
update TFS_Task set FCanEdit=2 where FCanEdit!=2 and FTeamID={0}; update TFS_Task set FCanEdit=2 where FCanEdit!=2 and FTeamID={0};
update TFS_Task set FState=2,FFinishDate=getdate() where FState!=2 and FTeamID={0}; update TFS_Task set FState=2,FFinishDate=getdate() where FState!=2 and FTeamID={0};

Write Preview
Loading…
Cancel
Save