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

修改物料路线BUG

Browse Source 
修改导出视图文件名称
master
leo 3 years ago
parent 0ac109c75d
commit e85db5311e
4 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File

18
FactorySystemApi/Controllers/MaterialController.cs
Unescape View File

@ -268,14 +268,14 @@ namespace FactorySystemApi.Controllers
if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\"); if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\");
if (!File.Exists(savePath) || !hasFinish) if (!File.Exists(savePath) || !hasFinish)
{ {
MaterialBll.CreateExeclFile(inParam["FName"].ToString(), savePath, "", "", "", inParam["FID"].ToString(), ""); MaterialBll.CreateExeclFile(inParam["FName"].ToString() + "_全部视图", savePath, "", "", "", inParam["FID"].ToString(), "");
} }
else else
{ {
File.Delete(basePath + string.Format("\\File\\Temp\\{0}_{1}\\", inParam["FID"], "View")); File.Delete(basePath + string.Format("\\File\\Temp\\{0}_{1}\\", inParam["FID"], "全部视图"));
MaterialBll.CreateExeclFile(inParam["FName"].ToString(), savePath, "", "", "", inParam["FID"].ToString(), ""); MaterialBll.CreateExeclFile(inParam["FName"].ToString() + "_全部视图", savePath, "", "", "", inParam["FID"].ToString(), "");
} }
string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", inParam["FName"].ToString() + ".xlsx"); string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", inParam["FName"].ToString() + "_全部视图" + ".xlsx");
apiResult.Data = url; apiResult.Data = url;
} }
@ -331,14 +331,14 @@ namespace FactorySystemApi.Controllers
if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\"); if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\");
if (!File.Exists(savePath) || !hasFinish) if (!File.Exists(savePath) || !hasFinish)
{ {
MaterialBll.CreateExeclFileSAP(inParam["FName"].ToString(), savePath, "", "", "", inParam["FID"].ToString(), ""); MaterialBll.CreateExeclFileSAP(inParam["FName"].ToString() + "_SAP视图", savePath, "", "", "", inParam["FID"].ToString(), "");
} }
else else
{ {
File.Delete(basePath + string.Format("\\File\\Temp\\{0}_{1}\\", inParam["FID"], "SAP")); File.Delete(basePath + string.Format("\\File\\Temp\\{0}_{1}\\", inParam["FID"], "SAP视图"));
MaterialBll.CreateExeclFileSAP(inParam["FName"].ToString(), savePath, "", "", "", inParam["FID"].ToString(), ""); MaterialBll.CreateExeclFileSAP(inParam["FName"].ToString() + "_SAP视图", savePath, "", "", "", inParam["FID"].ToString(), "");
} }
string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", inParam["FName"].ToString() + ".xlsx"); string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", inParam["FName"].ToString() + "_SAP视图" + ".xlsx");
apiResult.Data = url; apiResult.Data = url;
} }
@ -360,7 +360,7 @@ namespace FactorySystemApi.Controllers
ApiResult apiResult = new ApiResult(); ApiResult apiResult = new ApiResult();
return ExceptionHelper.TryReturnException(() => return ExceptionHelper.TryReturnException(() =>
{ {
string str = inParam["FType"].ToString() == "1" ? "视图" : "物料视图"; string str = inParam["FType"].ToString() == "1" ? "全部视图" : "SAP视图";
inParam.TryGetValue("FViewType", out object objType); inParam.TryGetValue("FViewType", out object objType);
//string FType = null == objType ? Constant.TeamViewType.物料视图.ToString() : objType.ToString(); //string FType = null == objType ? Constant.TeamViewType.物料视图.ToString() : objType.ToString();
//string selectSql = "", joinSql = "", whereSql = string.Format("TFS_FTeamwork.FID={0} ", inParam["FTeamID"]); //string selectSql = "", joinSql = "", whereSql = string.Format("TFS_FTeamwork.FID={0} ", inParam["FTeamID"]);

37
FactorySystemApi/Controllers/MaterialTeamworkController.cs
Unescape View File

@ -12,10 +12,8 @@ using FactorySystemModel.RequestModel;
using System.Reflection; using System.Reflection;
using System.Data; using System.Data;
using System.IO; using System.IO;
using System.Security.Cryptography;
using System.Threading.Tasks;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using static FactorySystemModel.EnumModel.Constant; using System.Linq;
namespace FactorySystemApi.Controllers namespace FactorySystemApi.Controllers
{ {
@ -190,10 +188,31 @@ namespace FactorySystemApi.Controllers
{ {
mtq.FUserID = user.FID; mtq.FUserID = user.FID;
} }
List<object> powerList = MaterialTeamworkBll.GetViewPower(mtq.FUserID);
List<MaterialTeamworkRow> list = MaterialTeamworkBll.GetList(mtq, out var totalNumber);
int total = totalNumber;
if (list != null && list.Count > 0)
{
foreach(MaterialTeamworkRow row in list)
{
row.FIsShowView = false;
row.FIsDownloadView = false;
int factoryId = row.FCreateFactoryID;
List<object> viewPowers = powerList.FindAll(p => ((IDictionary<string, object>)p)["FFactoryID"].ToString().Equals(factoryId.ToString()) && ((IDictionary<string, object>)p)["FFunctionID"].ToString().Equals("1")).ToList();
List<object> operationPowers = powerList.FindAll(p => ((IDictionary<string, object>)p)["FFactoryID"].ToString().Equals(factoryId.ToString()) && ((IDictionary<string, object>)p)["FFunctionID"].ToString().Equals("6")).ToList();
if (viewPowers != null && viewPowers.Count > 0) row.FIsShowView = true;
if (operationPowers != null && operationPowers.Count > 0) row.FIsDownloadView = true;
}
}
apiResult.Data = new apiResult.Data = new
{ {
List = MaterialTeamworkBll.GetList(mtq, out var totalNumber), List = list,
Total = totalNumber Total = total
}; };
}, apiResult, Request); }, apiResult, Request);
} }
@ -739,10 +758,10 @@ namespace FactorySystemApi.Controllers
if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\"); if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\");
if (!File.Exists(savePath) || !hasFinish) if (!File.Exists(savePath) || !hasFinish)
{ {
CreateExeclFileSAP(materialName.ToString(), savePath, teamworkId.ToString(), teamworkType.ToString()); CreateExeclFileSAP(materialName.ToString() + "_SAP视图", savePath, teamworkId.ToString(), teamworkType.ToString());
} }
string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", materialName.ToString() + ".xlsx"); string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", materialName.ToString() + "_SAP视图.xlsx");
apiResult.Data = url; apiResult.Data = url;
} }
else else
@ -781,10 +800,10 @@ namespace FactorySystemApi.Controllers
if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\"); if (hasFinish) savePath = savePath.Replace("\\File\\Temp\\", "\\File\\View\\");
if (!File.Exists(savePath) || !hasFinish) if (!File.Exists(savePath) || !hasFinish)
{ {
CreateExeclFile(materialName.ToString(), savePath, teamworkId.ToString(), teamworkType.ToString()); CreateExeclFile(materialName.ToString() + "_全部视图", savePath, teamworkId.ToString(), teamworkType.ToString());
} }
string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", materialName.ToString() + ".xlsx"); string url = Request.RequestUri.AbsoluteUri.Replace(Request.RequestUri.AbsolutePath, "") + savePath.Replace(basePath, "").Replace("\\", "/").Replace(".xlsx", materialName.ToString() + "_全部视图.xlsx");
apiResult.Data = url; apiResult.Data = url;
} }
else else

