From fd263cc1a5c0623972cd124ac6f3fe0fc1277e53 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 21 九月 2023 18:44:58 +0800
Subject: [PATCH] 1.工序新增、修改、删除 2.订单同步接口、通用基础资料(仓库基本资料、工序基础资料、工单产品信息下拉查询) 3.ERP订单功能、MES工单查询、修改、删除、关闭接口
---
VueWebCoreApi/Tools/ImportExcelData.cs | 167 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 37 deletions(-)
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 8642f8b..e838b33 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -626,7 +626,7 @@
Message = "璁惧绫诲瀷妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
return Message;
}
- else if (excelTable[1].Columns.Count != 6)
+ else if (excelTable[1].Columns.Count != 5)
{
code = "301";
Message = "璁惧娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -662,7 +662,7 @@
Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*璁惧鍚嶇О}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "鎵�灞炵粍缁囩紪鐮�")
+ else if (excelTable[1].Columns[2].ColumnName != "*鎵�灞炵粍缁囩紪鐮�")
{
code = "301";
Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*鎵�灞炵粍缁囩紪鐮亇";
@@ -674,16 +674,10 @@
Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*璁惧绫诲瀷缂栫爜}";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "*鍚敤鏃ユ湡")
+ else if (excelTable[1].Columns[4].ColumnName != "*鐘舵��")
{
code = "301";
- Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*鍚敤鏃ユ湡}";
- return Message;
- }
- else if (excelTable[1].Columns[5].ColumnName != "*鐘舵��")
- {
- code = "301";
- Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕*鐘舵�亇";
+ Message = "璁惧娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*鐘舵�亇";
return Message;
}
else
@@ -1268,36 +1262,52 @@
#endregion
#region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ュ簭瀹氫箟妯℃澘銆�
- public static string Fifteen(string FileCode, out string code)
+ public static string Fifteen(List<DataTable> excelTable, out string code)
{
string Message = "";
code = "";
- DataTable excelTable = new DataTable();
- excelTable = ImportExcel.ExcelToTable(FileCode);
- if (excelTable.Columns.Count != 4)
+ if (excelTable.Count != 1)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
}
- else if (excelTable.Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns.Count != 5)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
- else if (excelTable.Columns[1].ColumnName != "宸ュ簭缂栫爜(鍞竴)")
+ else if (excelTable[0].Columns[0].ColumnName != "*宸ュ簭缂栧彿(鍞竴)")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*宸ュ簭缂栧彿(鍞竴)}";
+ return Message;
}
- else if (excelTable.Columns[2].ColumnName != "宸ュ簭鍚嶇О锛堝敮涓�锛�")
+ else if (excelTable[0].Columns[1].ColumnName != "*宸ュ簭鍚嶇О")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*宸ュ簭鍚嶇О}";
+ return Message;
}
- else if (excelTable.Columns[3].ColumnName != "鍚敤鐘舵��")
+ else if (excelTable[0].Columns[2].ColumnName != "*宸ュ簭绫诲瀷")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*宸ュ簭绫诲瀷}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[3].ColumnName != "*鐘舵��")
+ {
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐘舵�亇";
+ return Message;
+ }
+ else if (excelTable[0].Columns[4].ColumnName != "鎻忚堪")
+ {
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鎻忚堪}";
+ return Message;
}
else
{
@@ -3332,15 +3342,65 @@
#endregion
#region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ュ簭瀹氫箟銆�
- public static List<ExcelErro> FifteenData(string FileCode, out string StuCode, out string message, out int count)
+ public static List<ExcelErro> FifteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
{
message = "";
StuCode = "";
count = 0;
string sql = "";
+ var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
-
+ list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ //宸ュ簭琛�
+ for (int k = 0; k < excelTable[0].Rows.Count; k++)
+ {
+ if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
+ {
+ sql = @"select * from TStep where stepcode=@stepcode";
+ dynamicParams.Add("@stepcode", excelTable[0].Rows[k][0].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][0].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TStep where stepname=@stepname";
+ dynamicParams.Add("@stepname", excelTable[0].Rows[k][1].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][1].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "301";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable[0].Rows.Count;
+ }
return list;
}
#endregion
@@ -4408,15 +4468,15 @@
name = excelTable[0].Rows[k][1].ToString().Trim(),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
- idparent = excelTable[0].Rows[k][2].ToString().Trim()
+ remark = excelTable[0].Rows[k][2].ToString().Trim()
}
});
}
//瀵煎叆璁惧
for (int i = 0; i < excelTable[1].Rows.Count; i++)
{
- sql = @"insert into TEqpInfo(code,name,torg_code,eqptype_code,input_date,operation_ration,enable,opc_uom,lm_user,lm_date)
- values(@code,@name,@torg_code,@eqptype_code,@input_date,@operation_ration,@enable,@opc_uom,@lm_user,@lm_date)";
+ sql = @"insert into TEqpInfo(code,name,torg_code,eqptype_code,operation_ration,enable,opc_uom,lm_user,lm_date)
+ values(@code,@name,@torg_code,@eqptype_code,@operation_ration,@enable,@opc_uom,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -4426,9 +4486,8 @@
name = excelTable[1].Rows[i][1].ToString().Trim(),
torg_code = excelTable[1].Rows[i][2].ToString().Trim(),
eqptype_code = excelTable[1].Rows[i][3].ToString().Trim(),
- input_date = excelTable[1].Rows[i][4].ToString().Trim(),
operation_ration = "100",
- enable = excelTable[1].Rows[i][5].ToString().Trim(),
+ enable = excelTable[1].Rows[i][4].ToString().Trim(),
opc_uom = "鍙�",
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -4859,13 +4918,47 @@
#endregion
#region銆怑xcel鏁版嵁涓婁紶,宸ュ簭瀹氫箟銆�
- public static string FifteenSubmit(string FileCode, string User, out string StuCode)
+ public static string FifteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
{
string message = "";
StuCode = "";
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
-
+ list.Clear();
+ //瀵煎叆宸ュ簭
+ for (int i = 0; i < excelTable[0].Rows.Count; i++)
+ {
+ sql = @"insert into TStep(stepcode,stepname,enable,descr,flwtype,lm_user,lm_date)
+ values(@stepcode,@stepname,@enable,@descr,@flwtype,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ stepcode = excelTable[0].Rows[i][0].ToString().Trim(),
+ stepname = excelTable[0].Rows[i][1].ToString().Trim(),
+ enable = excelTable[0].Rows[i][3].ToString().Trim(),
+ descr = excelTable[0].Rows[i][4].ToString().Trim(),
+ flwtype = excelTable[0].Rows[i][2].ToString().Trim(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
+ else
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
}
catch (Exception e)
{
--
Gitblit v1.9.3