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 ea341bd003
commit da884b4b62
11 changed files with 538 additions and 405 deletions
Show Stats Download Patch File Download Diff File

188
FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
Unescape View File

@ -14,6 +14,7 @@ using Newtonsoft.Json.Linq;
using FactorySystemApi.Plm_Formula; using FactorySystemApi.Plm_Formula;
using System.Linq; using System.Linq;
using SqlSugar; using SqlSugar;
using System.Globalization;
namespace FactorySystemApi.Controllers namespace FactorySystemApi.Controllers
{ {
@ -40,6 +41,114 @@ namespace FactorySystemApi.Controllers
InsertField = UpdateField = ""; InsertField = UpdateField = "";
} }
/// <summary>
/// 更新试验号
/// </summary>
/// <param name="inParam"></param>
/// <returns></returns>
//public ApiResult EditFTestCode(Dictionary<string, object> inParam)
//{
// int teamId = 0;
// ApiResult apiResult = new ApiResult();
// return ExceptionHelper.TryReturnException(() => {
// if (inParam.ContainsKey("FTestCode") && inParam.ContainsKey("FNewTestCode") && inParam.ContainsKey("FCreateFactoryID"))
// {
// inParam.TryGetValue("FState", out object state);
// if (null == state)
// {
// inParam["FState"] = state = 1;
// }
// inParam.Remove("FID");
// ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo;
// 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("FEditDate"))
// {
// inParam["FEditDate"] = DateTime.Now;
// }
// else
// {
// inParam.Add("FEditDate", DateTime.Now);
// }
// TFS_Factory factory = BaseBll.GetTempModel<TFS_Factory>(int.Parse(inParam["FCreateFactoryID"].ToString()));
// 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.单工厂)
// {
// factory = BaseBll.GetTempModel<TFS_Factory>(factory.FFactoryID);
// inParam.Add("FProdFactoryID", factory.FID);
// inParam.Add("FProdFactoryCode", factory.FCode);
// }
// else
// {
// inParam.Add("FProdFactoryID", factory.FID);
// inParam.Add("FProdFactoryCode", factory.FCode);
// }
// if (!inParam.ContainsKey("FSaleCode"))
// {
// inParam.Add("FSaleCode", "");
// }
// //创建 TFS_HalfMaterialFTeamwork
// teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork");
// //更新试验号
// List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId);
// if (teamId > 0)
// {
// //创建流程
// int resultProcessCreate = MaterialTeamworkBll.CreateProcessData(teamId, user.FID);
// TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId);
// MaterialTeamworkBll.CreateProductView(teamwork, editMaterialList, user.FID);
// //开始BOM下载
// int dow = DockGetBomData(teamwork.FID, user.FID);
// //判断是否有新的BOM物料，或者是否有变更的物料
// if (dow > 0 || editMaterialList.Count() > 0)
// {
// BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
// BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
// }
// else
// {
// BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
// apiResult.Error("未能找到物料");
// }
// }
// }
// else
// {
// apiResult.Error("保存失败");
// }
// }, apiResult, Request, inParam);
//}
/// <summary> /// <summary>
/// 获取子项集合 /// 获取子项集合
/// </summary> /// </summary>
@ -149,7 +258,7 @@ namespace FactorySystemApi.Controllers
//创建 TFS_FTeamwork //创建 TFS_FTeamwork
int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork"); int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork");
List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId); List<TFS_Material> editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory.FID);
ids = editMaterialList.Select(m => m.FID).Distinct().ToList(); ids = editMaterialList.Select(m => m.FID).Distinct().ToList();
apiResult.Data = teamId; apiResult.Data = teamId;
@ -165,20 +274,38 @@ namespace FactorySystemApi.Controllers
{ {
TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId); TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId);
MaterialTeamworkBll.CreateProductView(teamwork, editMaterialList, user.FID);
//if (editMaterialList.Count() == 0)
//{
// MaterialTeamworkBll.CreateProductView(teamwork, null, user.FID);
//}
//if (editMaterialList.Count() == 0)
//{
// //MaterialTeamworkBll.CreateProductView(teamwork, null, user.FID);
// TFS_Material material = editMaterialList.Find(s => s.FType == "20");//默认取第一个20的，没找到取第一个
// if (material == null) material = editMaterialList.FirstOrDefault();
// db.Updateable<TFS_HalfMaterialFTeamwork>(new { FMaterialHalfIDs = material.FID }).Where(s => s.FID == teamwork.FID).ExecuteCommand();
//}
//else
//{
// //MaterialTeamworkBll.CreateProductView(teamwork, editMaterialList, user.FID);
//}
//开始BOM下载 //开始BOM下载
int dow= DockGetBomData(teamwork.FID, user.FID); int dow= DockGetBomData(teamwork.FID, user.FID);
if (dow > 0) if (dow > 0 || editMaterialList.Count()>0)
{ {
MaterialTeamworkBll.HasMaterialTestCode(teamwork); MaterialTeamworkBll.HasMaterialTestCode(teamwork);
BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项 BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程 BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
} }
else else
{ {
BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString()); BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1); apiResult.Error("未能找到物料");
//BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
//BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
} }
} }
@ -199,7 +326,7 @@ namespace FactorySystemApi.Controllers
catch (Exception ex) catch (Exception ex)
{ {
//失败则把修改的更新回去 //失败则把修改的更新回去
MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(),0,string.Join(",",ids)); MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(),0,0,string.Join(",",ids));
throw; throw;
} }
@ -554,7 +681,7 @@ namespace FactorySystemApi.Controllers
{ {
TFS_Formula formula = BaseBll.GetTempModel<TFS_Formula>(string.Format("FTestCode='{0}'", teamwork.FNewTestCode)); TFS_Formula formula = BaseBll.GetTempModel<TFS_Formula>(string.Format("FTestCode='{0}'", teamwork.FNewTestCode));
OAService oAService = new OAService(); OAService oAService = new OAService();
specifList[0].Code = teamwork.FTestCode; specifList[0].Code = teamwork.FNewTestCode;
specifList[0].Version = formula.FVersionCode; specifList[0].Version = formula.FVersionCode;
RestResult restResult = oAService.GetSpecificationsList(specifList.ToArray()); RestResult restResult = oAService.GetSpecificationsList(specifList.ToArray());
string bomStr = restResult.data == null ? "[]" : restResult.data.ToString(); string bomStr = restResult.data == null ? "[]" : restResult.data.ToString();
@ -597,36 +724,18 @@ namespace FactorySystemApi.Controllers
BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项 BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项
BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程 BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
////协同发起事项
//BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
//BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.成品视图, 2, 1);
//if (teamwork.FPackID == -1)
//{
// BaseBll.CreateTaskData(teamwork.FID, userId, "9");//新增新包材事项
// BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.组装BOM包含新包材, 2, 1);
//}
//else
//{
// BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.组装BOM包含新包材, 3, 2);
//}
////成品视图
//BaseBll.CreateTaskData(teamwork.FID, userId, "3", teamwork.FCreateFactoryID + "," + teamwork.FProdFactoryID);
////补充包材规格
//BaseBll.CreateTaskData(teamwork.FID, userId, "14");
////成品视图物料组复核，有权限的所有
//BaseBll.CreateTaskData(teamwork.FID, userId, "12");
OperateLogBll.Add(teamwork.FID, 2, "BOM下载成功", userId); OperateLogBll.Add(teamwork.FID, 2, "BOM下载成功", userId);
HalfMaterialTeamworkBll.ChangeTeamProcess(teamwork.FID); HalfMaterialTeamworkBll.ChangeTeamProcess(teamwork.FID);
result = 1; result = 1;
} }
} }
else //else
{ //{
OperateLogBll.Add(teamwork.FID, 2, "BOM下载失败，BOM数据为空", userId); // OperateLogBll.Add(teamwork.FID, 2, "BOM下载失败，BOM数据为空", userId);
BaseBll.CreateTaskData2(teamwork.FID, userId, ((int)Constant.HalfMaterialTask.BOM下载).ToString()); // BaseBll.CreateTaskData2(teamwork.FID, userId, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialTask.物料分类, 2, 1); // BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialTask.物料分类, 2, 1);
HalfMaterialTeamworkBll.ChangeTeamProcess(teamwork.FID); // HalfMaterialTeamworkBll.ChangeTeamProcess(teamwork.FID);
} //}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -796,9 +905,10 @@ namespace FactorySystemApi.Controllers
/// 创建Excel文件 /// 创建Excel文件
/// </summary> /// </summary>
private void CreateExeclFile(int intType, string savePath, string selectSql, string whereSql, string joinSql, string teamId, string halfId) private void CreateExeclFile(int intType, string savePath, string selectSql, string whereSql, string joinSql, string teamId, string halfId)
{
try
{ {
List<TFS_ViewFieldInfo> filedList = MaterialTeamworkBll.GetTeamworkViewField(intType); List<TFS_ViewFieldInfo> filedList = MaterialTeamworkBll.GetTeamworkViewField(intType);
List<string> fieldLists = new List<string> { "父项编码", "父项描述", "基本数量" }; List<string> fieldLists = new List<string> { "父项编码", "父项描述", "基本数量" };
foreach (TFS_ViewFieldInfo field in filedList) foreach (TFS_ViewFieldInfo field in filedList)
{ {
@ -807,7 +917,7 @@ namespace FactorySystemApi.Controllers
string str = field.FDefault; string str = field.FDefault;
if (fieldLists.Contains(field.FName)) if (fieldLists.Contains(field.FName))
{ {
str=field.FDefault.Replace("a.FTeamID", "a.FHalfMaterialTeamID"); str = field.FDefault.Replace("a.FTeamID", "a.FHalfMaterialTeamID");
} }
selectSql += string.Format("'{0}' as '{1}'", string.IsNullOrEmpty(field.FDefault) ? "" : str, field.FName); selectSql += string.Format("'{0}' as '{1}'", string.IsNullOrEmpty(field.FDefault) ? "" : str, field.FName);
} }
@ -823,7 +933,7 @@ namespace FactorySystemApi.Controllers
selectSql += ","; selectSql += ",";
} }
selectSql = selectSql.Replace("@FTeamID@", teamId); selectSql = selectSql.Replace("@FTeamID@", teamId);
selectSql = selectSql.Replace("@FMaterialID@", halfId); selectSql = selectSql.Replace("@FMaterialID@", string.IsNullOrWhiteSpace(halfId) ? "-1" : halfId);
DataTable dataList = new DataTable(); DataTable dataList = new DataTable();
if (intType == (int)Constant.TeamViewType.组装BOM视图) if (intType == (int)Constant.TeamViewType.组装BOM视图)
{ {
@ -1072,6 +1182,12 @@ namespace FactorySystemApi.Controllers
} }
NPOIHelper.ExportDTtoExcel(dataList, "Sheet1", savePath); NPOIHelper.ExportDTtoExcel(dataList, "Sheet1", savePath);
} }
catch (Exception ex)
{
throw;
}
}
/// <summary> /// <summary>
/// 梳理父项 /// 梳理父项

