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 3 years ago
parent b97556f8af 7dca50e9ff
commit 5d6c57a606
12 changed files with 1581 additions and 73 deletions
Show Stats Download Patch File Download Diff File

1149
FactorySystemApi/Controllers/TeamworkController - 副本.cs
View File

File diff suppressed because it is too large Load Diff

95
FactorySystemApi/Controllers/TeamworkController.cs
Unescape View File

@ -148,22 +148,31 @@ namespace FactorySystemApi.Controllers
else {
TeamworkBll.CreateProductView(teamwork, materialList, user.FID);
TeamworkBll.HasMaterialTestCode(teamwork);
//补充包材规格
BaseBll.CreateTaskData(teamId, user.FID, "14");
//成品视图
BaseBll.CreateTaskData(teamwork.FID, user.FID, "3", teamwork.FCreateFactoryID + "," + teamwork.FProdFactoryID);
//成品视图物料组复核，有权限的所有
BaseBll.CreateTaskData(teamwork.FID, user.FID, "12");
teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
if (teamwork.FPackID == -1) {
//新增新包材事项
BaseBll.CreateTaskData(teamId, user.FID, "9");
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 2, 1);
} else {
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 3, 2);
}
BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.成品视图, 2, 1);
/**
* 20230414 需求变更
* 在创建各类事项前，先创建物料分类事项
* 此处创建各类事项流程中断，转移至物料分类事项提交后进行
* **/
BaseBll.CreateTaskData(teamwork.FID, user.FID, "15"); //新增物料分类事项
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.物料分类, 2, 1); // 更新物料分类流程
////补充包材规格
//BaseBll.CreateTaskData(teamId, user.FID, "14");
////成品视图
//BaseBll.CreateTaskData(teamwork.FID, user.FID, "3", teamwork.FCreateFactoryID + "," + teamwork.FProdFactoryID);
////成品视图物料组复核，有权限的所有
//BaseBll.CreateTaskData(teamwork.FID, user.FID, "12");
//teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
//if (teamwork.FPackID == -1) {
// //新增新包材事项
// BaseBll.CreateTaskData(teamId, user.FID, "9");
// BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 2, 1);
//} else {
// BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 3, 2);
//}
//BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
//BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.成品视图, 2, 1);
}
}
else
@ -219,18 +228,26 @@ namespace FactorySystemApi.Controllers
TeamworkBll.CreateProductView(teamwork, materialList, user.FID);
TeamworkBll.HasMaterialTestCode(teamwork);
if (teamwork.FPackID == -1)
{
BaseBll.CreateTaskData(teamId, user.FID, "9");//新增新包材事项
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 2, 1);
}
else
{
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 3, 2);
}
BaseBll.CreateTaskData(teamId, user.FID, "14");//补充包材规格
BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.成品视图, 2, 1);
/**
* 20230414 需求变更
* 在创建各类事项前，先创建物料分类事项
* 此处创建各类事项流程中断，转移至物料分类事项提交后进行
* **/
BaseBll.CreateTaskData(teamwork.FID, user.FID, "15"); //新增物料分类事项
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.物料分类, 2, 1); // 更新物料分类流程
//if (teamwork.FPackID == -1)
//{
// BaseBll.CreateTaskData(teamId, user.FID, "9");//新增新包材事项
// BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 2, 1);
//}
//else
//{
// BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 3, 2);
//}
//BaseBll.CreateTaskData(teamId, user.FID, "14");//补充包材规格
//BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
//BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.成品视图, 2, 1);
}
TeamworkBll.ChangeTeamProcess(teamId);
}
@ -533,29 +550,33 @@ namespace FactorySystemApi.Controllers
{ "FBomJson", bomStr }
};
BaseBll.UpdateDataModel(upParam, "TFS_FTeamwork");
//协同发起事项
/**
* 20230414 需求变更
* 在创建各类事项前，先创建物料分类事项
* 此处创建各类事项流程中断，转移至物料分类事项提交后进行
* **/
BaseBll.CreateTaskData(teamwork.FID, userId, "15"); //新增物料分类事项
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.物料分类, 2, 1); // 更新物料分类流程
////协同发起事项
//BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.物料分类, 2, 1);
//改
//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);
// 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");
BaseBll.CreateTaskData(teamwork.FID, userId, "15");//新增新包材事项
OperateLogBll.Add(teamwork.FID, 2, "BOM下载成功", userId);
TeamworkBll.ChangeTeamProcess(teamwork.FID);
result = 1;

