From 0b26067b6cc5d531938fa79cb540a45e125261d2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 12 一月 2024 14:55:54 +0800
Subject: [PATCH] 1.App版本升级接口 2.模具清单新增、导入添加仓库、库位字段 3.MES工单查询增加明细id关联
---
VueWebCoreApi/Controllers/ImportExcelController.cs | 3
VueWebCoreApi/Tools/ExcelList.cs | 4
VueWebCoreApi/DLL/BLL/LoginBLL.cs | 8 ++
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 4
VueWebCoreApi/wwwroot/Excel/模具清单.xls | 0
VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs | 4
VueWebCoreApi/Tools/ImportExcelData.cs | 147 +++++++++++++++++++++++++++++-------
VueWebCoreApi/Controllers/MouldManagerController.cs | 4
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 3
VueWebCoreApi/DLL/DAL/LoginDAL.cs | 36 +++++++++
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 12 ++-
VueWebCoreApi/Controllers/LoginController.cs | 14 +++
12 files changed, 195 insertions(+), 44 deletions(-)
diff --git a/VueWebCoreApi/Controllers/ImportExcelController.cs b/VueWebCoreApi/Controllers/ImportExcelController.cs
index e6de79f..1617421 100644
--- a/VueWebCoreApi/Controllers/ImportExcelController.cs
+++ b/VueWebCoreApi/Controllers/ImportExcelController.cs
@@ -201,8 +201,7 @@
ToMessage mes = new ToMessage();
try
{
- //var token = HttpContext.Request.Headers["Token"].ToString();
- var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IlBDIiwicmVkaXNrZXkiOiJOZXdNRVNMb2dpblVzZXJJRFBDOTk5IiwidGltZW91dCI6IjIwMjMtMTItMTVUMTc6MTg6MjEuMTQyMjc1MiswODowMCJ9.IPaJpspiHjk4Qh9keXNy8lJl1Scj87EnnksKd8Hnj8o";
+ var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = ExcelCheckBLL.ExcelImportSubmit(FileCode, dataTable, us);
if (mes.code == "300")
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index 14a44c2..13acbec 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -369,5 +369,19 @@
//return mes.ResponseMess(mes);
}
#endregion
+
+ #region[App鐗堟湰鍗囩骇鎺ュ彛]
+ /// <summary>
+ /// App鐗堟湰鍗囩骇鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AppUpgrade")]
+ [HttpPost]
+ public JsonResult AppUpgrade()
+ {
+ mes = LoginBLL.AppUpgrade();
+ return Json(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index 4a637b7..3498003 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -71,12 +71,14 @@
string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
string mouldname = obj["mouldname"].ToString(); //妯″叿鍚嶇О
string mouldspec = obj["mouldspec"].ToString(); //妯″叿瑙勬牸
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string location_code = obj["location_code"].ToString(); //搴撲綅缂栫爜
string surplife = obj["surplife"].ToString(); //棰勮瀵垮懡
string resilife = obj["resilife"].ToString(); //鍓╀綑瀵垮懡
string status = obj["status"].ToString(); //妯″叿鐘舵��
string mouldpart = obj["mouldpart"].ToString(); //鍏宠仈浜у搧
string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
- mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
+ mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, location_code, surplife, resilife, status, mouldpart, opertype, us);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/LoginBLL.cs b/VueWebCoreApi/DLL/BLL/LoginBLL.cs
index 6589ff6..d38a705 100644
--- a/VueWebCoreApi/DLL/BLL/LoginBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/LoginBLL.cs
@@ -62,5 +62,13 @@
return LoginDAL.LoginAppAnDonMessage(rid, usercode, username, usertype, stu_torgcode, stu_torgtypecode);
}
#endregion
+
+
+ #region[App鐗堟湰鍗囩骇鎺ュ彛]
+ public static ToMessage AppUpgrade()
+ {
+ return LoginDAL.AppUpgrade();
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index 8056c64..9af0110 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -19,9 +19,9 @@
#endregion
#region[妯″叿娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec,string warehousecode,string location_code, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
{
- return MouldManagerDAL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
+ return MouldManagerDAL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, location_code, surplife, resilife, status, mouldpart, opertype, us);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 8b4db5a..45686f7 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -1208,7 +1208,8 @@
FROM TUser U
inner join cte on U.storg_code=cte.torg_code
left join TOrganization T on U.storg_code=T.torg_code
- left join TUser S on U.lm_user=S.usercode " + search + "";
+ left join TUser S on U.lm_user=S.usercode
+ where 1=1 " + search + "";
var data = DapperHelper.GetPagedDataWith<object>(withsql, sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
diff --git a/VueWebCoreApi/DLL/DAL/LoginDAL.cs b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
index a450eba..1cd5223 100644
--- a/VueWebCoreApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
@@ -494,5 +494,41 @@
return mes;
}
#endregion
+
+ #region[App鐗堟湰鍗囩骇鎺ュ彛]
+ public static ToMessage AppUpgrade()
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鏌ヨ鎺у埗鍗囩骇琛ㄧ増鏈暟鎹�
+ sql = @"select * from TSystemApp";
+ var data1 = DapperHelper.selecttable(sql);
+ AppVersion vn = new AppVersion();
+ vn.path = data1.Rows[0]["path"].ToString();
+ vn.version = data1.Rows[0]["version"].ToString();
+ vn.dispyversion = "";
+ vn.activeversion = data1.Rows[0]["activeversion"].ToString();
+ vn.mustupgrade = data1.Rows[0]["mustupgrade"].ToString();
+ list.Add(vn);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index de5c511..769a0b6 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -102,7 +102,7 @@
#endregion
#region[妯″叿娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec,string warehousecode,string location_code, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -112,8 +112,8 @@
if (opertype == "Add")
{
//鍐欏叆妯″叿娓呭崟琛�
- sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date)
- values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date)";
+ sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date,warehousecode,location_code)
+ values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date,@warehousecode,@location_code)";
list.Add(new
{
str = sql,
@@ -125,6 +125,8 @@
status = status,
surp_life = surplife,
resi_life = resilife,
+ warehousecode=warehousecode,
+ location_code=location_code,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
@@ -169,7 +171,7 @@
{
//淇敼妯″叿娓呭崟琛�
sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,
- surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date where code=@code";
+ surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date,warehousecode=@warehousecode,location_code=@location_code where code=@code";
list.Add(new
{
str = sql,
@@ -181,6 +183,8 @@
status = status,
surp_life = surplife,
resi_life = resilife,
+ warehousecode = warehousecode,
+ location_code = location_code,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index 13bc56c..0d6e9a3 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -581,7 +581,7 @@
var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep
from TK_Wrk_Man A
- left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
+ left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.torg_code
left join TSecStck D on A.stck_code=D.code
@@ -667,7 +667,7 @@
var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,S.laborbad_qty,S.materielbad_qty
from TK_Wrk_Man A
- left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
+ left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
left join (select wo_code,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty from TK_Wrk_Step where (laborbad_qty+materielbad_qty)>0 group by wo_code) S on A.wo_code=S.wo_code
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.torg_code
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index f1fc142..3c618ce 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -18,8 +18,8 @@
new ScoreReport("3","浜哄憳绠＄悊"),
new ScoreReport("4","瑙掕壊绠＄悊"),
new ScoreReport("5","寰�鏉ュ崟浣�"),
- //new ScoreReport("6","浠撳簱璁剧疆"),
- //new ScoreReport("7","搴撲綅璁剧疆"),
+ new ScoreReport("6","浠撳簱璁剧疆"),
+ new ScoreReport("7","搴撲綅璁剧疆"),
new ScoreReport("8","瀛樿揣妗ｆ"),
new ScoreReport("9","璁惧娓呭崟"),
//new ScoreReport("10","璁惧鐐规椤圭洰"),
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index ea36ee9..5a7c185 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -1001,16 +1001,31 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 6)
+ if (excelTable[1].Rows.Count > 0)
+ {
+ if (excelTable[1].Columns.Count != 2)
+ {
+ code = "301";
+ Message = "妯″叿鍏宠仈浜у搧妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
+ }
+ else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
+ {
+ code = "301";
+ Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕妯″叿缂栫爜}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[1].ColumnName != "浜у搧缂栫爜")
+ {
+ code = "301";
+ Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕浜у搧缂栫爜}";
+ return Message;
+ }
+ }
+ else if (excelTable[0].Columns.Count != 8)
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
- return Message;
- }
- else if (excelTable[1].Columns.Count != 2)
- {
- code = "301";
- Message = "妯″叿鍏宠仈浜у搧妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
else if (excelTable[0].Columns[0].ColumnName != "*妯″叿缂栧彿(鍞竴)")
@@ -1037,28 +1052,28 @@
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鐘舵�亇";
return Message;
}
- else if (excelTable[0].Columns[4].ColumnName != "棰勮瀵垮懡(娆�)")
+ else if (excelTable[0].Columns[4].ColumnName != "*浠撳簱缂栫爜")
{
code = "301";
- Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*浠撳簱缂栫爜}";
return Message;
}
- else if (excelTable[0].Columns[5].ColumnName != "鍓╀綑瀵垮懡(娆�)")
+ else if (excelTable[0].Columns[5].ColumnName != "*搴撲綅缂栫爜")
{
code = "301";
- Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*搴撲綅缂栫爜}";
return Message;
}
- else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
+ else if (excelTable[0].Columns[6].ColumnName != "棰勮瀵垮懡(娆�)")
{
code = "301";
- Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕妯″叿缂栫爜}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "浜у搧缂栫爜")
+ else if (excelTable[0].Columns[7].ColumnName != "鍓╀綑瀵垮懡(娆�)")
{
code = "301";
- Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕浜у搧缂栫爜}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�8鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
return Message;
}
else
@@ -2821,7 +2836,7 @@
sql = @"select * from TSecStck where code=@code";
dynamicParams.Add("@code", excelTable[1].Rows[k][7].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count<=0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
@@ -2948,7 +2963,7 @@
sql = @"select * from TOrganization where torg_code=@torg_code";
dynamicParams.Add("@torg_code", excelTable[1].Rows[k][2].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count<=0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
@@ -3305,7 +3320,7 @@
sql = @"select * from TEqpmai_Item where code=@code";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count <=0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
@@ -3363,7 +3378,7 @@
var dynamicParams = new DynamicParameters();
List<ExcelErro> list = new List<ExcelErro>();
list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
-
+
//妯″叿琛�
for (int k = 0; k < excelTable[0].Rows.Count; k++)
{
@@ -3395,6 +3410,61 @@
list.Add(erro);
}
}
+ //鍒ゆ柇浠撳簱缂栫爜鏄惁涓虹┖
+ if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
+ {
+ sql = @"select * from TSecStck where code=@code";
+ dynamicParams.Add("@code", excelTable[0].Rows[k][4].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count <= 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*浠撳簱缂栫爜}";
+ erro.ErrorCont = "妯″叿琛�:{*浠撳簱缂栫爜}瀛楁" + excelTable[0].Rows[k][4].ToString().Trim() + "涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ //鍒ゆ柇搴撲綅缂栫爜鏄惁涓虹┖
+ if (excelTable[0].Rows[k][5].ToString().Trim() != null && excelTable[0].Rows[k][5].ToString().Trim() != "")
+ {
+ //搴撲綅涓嶄负绌烘椂,鍒ゆ柇浠撳簱鏄惁涓虹┖
+ if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
+ {
+ //鍒ゆ柇搴撲綅鏄惁瀛樺湪
+ sql = @"select * from TSecLoca where code=@code";
+ dynamicParams.Add("@code", excelTable[0].Rows[k][5].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count <= 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*搴撲綅缂栫爜}";
+ erro.ErrorCont = "妯″叿琛�:{*搴撲綅缂栫爜}瀛楁" + excelTable[0].Rows[k][5].ToString().Trim() + "涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ else
+ {
+ //鍒ゆ柇搴撲綅鏄惁灞炰簬褰撳墠浠撳簱
+ if (excelTable[0].Rows[k][4].ToString().Trim() != dt.Rows[0]["idwarehouse"].ToString())
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*搴撲綅缂栫爜}";
+ erro.ErrorCont = "妯″叿琛�:{*搴撲綅缂栫爜}瀛楁" + excelTable[0].Rows[k][5].ToString().Trim() + "涓巤*浠撳簱缂栫爜}瀛楁锛�" + excelTable[0].Rows[k][4].ToString().Trim() + "涓嶅尮閰�";
+ list.Add(erro);
+ }
+ }
+ }
+ else
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*搴撲綅缂栫爜}";
+ erro.ErrorCont = "妯″叿琛�:{*搴撲綅缂栫爜}瀛楁" + excelTable[0].Rows[k][5].ToString().Trim() + "瀵瑰簲鐨勪粨搴撳瓧娈典笉鑳戒负绌�";
+ list.Add(erro);
+ }
+ }
}
//妯″叿鍏宠仈浜у搧琛�
for (int j = 0; j < excelTable[1].Rows.Count; j++)
@@ -3404,7 +3474,7 @@
sql = @"select * from TMateriel_Info where partcode=@partcode";
dynamicParams.Add("@partcode", excelTable[1].Rows[j][1].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count<= 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
@@ -3586,7 +3656,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴),*妯″叿鐐规椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏风偣妫�椤逛腑涓嶅瓨鍦�";
+ erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴),*妯″叿鐐规椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏风偣妫�椤逛腑涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -4582,7 +4652,7 @@
status = excelTable[0].Rows[i][2].ToString().Trim(),
datarange = "ALL",
datapermissions = datapermissions,
- identifying="2",
+ identifying = "2",
description = excelTable[0].Rows[i][3].ToString().Trim(),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -4751,6 +4821,21 @@
//瀵煎叆搴撲綅
for (int i = 0; i < excelTable[0].Rows.Count; i++)
{
+ string status = "";
+ if (excelTable[0].Rows[i][4].ToString().Trim() != null && excelTable[0].Rows[i][4].ToString().Trim() != "")
+ {
+ switch (excelTable[0].Rows[i][3].ToString().Trim())
+ {
+ case "姝ｅ父":
+ status = "Y";
+ break;
+ case "鍋滅敤":
+ status = "N";
+ break;
+ default:
+ break;
+ }
+ }
sql = @"insert into TSecLoca(code,name,idwarehouse,idparent,status,description,lm_user,lm_date,data_sources)
values(@code,@name,@idwarehouse,@idparent,@status,@description,@lm_user,@lm_date,@data_sources)";
list.Add(new
@@ -4762,7 +4847,7 @@
name = excelTable[0].Rows[i][1].ToString().Trim(),
idwarehouse = excelTable[0].Rows[i][2].ToString().Trim(),
idparent = excelTable[0].Rows[i][3].ToString().Trim(),
- status = excelTable[0].Rows[i][4].ToString().Trim(),
+ status = status,
description = excelTable[0].Rows[i][5].ToString().Trim(),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
@@ -4824,7 +4909,7 @@
//瀵煎叆瀛樿揣妗ｆ
for (int i = 0; i < excelTable[1].Rows.Count; i++)
{
- string idunitgroup="", idunit = "", idnounit = "";
+ string idunitgroup = "", idunit = "", idnounit = "";
int isSingleUnit = 0;
if (excelTable[1].Rows[i][5].ToString().Trim() == "S")
{
@@ -4842,7 +4927,7 @@
dynamicParams.Add("@name", excelTable[1].Rows[i][6].ToString().Trim());
var dt = DapperHelper.selectdata(sql, dynamicParams);
idunitgroup = dt.Rows[0]["groupcode"].ToString();
- idunit = dt.AsEnumerable().Where(row => row.Field<string>("isMainUnit") =="1").Select(row => row.Field<string>("code")).FirstOrDefault();
+ idunit = dt.AsEnumerable().Where(row => row.Field<string>("isMainUnit") == "1").Select(row => row.Field<string>("code")).FirstOrDefault();
idnounit = dt.AsEnumerable().Where(row => row.Field<string>("isMainUnit") == "0").Select(row => row.Field<string>("code")).FirstOrDefault();
}
@@ -5309,8 +5394,8 @@
//瀵煎叆妯″叿娓呭崟
for (int k = 0; k < excelTable[0].Rows.Count; k++)
{
- sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date)
- values(@code,@name,@spec,@status,@usestatus,@surp_life,@resi_life,@lm_user,@lm_date)";
+ sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date,warehousecode,location_code)
+ values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date,@warehousecode,@location_code)";
list.Add(new
{
str = sql,
@@ -5320,8 +5405,10 @@
name = excelTable[0].Rows[k][1].ToString().Trim(),
spec = excelTable[0].Rows[k][2].ToString().Trim(),
status = excelTable[0].Rows[k][3].ToString().Trim(),
- surp_life =decimal.Parse(excelTable[0].Rows[k][4].ToString().Trim()==""?"0": excelTable[0].Rows[k][4].ToString().Trim()),
- resi_life = decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()==""?"0":excelTable[0].Rows[k][5].ToString().Trim()),
+ warehousecode = excelTable[0].Rows[k][4].ToString().Trim(),
+ location_code = excelTable[0].Rows[k][5].ToString().Trim(),
+ surp_life = decimal.Parse(excelTable[0].Rows[k][6].ToString().Trim() == "" ? "0" : excelTable[0].Rows[k][6].ToString().Trim()),
+ resi_life = decimal.Parse(excelTable[0].Rows[k][7].ToString().Trim() == "" ? "0" : excelTable[0].Rows[k][7].ToString().Trim()),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
@@ -5879,7 +5966,7 @@
code = excelTable[0].Rows[i][0].ToString().Trim(),
name = excelTable[0].Rows[i][1].ToString().Trim(),
description = excelTable[0].Rows[i][2].ToString().Trim(),
- is_step="N",
+ is_step = "N",
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls"
index 8badc07..0b589f0 100644
--- "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls"
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls"
Binary files differ
--
Gitblit v1.9.3