15
FactorySystemApi/Controllers/MaterialController.cs
Unescape View File

@ -238,8 +238,21 @@ namespace FactorySystemApi.Controllers
}, apiResult, Request, inParam); }, apiResult, Request, inParam);
} }
/// <summary>
/// 获取物料分类
/// </summary>
/// <param name="inParam"></param>
/// <returns></returns>
[HttpPost]
public ApiResult GetMaterialInfoList()
{
ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() =>
{
apiResult.Data = MaterialBll.GetMaterialInfoList();
}, apiResult, Request, null);
}

10
FactorySystemApi/Controllers/MaterialTypeController.cs
Unescape View File

@ -39,11 +39,21 @@ namespace FactorySystemApi.Controllers
{ {
ApiResult apiResult = new ApiResult(); ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() => return ExceptionHelper.TryReturnException(() =>
{
if (inParam.ContainsKey("FDataID"))
{ {
int dataId = int.Parse(inParam["FDataID"].ToString()); int dataId = int.Parse(inParam["FDataID"].ToString());
int dataType = int.Parse(inParam["FType"].ToString()); int dataType = int.Parse(inParam["FType"].ToString());
string sqlWhere = string.Format("FDataID={0} and FType={1}", dataId, dataType); string sqlWhere = string.Format("FDataID={0} and FType={1}", dataId, dataType);
apiResult.Data = BaseBll.GetTempModel<TFS_MaterialInfo>(sqlWhere); apiResult.Data = BaseBll.GetTempModel<TFS_MaterialInfo>(sqlWhere);
}
else if (inParam.ContainsKey("FType"))
{
int dataType = int.Parse(inParam["FType"].ToString());
string sqlWhere = string.Format(" FType={0}", dataType);
apiResult.Data = BaseBll.GetTempModel<TFS_MaterialInfo>(sqlWhere);
}
}, apiResult, Request, inParam); }, apiResult, Request, inParam);
} }