57
FactorySystemApi/Controllers/UserController.cs
Unescape View File

@ -279,5 +279,62 @@ namespace FactorySystemApi.Controllers
apiResult.Data = UserBll.GetFPowerList();
}, apiResult, Request);
}
/// <summary>
/// 获取冻结列
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetFreezingColumns()
{
ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() =>
{
ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo;
apiResult.Data = UserBll.GetFreezingColumns(user.FID);
}, apiResult, Request);
}
/// <summary>
/// 修改删除冻结列
/// </summary>
/// <param name="freezingColumns"></param>
/// <returns></returns>
[HttpPost]
public ApiResult EditFreezingColumns(string freezingColumns)
{
ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() =>
{
ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo;
TFS_FreezingColumns fc = (TFS_FreezingColumns)UserBll.GetFreezingColumns(user.FID);
if (fc == null)
{
fc = new TFS_FreezingColumns();
fc.FUserID = user.FID;
fc.FFreezingColumns = freezingColumns;
fc.FAddDate = DateTime.Now;
fc.FAddUser = user.FID;
List<TFS_FreezingColumns> fcl = new List<TFS_FreezingColumns>
{
fc
};
apiResult.Data = UserBll.CreateFreezingColumns(user.FID, fcl);
}
else
{
fc.FFreezingColumns = freezingColumns;
fc.FEditUser = user.FID;
fc.FEditDate = DateTime.Now;
apiResult.Data = UserBll.UpdateFreezingColumns(fc);
}
}, apiResult, Request);
}
}
}

55
FactorySystemApi/Controllers/ViewController.cs
Unescape View File

@ -7,6 +7,8 @@ using FactorySystemModel.ResponseModel;
using FactorySystemModel.SqlSugarModel;
using Microsoft.Ajax.Utilities;
using Newtonsoft.Json;
using FactorySystemModel.EnumModel;
using Aspose.Cells;
namespace FactorySystemApi.Controllers
{
@ -116,7 +118,58 @@ namespace FactorySystemApi.Controllers
List<Dictionary<string, object>> infoList = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(JsonConvert.SerializeObject(infoObj));
int teamId = int.Parse(inParam["FTeamID"].ToString());
int viewType = int.Parse(inParam["FViewType"].ToString());
_viewBll.UpdateBatchById2(viewList, materialList, infoList, teamId, viewType, user.FID);
apiResult.Data = _viewBll.UpdateBatchById2(viewList, materialList, infoList, teamId, viewType, user.FID);
if (viewType == 10)
{
// 创建物料视图事项
TFS_FTeamwork teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
List<Dictionary<string, object>> vml = _viewBll.GetListByTeamId(teamId, viewType, user.FID, out List<int> materialId, out string FGuaranteePeriod, out string FStorageConditions, true);
Dictionary<int, string> hasNewView = new Dictionary<int, string>();
if (vml != null)
{
foreach(Dictionary<string, object> row in vml)
{
int materialType = (int)(long)row["FViewType"];
string factoryId = row["FFactoryID"].ToString();
if (materialType == 2 || materialType == 3 || materialType == 4 || materialType == 5)
{
if (hasNewView.ContainsKey(materialType))
{
hasNewView[materialType] = hasNewView[materialType] + factoryId + ",";
}
else
{
hasNewView.Add(materialType, factoryId + ",");
}
}
}
TeamworkBll TeamworkBll = new TeamworkBll();
TeamworkBll.CreateMaterialTask(hasNewView, teamwork, user.FID);
}
//补充包材规格
BaseBll.CreateTaskData(teamId, user.FID, "14");
//成品视图
BaseBll.CreateTaskData(teamwork.FID, user.FID, "3", teamwork.FCreateFactoryID + "," + teamwork.FProdFactoryID);
//成品视图物料组复核，有权限的所有
BaseBll.CreateTaskData(teamwork.FID, user.FID, "12");
teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
if (teamwork.FPackID == -1)
{
//新增新包材事项
BaseBll.CreateTaskData(teamId, user.FID, "9");
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 2, 1);
}
else
{
BaseBll.UpdateTeamProcess(teamId, (int)Constant.ProcessType.组装BOM包含新包材, 3, 2);
}
BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.成品视图, 2, 1);
}
}
}, apiResult, Request);
}

