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

commit by yzf

Browse Source
master
Yang 3 years ago
parent d5d0c615e5
commit cf3c6c8ce9
4 changed files with 86 additions and 33 deletions
Show Stats Download Patch File Download Diff File

10
FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
Unescape View File

@ -252,7 +252,7 @@ namespace FactorySystemApi.Controllers
//创建 TFS_FTeamwork
int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork");
List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory.FID);
List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory);
ids = editMaterialList.Select(m => m.FID).Distinct().ToList();
apiResult.Data = teamId;
@ -320,7 +320,7 @@ namespace FactorySystemApi.Controllers
catch (Exception ex)
{
//失败则把修改的更新回去
MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), 0, 0, string.Join(",", ids));
MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), 0, null, string.Join(",", ids));
throw;
}
}, apiResult, Request, inParam);
@ -776,12 +776,12 @@ namespace FactorySystemApi.Controllers
TFS_Material material = new TFS_Material()
{
FID = DateTime.Now.DayOfYear * 10 + dataId,
FPlmCode = item.Code,
FPlmCode = item.SP,
FName = item.Name,
//FCode = item.Code,
FType = item.Type.ToLower(),
FTestCode = item.TestNO,
FVersionCode = item.Version,
FTestCode = item.SP_VALUE,
FVersionCode = item.SP_Version,
FParentID = parentId
};

32
FactorySystemApi/Controllers/MaterialController.cs
Unescape View File

@ -156,6 +156,30 @@ namespace FactorySystemApi.Controllers
}
}, apiResult, Request, inParam);
}
/// <summary>
/// 根据试验号获取物料
/// </summary>
/// <param name="inParam"></param>
/// <returns></returns>
[HttpPost]
public ApiResult GetMaterialListByFTestCode(Dictionary<string, object> inParam)
{
ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() =>
{
if (inParam == null)
{
apiResult.Error("未接收到参数");
}
else
{
if (inParam.ContainsKey("FTestCode"))
{
apiResult.Data = MaterialBll.GetMaterialListByFTestCode(inParam["FTestCode"].ToString());
}
}
}, apiResult, Request, inParam);
}
/// <summary>
/// （对接）MDM获取物料PLM码
@ -223,7 +247,7 @@ namespace FactorySystemApi.Controllers
/// 导出视图
/// </summary>
/// <returns></returns>
public ApiResult DownMateialView(Dictionary<string,object> inParam)
public ApiResult DownMateialView(Dictionary<string, object> inParam)
{
ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() =>
@ -359,7 +383,7 @@ namespace FactorySystemApi.Controllers
MaterialBll.CreateExeclFileALL(inParam["FType"].ToString(), savePath);
}
string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", str+".xlsx");
string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", str + ".xlsx");
apiResult.Data = url;
}, apiResult, Request, inParam);
}
@ -389,7 +413,7 @@ namespace FactorySystemApi.Controllers
else
{
int tempId = int.Parse(inParam["tempId"].ToString());
int taskId= int.Parse(inParam["taskId"].ToString());
int taskId = int.Parse(inParam["taskId"].ToString());
inParam.Remove("tempId");
inParam.Remove("taskId");
@ -401,7 +425,7 @@ namespace FactorySystemApi.Controllers
if (result.Where(m => m.FSuccedaneumID == 0).Count() == 0)
{
BaseBll.UpdateTeamProcess(tempId, (int)Constant.ProcessType.替代品确认, 2, 2);
int count=MaterialBll.ExecSql(BaseBll.GetTaskSql(taskId, 2, tempId, (int)Constant.TaskType.替代料确认));
int count = MaterialBll.ExecSql(BaseBll.GetTaskSql(taskId, 2, tempId, (int)Constant.TaskType.替代料确认));
}
}

29
FactorySystemBll/HalfMaterialTeamworkBll.cs
Unescape View File

@ -408,8 +408,8 @@ namespace FactorySystemBll
int oldId = mItem.FID, oldParent = mItem.FParentID;
Expression<Func<TFS_Material, bool>> expression;
if (string.IsNullOrEmpty(mItem.FCode)) expression = s => s.FPlmCode == mItem.FPlmCode && s.FVersionCode == mItem.FVersionCode&&s.FID==mItem.FID;
else expression = s => s.FCode == mItem.FCode && s.FVersionCode == mItem.FVersionCode && s.FID == mItem.FID;
if (string.IsNullOrEmpty(mItem.FCode)) expression = s => s.FPlmCode == mItem.FPlmCode && s.FVersionCode == mItem.FVersionCode;
else expression = s => s.FCode == mItem.FCode && s.FVersionCode == mItem.FVersionCode ;
TFS_Material mData = db.Queryable<TFS_Material>().Where(expression).First();
if (mData == null)//没物料新增物料
@ -778,11 +778,25 @@ namespace FactorySystemBll
/// <param name="testCode">原配方</param>
/// <param name="testCode2">新配方</param>
/// <returns></returns>
public List<TFS_Material> UpdateFormula(string testCode, string testCode2,int temId,int factoryID, string idList="")
public List<TFS_Material> UpdateFormula(string testCode, string testCode2,int temId, TFS_Factory factory, string idList="")
{
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
List<TFS_Material> materialList = null;
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);
}
List<TFS_Material> materialList = db.Queryable<TFS_Material>().Where(m => m.FTestCode == testCode).ToList();
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 = "";
@ -790,7 +804,7 @@ namespace FactorySystemBll
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);
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
{
@ -801,6 +815,11 @@ namespace FactorySystemBll
db.Ado.ExecuteCommand(sql);
}
}
return materialList;
}
}

10
FactorySystemBll/MaterialBll.cs
Unescape View File

@ -105,6 +105,16 @@ namespace FactorySystemBll
.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID))
.Where((a, b) => b.FTeamID == tempId).Select<TFS_Material>((a, b) => a).ToList();
}
/// <summary>
/// 更具试验号获取物料
/// </summary>
/// <param name="fTestCode"></param>
/// <returns></returns>
public List<TFS_Material> GetMaterialListByFTestCode(string fTestCode)
{
return AppSettingsHelper.GetSqlSugar().Queryable<TFS_Material>().Where(m => m.FTestCode == fTestCode).ToList();
}
public TFS_Material GetMaterialById(int id)
{

Write Preview
Loading…
Cancel
Save