21
FactorySystemApi/Controllers/ViewController.cs
Unescape View File

@ -287,7 +287,7 @@ namespace FactorySystemApi.Controllers
halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料分类); halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料分类);
BaseBll.CreateTaskData2(teamId, user.FID, "2"); BaseBll.CreateTaskData2(teamId, user.FID, "2");
BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料分类, 3, 2); BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料分类, 2, 2);
BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 1); BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 1);
} }
@ -321,9 +321,26 @@ namespace FactorySystemApi.Controllers
// 创建物料视图事项 // 创建物料视图事项
TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId); TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId);
BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 2); //BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 2);
HalfMaterialTaskBll halfMaterialTaskBll= new HalfMaterialTaskBll(); HalfMaterialTaskBll halfMaterialTaskBll= new HalfMaterialTaskBll();
BaseBll.CreateTaskData2(teamwork.FID, user.FID, "3"); //新增物料分类事项
if (inParam["FType"].ToString() == "2")
{
halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料编辑); halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料编辑);
BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 2);
}
else if (inParam["FType"].ToString() == "3")
{
BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料确认, 2, 2);
halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料确认);
HalfMaterialTeamworkBll halfMaterialTeamworkBll = new HalfMaterialTeamworkBll();
halfMaterialTeamworkBll.ExecSql(string.Format("update TFS_HalfMaterialFTeamwork set FState=2 Where FID={0}", teamId));
}
} }
} }
}, apiResult, Request); }, apiResult, Request);