2
FactorySystemBll/TaskBll.cs
Unescape View File

@ -37,7 +37,7 @@ namespace FactorySystemBll
.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)
.Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,1)as int)as FViewType")
.Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType")
.ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
}

98
FactorySystemBll/TeamworkBll.cs
Unescape View File

@ -7,6 +7,7 @@ using SqlSugar;
using System;
using System.Collections.Generic;
using System.Data;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
@ -389,6 +390,83 @@ namespace FactorySystemBll
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 = "";
formulaIds = formulaIds.Replace(",,", ",").Replace(",,", ",").Replace(",,", ",").Trim(',');
if (!string.IsNullOrEmpty(formulaIds))
{
updateSql += string.Format("FMaterialFormulaIDs='{0}',FViewType=FViewType+',2',", formulaIds);
updateSql += string.Format("FBomFormula='{0}',", JsonConvert.SerializeObject(bfList));
}
if (!string.IsNullOrEmpty(halfIds)) updateSql += string.Format("FMaterialHalfIDs='{0}',", halfIds);
if (!string.IsNullOrEmpty(updateSql)) proSql += string.Format("update TFS_FTeamwork set {1} where FID={0};", teamInfo.FID, updateSql.Trim(','));
proSql += BaseBll.GetTaskSql(-1, 2, teamId, (int)Constant.TaskType.BOM下载, 2);
db.Ado.ExecuteCommand(proSql.Trim(';'));
db.CommitTran();
}
catch (Exception ex)
{
db.RollbackTran();
return false;
}
return true;
}
public bool CreateMaterialTask(Dictionary<int, string> hasNewView, TFS_FTeamwork teamInfo, int userId)
{
string proSql = "";
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
db.BeginTran();
try
{
if (hasNewView.Count() > 0)
{
hasNewView.OrderBy(s => s.Key);
@ -421,7 +499,7 @@ namespace FactorySystemBll
|| 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");
BaseBll.CreateTaskData(teamInfo.FID, userId, "8");
}
proSql += BaseBll.GetProcessSql(teamInfo.FID, (int)Constant.ProcessType.配方视图, "F2", 1);
}
@ -435,27 +513,15 @@ namespace FactorySystemBll
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 = "";
formulaIds = formulaIds.Replace(",,", ",").Replace(",,", ",").Replace(",,", ",").Trim(',');
if (!string.IsNullOrEmpty(formulaIds))
{
updateSql += string.Format("FMaterialFormulaIDs='{0}',FViewType=FViewType+',2',", formulaIds);
updateSql += string.Format("FBomFormula='{0}',", JsonConvert.SerializeObject(bfList));
}
if (!string.IsNullOrEmpty(halfIds)) updateSql += string.Format("FMaterialHalfIDs='{0}',", halfIds);
if (!string.IsNullOrEmpty(updateSql)) proSql += string.Format("update TFS_FTeamwork set {1} where FID={0};", teamInfo.FID, updateSql.Trim(','));
proSql += BaseBll.GetTaskSql(-1, 2, teamId, (int)Constant.TaskType.BOM下载, 2);
db.Ado.ExecuteCommand(proSql.Trim(';'));
db.CommitTran();
}
catch (Exception ex)
{
db.RollbackTran();
return false;
}
return true;
}
private List<BomFormulaDto> GetBomFormulaChild(TFS_Material first, List<TFS_Material> formulaList, out string fids)
@ -542,7 +608,7 @@ namespace FactorySystemBll
FTeamID = teamInfo.FID,
FFactoryID = teamInfo.FCreateFactoryID,
FFactoryCode = teamInfo.FCreateFactoryCode,
FViewType = (int)Constant.ViewType.成品视图,
FViewType = (int)Constant.ViewType.物料分类视图,
FLevel = 1,
FEditUser = userId,
FBaseMaterialCode = teamInfo.FMdmCode,

41
FactorySystemBll/UserBll.cs
Unescape View File

