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

物料路线新增物料增加重复物料描述的限制判断

Browse Source
master
Leo 2 years ago
parent 1a8a71a136
commit d164970400
1 changed files with 91 additions and 82 deletions
Show Stats Download Patch File Download Diff File

171
FactorySystemApi/Controllers/MaterialTeamworkController.cs
Unescape View File

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

Write Preview
Loading…
Cancel
Save