6
FactorySystemBll/HalfMaterialTaskBll.cs
Unescape View File

@ -20,8 +20,8 @@ namespace FactorySystemBll
{ {
totalNumber = 0; totalNumber = 0;
var db = AppSettingsHelper.GetSqlSugar(); var db = AppSettingsHelper.GetSqlSugar();
return db.Queryable<TFS_HalfMaterialTask, TFS_HalfMaterialFTeamwork, TBasicCode,TFS_Formula>((a, b, c,d) => new JoinQueryInfos(JoinType.Inner, a.FTeamID == b.FID, return db.Queryable<TFS_HalfMaterialTask, TFS_HalfMaterialFTeamwork, TBasicCode,TUser>((a, b, c,d) => new JoinQueryInfos(JoinType.Inner, a.FTeamID == b.FID,
JoinType.Inner, c.FType == 46 && a.FType == int.Parse(c.FValue), JoinType.Left, b.FNewTestCode == d.FTestCode)) JoinType.Inner, c.FType == 46 && a.FType == int.Parse(c.FValue), JoinType.Left,a.FEditUser==d.FID))
// 事项状态 // 事项状态
.WhereIF(tq.FState > 0 && tq.FState != 99, (a, b) => a.FState == tq.FState) .WhereIF(tq.FState > 0 && tq.FState != 99, (a, b) => a.FState == tq.FState)
// 事项状态 // 事项状态
@ -37,7 +37,7 @@ namespace FactorySystemBll
.WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ',')) .WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ','))
// 协同 // 协同
.WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc) .WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc)
.Select<object>("a.*,b.FNewTestCode,d.FVersionCode,d.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType") .Select<object>("a.*,b.FNewTestCode,b.FVersionCode,a.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,d.FName AS 'FUserName1'")
.ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber); .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
} }

180
FactorySystemBll/HalfMaterialTeamworkBll.cs
Unescape View File