@ -394,5 +394,46 @@ namespace FactorySystemBll
return new List<TRole_Right>();
}
#endregion
/// <summary>
/// 获取冻结列
/// </summary>
public object GetFreezingColumns(int userId)
{
TFS_FreezingColumns tc = null;
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
List<TFS_FreezingColumns> tcl = db.Queryable<TFS_FreezingColumns>().Where(fc => fc.FDeleted != 1 && fc.FUserID == userId).ToList();
if (tcl != null && tcl.Count > 0)
{
tc = tcl[0];
}
return tc;
}
public int CreateFreezingColumns(int userId, List<TFS_FreezingColumns> list)
{
int result = 0;
if (list.Count() > 0)
{
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
db.Deleteable<TFS_FreezingColumns>().Where(s => s.FUserID == userId).ExecuteCommand();
result = db.Insertable(list).ExecuteCommand();
}
return result;
}
public int UpdateFreezingColumns(TFS_FreezingColumns fc)
{
int result = 0;
SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
result = db.Updateable(fc).IgnoreColumns(true).ExecuteCommand();
return result;
}
}
}

52
FactorySystemBll/ViewBll.cs
Unescape View File

@ -23,7 +23,30 @@ namespace FactorySystemBll
FStorageConditions = "";
if (byFactory == true) currUser = BaseBll.GetTempModel<TUser>(currUserId, "FFactoryID");
var db = AppSettingsHelper.GetSqlSugar();
List<Dictionary<string, object>> viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
/**
* 20230414 需求变更
* 新增物料分类视图获取逻辑
* 物料分类的viewType=10，此时，取所有下载的bomList中的视图，a.FViewType in (2,3,4,5)
* 分别对应半成品视图、中间品视图、香基视图、原料视图
* 此处的viewType来自TBasicCode中FType=33时，的FRemark字段
* **/
List<Dictionary<string, object>> viewList = new List<Dictionary<string, object>>();
if (viewType == 10)
{
viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
.Where((a, b) => a.FTeamID == teamId)
.WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
.WhereIF(viewType > 0, (a, b) => a.FViewType == 2 || a.FViewType == 3 || a.FViewType == 4 || a.FViewType == 5)
.Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
"b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +
"b.FQualityTest1,b.FQualityTest2").ToDictionaryList();
}
else
{
viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
.Where((a, b) => a.FTeamID == teamId)
.WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
@ -31,6 +54,8 @@ namespace FactorySystemBll
.Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
"b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +
"b.FQualityTest1,b.FQualityTest2").ToDictionaryList();
}
if (viewType == 1) {
List<Dictionary<string, object>> viewList1 = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
@ -242,6 +267,10 @@ namespace FactorySystemBll
if (viewList != null && viewList.Count > 0)
{
string sqlWhere = string.Format("FViewType={0} and FTeamID={1}", viewType, teamId);
if (viewType == 10)
{
sqlWhere = string.Format("FViewType in (2, 3, 4, 5) and FTeamID={1}", viewType, teamId);
}
result += db.Updateable(viewList).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand();
result += UnionModifyData(viewList, "TFS_ViewMaterial", teamId, db, "FMaterialID");
}
@ -252,10 +281,17 @@ namespace FactorySystemBll
materialList[i]["FID"] = materialList[i]["FMaterialID"];
materialList[i].Remove("FMaterialID");
if (materialList[i].TryGetValue("FK3Code", out object k3Code))
{
if (materialList[i].ContainsKey("FK3ShortCode"))
{
materialList[i]["FK3ShortCode"] = k3Code.ToString().Split('.').Last();
}
else
{
materialList[i].Add("FK3ShortCode", k3Code.ToString().Split('.').Last());
}
}
}
result += db.Updateable(materialList).AS("TFS_Material").WhereColumns("FID").ExecuteCommand();
result += UnionModifyData(materialList, "TFS_Material", teamId, db);
}
@ -284,11 +320,18 @@ namespace FactorySystemBll
//string okResult = db.Ado.GetString(okSql);
string okResult = "";
if (string.IsNullOrEmpty(okResult) || okResult == "0")
{
if (taskType != 10)
{
//视图类型+2是事项，除了包材
taskType += 2;
string taskSql = "";
if (taskType >= (int)Constant.TaskType.组编号申请) taskType = (int)Constant.TaskType.新包材视图;
}
else
{
taskType = 15;
}
string taskSql = "";
int proType = -2; string appSql = " and(select count(1) from TFS_Task t where t.FTeamID=a.FTeamID and t.FType in({0}) and t.FState!=2)=0";
switch (taskType)
@ -305,11 +348,14 @@ namespace FactorySystemBll
case 7://新原料视图:7→新原料视图:4
proType = 4;
break;
case 15://物料分类视图:15→物料分类视图:0
proType = 0;
break;
case 11://新包材视图:7→新原料视图:8
proType = 8;
break;
}
if (proType > 0) taskSql = BaseBll.GetProcessSql(teamId, proType, "F3", 2, string.Format(appSql, taskType));
if (taskType == 15 || proType > 0) taskSql = BaseBll.GetProcessSql(teamId, proType, "F3", 2, string.Format(appSql, taskType));
taskSql = BaseBll.GetTaskSql(-1, 2, teamId, taskType, -1, string.Format("','+a.FUserID+',' like ',%{0}%,'", userId)) + taskSql;
result += db.Ado.ExecuteCommand(taskSql);
TeamworkBll.ChangeTeamProcess(teamId);