4
FactorySystemBll/MaterialBll.cs
Unescape View File

@ -966,11 +966,11 @@ namespace FactorySystemBll
string str = ""; string str = "";
if (FType == "1") if (FType == "1")
{ {
str = "视图"; str = "全部视图";
dataList = GetMaterialInfoALL(); dataList = GetMaterialInfoALL();
} }
else { else {
str = "基础视图"; str = "SAP视图";
dataList = GetMaterialInfoSAPALL(); dataList = GetMaterialInfoSAPALL();
} }

16
FactorySystemBll/MaterialTeamworkBll.cs
Unescape View File

@ -481,25 +481,19 @@ namespace FactorySystemBll
return viewList; return viewList;
} }
public List<Dictionary<int, bool>> GetViewPower(int userId, List<int> factoryId) public List<object> GetViewPower(int userId)
{ {
SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
List<Dictionary<int, bool>> factoryPowers = new List<Dictionary<int, bool>>();
List<object> powers = db.Queryable<TRole_Right, FPower>((a, b) => new JoinQueryInfos( List<object> powers = db.Queryable<TRole_Right, FPower>((a, b) => new JoinQueryInfos(
JoinType.Left, b.FRole.Equals(a.FRoleID.ToString()) JoinType.Full, b.FRole.Equals(a.FRoleID.ToString())
)) ))
.Where((a, b) => b.FUserID.Equals(userId.ToString()) && b.FFactoryID.Equals(factoryId.ToString())) .Where((a, b) => b.FUserID.Equals(userId.ToString()))
.Where((a, b) => a.FType == 3) .Where((a, b) => a.FType == 3)
.Select<object>("a.FFunctionID, b.FFactoryID").Distinct() .Select<object>("a.FRoleID, a.FType, a.FFunctionID, b.FFactoryID").Distinct()
.ToList(); .ToList();
if (powers != null && powers.Count > 0) return powers;
{
}
return factoryPowers;
} }
public DataTable GetViewMaterialSAP(string teamworkId, string teamworkType) public DataTable GetViewMaterialSAP(string teamworkId, string teamworkType)

Write Preview
Loading…
Cancel
Save