@ -107,63 +107,63 @@ namespace FactorySystemBll
List<string> paramName = new List<string>() { "FDeleted!=1" }; List<string> paramName = new List<string>() { "FDeleted!=1" };
List<SugarParameter> paramVal = new List<SugarParameter>(); List<SugarParameter> paramVal = new List<SugarParameter>();
//if (inParam != null && inParam.Count > 0) if (inParam != null && inParam.Count > 0)
//{ {
// foreach (var item in inParam) foreach (var item in inParam)
// { {
// if (item.Key == "FPageIndex" || item.Key == "PageIndex") if (item.Key == "FPageIndex" || item.Key == "PageIndex")
// { {
// int.TryParse(item.Value.ToString(), out pageIndex); int.TryParse(item.Value.ToString(), out pageIndex);
// } }
// else if (item.Key == "FPageSize" || item.Key == "PageSize") else if (item.Key == "FPageSize" || item.Key == "PageSize")
// { {
// int.TryParse(item.Value.ToString(), out pageSize); int.TryParse(item.Value.ToString(), out pageSize);
// } }
// else if (item.Key == "FAddDate" || item.Key == "AddDate") else if (item.Key == "FAddDate" || item.Key == "AddDate")
// { {
// paramName.Add("convert(varchar(10),FAddDate,120)=@FAddDate"); paramName.Add("convert(varchar(10),FAddDate,120)=@FAddDate");
// paramVal.Add(new SugarParameter("@FAddDate", item.Value.ToString())); paramVal.Add(new SugarParameter("@FAddDate", item.Value.ToString()));
// } }
// else if (item.Key == "FDataType" || item.Key == "DataType") else if (item.Key == "FDataType" || item.Key == "DataType")
// { {
// if (item.Value.ToString() == "1")//我发起的 if (item.Value.ToString() == "1")//我发起的
// { {
// paramName.Add("FAddUser=@FAddUser"); paramName.Add("FAddUser=@FAddUser");
// paramVal.Add(new SugarParameter("@FAddUser", userId)); paramVal.Add(new SugarParameter("@FAddUser", userId));
// } }
// else if (item.Value.ToString() == "2")//我参与的 else if (item.Value.ToString() == "2")//我参与的
// { {
// paramName.Add(string.Format(@"FID in(select distinct FTeamID from TFS_FTeamProcess where ','+FChargeID+',' like '%,{0},%' paramName.Add(string.Format(@"FID in(select distinct FTeamID from TFS_FTeamProcess where ','+FChargeID+',' like '%,{0},%'
// union select distinct FTeamID from TFS_Task where ',' + FUserID + ',' like '%,{0},%')", userId)); union select distinct FTeamID from TFS_Task where ',' + FUserID + ',' like '%,{0},%')", userId));
// } }
// } }
// else if (item.Key == "FProgress" || item.Key == "FProgress") else if (item.Key == "FProgress" || item.Key == "FProgress")
// { {
// string pVal = item.Value.ToString(); string pVal = item.Value.ToString();
// if (!string.IsNullOrEmpty(pVal)) if (!string.IsNullOrEmpty(pVal))
// { {
// if (pVal == "100" || pVal == "100%") if (pVal == "100" || pVal == "100%")
// { {
// paramName.Add("FProgress='100'"); paramName.Add("FProgress='100'");
// } }
// else else
// { {
// paramName.Add("FProgress!='100'"); paramName.Add("FProgress!='100'");
// } }
// } }
// } }
// else else
// { {
// //检索，全转成字符串 //检索，全转成字符串
// paramName.Add("','+cast(" + item.Key + " as varchar)+',' like '%'+@" + item.Key + "+'%'"); paramName.Add("','+cast(" + item.Key + " as varchar)+',' like '%'+@" + item.Key + "+'%'");
// paramVal.Add(new SugarParameter("@" + item.Key, item.Value.ToString())); paramVal.Add(new SugarParameter("@" + item.Key, item.Value.ToString()));
// } }
// } }
//} }
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
string searchKey = string.Format(@"a.FID AS 'FID',a.FTestCode AS 'FTestCode',b.FVersionCode AS 'FVersionCode',a.FNewTestCode AS 'NewFTestCode',c.FVersionCode AS 'NewFVersionCode',c.FType,a.FAddDate,d.FName,a.FDeleted AS 'FDeleted',b.FDesc,c.FDesc AS 'NewFDesc',a.FMaterialHalfIDs"); string searchKey = string.Format(@"a.*,d.FName");
var temp =db.Queryable<TFS_HalfMaterialFTeamwork, TFS_Formula, TFS_Formula, TUser>((a, b, c, d) => new JoinQueryInfos(JoinType.Left, a.FTestCode == b.FTestCode, JoinType.Left, a.FNewTestCode == c.FTestCode, JoinType.Left, a.FAddUser == d.FID)).Select<object>(searchKey); var temp =db.Queryable<TFS_HalfMaterialFTeamwork, TUser>((a,d) => new JoinQueryInfos(JoinType.Left, a.FAddUser == d.FID)).Select<object>(searchKey);
List<object> result = db.Queryable(temp).Where(string.Join(" and ", paramName), paramVal) List<object> result = db.Queryable(temp).Where(string.Join(" and ", paramName), paramVal)
.OrderBy("FID desc").ToPageList(pageIndex, pageSize, ref totalCount).ToList<object>(); .OrderBy("FID desc").ToPageList(pageIndex, pageSize, ref totalCount).ToList<object>();
@ -178,7 +178,7 @@ namespace FactorySystemBll
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
try try
{ {
List<TBasicCode> typeList = db.Queryable<TBasicCode>().Where(s => s.FType == (int)Constant.BasicCode.流程类型 && s.FState == 1).ToList(); List<TBasicCode> typeList = db.Queryable<TBasicCode>().Where(s => s.FType == (int)Constant.BasicCode.变更试验号流程 && s.FState == 1).ToList();
List<TFS_HalfMaterialFTeamProcess> taskList = new List<TFS_HalfMaterialFTeamProcess>(); List<TFS_HalfMaterialFTeamProcess> taskList = new List<TFS_HalfMaterialFTeamProcess>();
foreach (var item in typeList) foreach (var item in typeList)
{ {
@ -382,6 +382,7 @@ namespace FactorySystemBll
mItem.FFactoryID = factory.FID; mItem.FFactoryID = factory.FID;
mItem.FFactoryCode = factory.FCode; mItem.FFactoryCode = factory.FCode;
} }
mItem.FTestCode = teamInfo.FTestCode;
mItem.FID = db.Insertable(mItem).IgnoreColumns(true).ExecuteReturnIdentity(); mItem.FID = db.Insertable(mItem).IgnoreColumns(true).ExecuteReturnIdentity();
//if (vItem.FLevel > 1) formulaIds += "," + mItem.FID; //if (vItem.FLevel > 1) formulaIds += "," + mItem.FID;
} }
@ -446,6 +447,7 @@ namespace FactorySystemBll
mItem.FOldID = oldId; mItem.FOldID = oldId;
mItem.FLevelID = vItem.FLevel; mItem.FLevelID = vItem.FLevel;
mItem.FParentID = oldParent; mItem.FParentID = oldParent;
mItem.FTestCode = teamInfo.FNewTestCode;
if (mItem.FLevelID >= 1) formulaList.Add(mItem); if (mItem.FLevelID >= 1) formulaList.Add(mItem);
} }
@ -460,52 +462,6 @@ namespace FactorySystemBll
formulaIds += first.FID + "," + fids; formulaIds += first.FID + "," + fids;
} }
} }
//if (hasNewView.Count() > 0)
//{
// hasNewView.OrderBy(s => s.Key);
// string facoryIds = ""; bool hasOther = false;
// foreach (var item in hasNewView)
// {
// //创建视图事项
// string factorys = item.Value.Trim(',');
// BaseBll.CreateTaskData(teamInfo.FID, userId, (item.Key + 2).ToString(), factorys);
// facoryIds += factorys;
// if (item.Key != (int)Constant.ViewType.原料视图) hasOther = true;
// }
// if (hasNewView.ContainsKey((int)Constant.ViewType.原料视图))
// {
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新原料视图, "F2", 1);
// }
// else
// {
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新原料视图, "F4", 2);
// }
// if (hasOther)
// {
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新半成品中间品香基, "F2", 1);
// }
// else
// {
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新半成品中间品香基, "F4", 2);
// }
// if (hasNewView.ContainsKey((int)Constant.ViewType.中间品视图) || hasNewView.ContainsKey((int)Constant.ViewType.香基视图)
// || hasNewView.ContainsKey((int)Constant.ViewType.半成品视图))
// {
// proSql += string.Format("update TFS_FTeamwork set FViewType=FViewType+',3,4' where FID={0};", teamInfo.FID);
// BaseBll.CreateTaskData(teamId, userId, "8");
// }
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.配方视图, "F2", 1);
//}
//else
//{
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.配方视图, "F2", 2);
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新半成品中间品香基, "F4", 2);
// proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.新原料视图, "F4", 2);
//}
////下面两个要根据包材判断，先改成进行中，hasNewView == 0 && 包材是旧的，完成
//int pVersion = (hasNewView.Count == 0 && teamInfo.FPackID < 1) ? 2 : 1;
//proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.生产工艺路线, "F2", pVersion);
//proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.生成版本, "F2", pVersion);
string updateSql = ""; string updateSql = "";
@ -675,14 +631,14 @@ namespace FactorySystemBll
TFS_ViewMaterial mainView = new TFS_ViewMaterial() TFS_ViewMaterial mainView = new TFS_ViewMaterial()
{ {
FMaterialID = mainMater.FID, FMaterialID = mainMater.FID,
FTeamID = teamInfo.FID, FHalfMaterialTeamID = teamInfo.FID,
FFactoryID = teamInfo.FCreateFactoryID, FFactoryID = teamInfo.FCreateFactoryID,
FFactoryCode = teamInfo.FCreateFactoryCode, FFactoryCode = teamInfo.FCreateFactoryCode,
FViewType = (int)Constant.ViewType.物料分类视图, FViewType = (int)Constant.ViewType.物料分类视图,
FLevel = 1, FLevel = 1,
FEditUser = userId, FEditUser = userId,
FBaseMaterialCode = teamInfo.FMdmCode, FBaseMaterialCode = teamInfo.FMdmCode,
FBaseTestCode = teamInfo.FTestCode, FBaseTestCode = teamInfo.FNewTestCode,
FBaseBasicMeter = teamInfo.FWeightUnit, FBaseBasicMeter = teamInfo.FWeightUnit,
FBaseMaterialDesc = teamInfo.FSaleCode, FBaseMaterialDesc = teamInfo.FSaleCode,
FBaseMaterialGroup = teamInfo.FMaterialGroup, FBaseMaterialGroup = teamInfo.FMaterialGroup,
@ -702,9 +658,9 @@ namespace FactorySystemBll
if (teamInfo.FProdFactoryID != teamInfo.FCreateFactoryID) if (teamInfo.FProdFactoryID != teamInfo.FCreateFactoryID)
{ {
mainMater.FFactoryID = teamInfo.FProdFactoryID; //mainMater.FFactoryID = teamInfo.FProdFactoryID;
mainMater.FFactoryCode = teamInfo.FProdFactoryCode; //mainMater.FFactoryCode = teamInfo.FProdFactoryCode;
mainMater.FID = db.Insertable(mainMater).IgnoreColumns(true).ExecuteReturnIdentity(); //mainMater.FID = db.Insertable(mainMater).IgnoreColumns(true).ExecuteReturnIdentity();
mainView.FFactoryID = teamInfo.FProdFactoryID; mainView.FFactoryID = teamInfo.FProdFactoryID;
mainView.FFactoryCode = teamInfo.FProdFactoryCode; mainView.FFactoryCode = teamInfo.FProdFactoryCode;
@ -719,8 +675,8 @@ namespace FactorySystemBll
//修改流程状态（协同发起完成，成品视图进行中） //修改流程状态（协同发起完成，成品视图进行中）
//proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.协同发起, "F2", 1); //proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.协同发起, "F2", 1);
//proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.成品视图, "F2", 1); //proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.成品视图, "F2", 1);
proSql += BaseBll.GetTaskSql2(-1, 2, teamInfo.FID, (int)Constant.TaskType.配方选择, 2); //proSql += BaseBll.GetTaskSql2(-1, 2, teamInfo.FID, (int)Constant.TaskType.配方选择, 2);
proSql = proSql.Trim(';'); //proSql = proSql.Trim(';');
int result = db.Ado.ExecuteCommand(proSql); int result = db.Ado.ExecuteCommand(proSql);
db.CommitTran(); db.CommitTran();
} }
@ -780,7 +736,7 @@ namespace FactorySystemBll
/// <param name="testCode">原配方</param> /// <param name="testCode">原配方</param>
/// <param name="testCode2">新配方</param> /// <param name="testCode2">新配方</param>
/// <returns></returns> /// <returns></returns>
public List<TFS_Material> UpdateFormula(string testCode, string testCode2,int temId, string idList="") public List<TFS_Material> UpdateFormula(string testCode, string testCode2,int temId,int factoryID, string idList="")
{ {
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
@ -798,8 +754,10 @@ namespace FactorySystemBll
{ {
sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1})", testCode, idList); sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1})", testCode, idList);
} }
if (materialList.Count() > 0)
{
db.Ado.ExecuteCommand(sql); db.Ado.ExecuteCommand(sql);
}
return materialList; return materialList;
} }