3
FactorySystemModel/EnumModel/Constant.cs
Unescape View File

@ -78,7 +78,8 @@ namespace FactorySystemModel.EnumModel
香基视图 = 4,
原料视图 = 5,
包材视图 = 6,
物料主表 = 7
物料主表 = 7,
物料分类视图 = 10
}
/// <summary>

1
FactorySystemModel/FactorySystemModel.csproj
Unescape View File

@ -64,6 +64,7 @@
<Compile Include="ResponseModel\TaskRow.cs" />
<Compile Include="SqlSugarModel\Common.cs" />
<Compile Include="SqlSugarModel\FPower.cs" />
<Compile Include="SqlSugarModel\TFS_FreezingColumns.cs" />
<Compile Include="SqlSugarModel\TDataCode.cs" />
<Compile Include="SqlSugarModel\TBasicCode.cs" />
<Compile Include="SqlSugarModel\TFS_Factory.cs" />

73
FactorySystemModel/SqlSugarModel/TFS_FreezingColumns.cs
Unescape View File

@ -0,0 +1,73 @@
using System;
using SqlSugar;
namespace FactorySystemModel.SqlSugarModel
{
///<summary>
///用户冻结表
///</summary>
[SugarTable("TFS_FreezingColumns")]
public partial class TFS_FreezingColumns
{
public TFS_FreezingColumns()
{
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int FID { get; set; }
/// <summary>
/// Desc:用户ID
/// Default:
/// Nullable:False
/// </summary>
public int FUserID { get; set; }
/// <summary>
/// Desc:冻结列
/// Default:
/// Nullable:False
/// </summary>
public string FFreezingColumns { get; set; }
/// <summary>
/// Desc:是否删除
/// Default:0
/// Nullable:False
/// </summary>
public int FDeleted { get; set; }
/// <summary>
/// Desc:添加人
/// Default:-1
/// Nullable:False
/// </summary>
public int FAddUser { get; set; }
/// <summary>
/// Desc:添加时间
/// Default:DateTime.Now
/// Nullable:False
/// </summary>
public DateTime FAddDate { get; set; }
/// <summary>
/// Desc:修改人
/// Default:-1
/// Nullable:False
/// </summary>
public int FEditUser { get; set; }
/// <summary>
/// Desc:修改时间
/// Default:DateTime.Now
/// Nullable:False
/// </summary>
public DateTime FEditDate { get; set; }
}
}

4
FactorySystemModel/SqlSugarModel/TFS_MaterialInfo.cs
Unescape View File

@ -1043,7 +1043,7 @@ namespace FactorySystemModel.SqlSugarModel
/// Default:''
/// Nullable:TRUE
/// </summary>
public string FMStorageConditions { get; set; }
public string FBStorageConditions { get; set; }
/// <summary>
/// Desc:基础视图.一级分类.类型
@ -1561,7 +1561,7 @@ namespace FactorySystemModel.SqlSugarModel
/// Default:0
/// Nullable:FALSE
/// </summary>
public string FMStorageConditionsType { get; set; }
public string FBStorageConditionsType { get; set; }
/// <summary>
/// Desc:仓储视图.批次管理.类型

Write Preview
Loading…
Cancel
Save