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/Tools/ImportExcelData.cs | 147 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 117 insertions(+), 30 deletions(-)
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()
}
--
Gitblit v1.9.3