7
FactorySystemBll/MaterialBll.cs
Unescape View File

@ -1341,5 +1341,12 @@ namespace FactorySystemBll
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
return db.Insertable(material).IgnoreColumns(true).ExecuteReturnIdentity(); return db.Insertable(material).IgnoreColumns(true).ExecuteReturnIdentity();
} }
public List<TFS_MaterialInfo> GetMaterialInfoList()
{
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
return db.Queryable<TFS_MaterialInfo>().Where(s => s.FType == 1).ToList();
}
} }
} }

6
FactorySystemBll/TeamworkBll.cs
Unescape View File

@ -631,9 +631,9 @@ namespace FactorySystemBll
if (teamInfo.FProdFactoryID != teamInfo.FCreateFactoryID) if (teamInfo.FProdFactoryID != teamInfo.FCreateFactoryID)
{ {
mainMater.FFactoryID = teamInfo.FProdFactoryID; //mainMater.FFactoryID = teamInfo.FProdFactoryID;
mainMater.FFactoryCode = teamInfo.FProdFactoryCode; //mainMater.FFactoryCode = teamInfo.FProdFactoryCode;
mainMater.FID = db.Insertable(mainMater).IgnoreColumns(true).ExecuteReturnIdentity(); //mainMater.FID = db.Insertable(mainMater).IgnoreColumns(true).ExecuteReturnIdentity();
mainView.FFactoryID = teamInfo.FProdFactoryID; mainView.FFactoryID = teamInfo.FProdFactoryID;
mainView.FFactoryCode = teamInfo.FProdFactoryCode; mainView.FFactoryCode = teamInfo.FProdFactoryCode;

2
FactorySystemBll/ViewBll.cs
Unescape View File

@ -235,7 +235,7 @@ namespace FactorySystemBll
FStorageConditions = Minfo[0].FStorageConditions; FStorageConditions = Minfo[0].FStorageConditions;
} }
TFS_FTeamwork teamWork = db.Queryable<TFS_FTeamwork>().Where(s => s.FID == teamId).First(); TFS_HalfMaterialFTeamwork teamWork = db.Queryable<TFS_HalfMaterialFTeamwork>().Where(s => s.FID == teamId).First();
TFS_PackageMain packAge = db.Queryable<TFS_PackageMain>().Where(s => s.FCode == teamWork.FPackCode).First(); TFS_PackageMain packAge = db.Queryable<TFS_PackageMain>().Where(s => s.FCode == teamWork.FPackCode).First();
if (packAge != null) if (packAge != null)

23
FactorySystemModel/EnumModel/Constant.cs
Unescape View File

@ -33,7 +33,7 @@ namespace FactorySystemModel.EnumModel
视图权限 = 3, 视图权限 = 3,
物料视图编辑 = 4, 物料视图编辑 = 4,
物料基础编辑 = 5, 物料基础编辑 = 5,
视图编辑=6 视图编辑 = 6
} }
/// <summary> /// <summary>
@ -56,8 +56,8 @@ namespace FactorySystemModel.EnumModel
工厂状态 = 42, 工厂状态 = 42,
协同视图导出 = 43, 协同视图导出 = 43,
物料基础编辑 = 44, 物料基础编辑 = 44,
变更试验号流程=45, 变更试验号流程 = 45,
变更试验号事项=46 变更试验号事项 = 46
} }
@ -105,8 +105,8 @@ namespace FactorySystemModel.EnumModel
流程确认完成 = 13, 流程确认完成 = 13,
补充包材规格 = 14, 补充包材规格 = 14,
物料分类 = 15, 物料分类 = 15,
替代料确认=16, 替代料确认 = 16,
物料编辑=17 物料编辑 = 17
} }
/// <summary> /// <summary>
@ -114,7 +114,7 @@ namespace FactorySystemModel.EnumModel
/// </summary> /// </summary>
public enum ProcessType public enum ProcessType
{ {
物料分类=0, 物料分类 = 0,
协同发起 = 1, 协同发起 = 1,
成品视图 = 2, 成品视图 = 2,
新半成品中间品香基 = 3, 新半成品中间品香基 = 3,
@ -124,8 +124,8 @@ namespace FactorySystemModel.EnumModel
生成版本 = 7, 生成版本 = 7,
组装BOM包含新包材 = 8, 组装BOM包含新包材 = 8,
流程完成 = 9, 流程完成 = 9,
替代品确认=10, 替代品确认 = 10,
物料编辑=11 物料编辑 = 11
} }
/// <summary> /// <summary>
@ -179,7 +179,8 @@ namespace FactorySystemModel.EnumModel
{ {
BOM下载 = 0, BOM下载 = 0,
物料分类 = 1, 物料分类 = 1,
物料编辑 = 2 物料编辑 = 2,
物料确认 = 3,
} }
//code=46 //code=46
@ -188,8 +189,8 @@ namespace FactorySystemModel.EnumModel
BOM下载 = 0, BOM下载 = 0,
物料分类 = 1, 物料分类 = 1,
物料编辑 = 2, 物料编辑 = 2,
流程完成 = 3, 物料确认 = 3,
流程完成 = 4,
} }
} }
} }

11
FactorySystemModel/SqlSugarModel/TFS_HalfMaterialFTeamwork.cs
Unescape View File

@ -72,6 +72,16 @@ namespace FactorySystemModel.SqlSugarModel
/// </summary> /// </summary>
public string FVersionCode { get; set; } public string FVersionCode { get; set; }
/// <summary>
/// Desc:新版本号
/// Default:
/// Nullable:False
/// </summary>
public string FNewVersionCode { get; set; }
public string FDesc { get; set; }
public string FNewDesc { get; set; }
/// <summary> /// <summary>
/// Desc:MDN编码 /// Desc:MDN编码
/// Default: /// Default:
@ -251,5 +261,6 @@ namespace FactorySystemModel.SqlSugarModel
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string FBomFormula { get; set; } public string FBomFormula { get; set; }
} }
} }

Write Preview
Loading…
Cancel
Save