From 5b84275a7ce63b83c778c5ac050b8c039cd4fac8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 八月 2024 17:46:25 +0800
Subject: [PATCH] 1.修改接口：UpdateMesOrderStepSearch --工单派发 2.修改接口：MesOrderNewStepContent --工单派发 3.修改接口：RouteSelectStep--工单派发 4.新增组织架构类型接口：TOrganTypeDate 5.新增组织架构车间接口：TorgWkshop 6.新增车间查找设备接口：WkshopEqpPermissions 7.新增往来单位基础资料接口：CustomerTypePermissions 8.新增往来单位类型查找往来单位资料接口：CustomerTypeSearchPermissions 9.新增工序关联工作站接口 10.修改工序工价提交接口(增加了设备)
---
VueWebCoreApi/Tools/ImportExcelData.cs | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 5a7c185..015c844 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -1349,7 +1349,7 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 5)
+ else if (excelTable[0].Columns.Count != 6)
{
code = "301";
Message = "宸ュ簭璁剧疆妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -1383,6 +1383,12 @@
{
code = "301";
Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕鎻忚堪}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[5].ColumnName != "璁惧渚涙柟/缂栫爜")
+ {
+ code = "301";
+ Message = "宸ュ簭璁剧疆妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕璁惧渚涙柟/缂栫爜}";
return Message;
}
else
@@ -3913,6 +3919,63 @@
list.Add(erro);
}
}
+ if (excelTable[0].Rows[k][5].ToString().Trim() != null && excelTable[0].Rows[k][5].ToString().Trim() != "")
+ {
+ string[] eqpcodelist = Array.ConvertAll<string, string>(excelTable[0].Rows[k][5].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString());
+ if (excelTable[0].Rows[k][5].ToString().Trim() == "鑷埗")
+ {
+ for (int i = 0; i < eqpcodelist.Length; i++)
+ {
+ sql = @"select * from TEqpInfo where code=@code";
+ dynamicParams.Add("@code", eqpcodelist[i].ToString());
+ 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() + ",瀵瑰簲鐨剓璁惧渚涙柟/缂栫爜}:"+ excelTable[0].Rows[k][5].ToString().Trim() + "瀛樺湪涓嶅悎鐞嗙殑鍊�!";
+ list.Add(erro);
+ }
+ }
+ }
+ else
+ {
+ for (int i = 0; i < eqpcodelist.Length; i++)
+ {
+ sql = @"select * from TCustomer where code=@code";
+ dynamicParams.Add("@code", eqpcodelist[i].ToString());
+ 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() + ",瀵瑰簲鐨剓璁惧渚涙柟/缂栫爜}:" + excelTable[0].Rows[k][5].ToString().Trim() + "瀛樺湪涓嶅悎鐞嗙殑鍊�!";
+ list.Add(erro);
+ }
+ }
+ }
+ }
+ }
+ // 浣跨敤鍖垮悕瀵硅薄鏉ョ粍鍚堝涓瓧娈电殑鍊硷紝骞跺鍏惰繘琛屽垎缁�
+ var groupedRows = excelTable[0].AsEnumerable()
+ .GroupBy(row => new
+ {
+ StepCode = row.Field<string>("*宸ュ簭缂栧彿(鍞竴)")
+ })
+ // 绛涢�夊嚭閭ｄ簺鍖呭惈澶氫簬涓�涓厓绱犵殑缁勶紙鍗抽噸澶嶇殑缁勫悎锛�
+ .Where(group => group.Count() > 1)
+ // 閫夋嫨姣忎釜缁勪腑鐨勬墍鏈夎锛堝嵆閲嶅鐨勮锛�
+ .SelectMany(group => group);
+ List<DataRow> listRow = groupedRows.ToList();
+ if (listRow.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*宸ュ簭缂栧彿(鍞竴)}";
+ erro.ErrorCont = "*宸ュ簭缂栧彿(鍞竴)鍦ㄥ鍏ユ枃浠朵腑瀛樺湪閲嶅鍊�";
+ list.Add(erro);
}
if (list.Count > 0)
{
@@ -5706,6 +5769,8 @@
//瀵煎叆宸ュ簭
for (int i = 0; i < excelTable[0].Rows.Count; i++)
{
+ string[] eqpcodelist = Array.ConvertAll<string, string>(excelTable[0].Rows[i][5].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString());
+ //鍐欏叆宸ュ簭琛�
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
@@ -5722,6 +5787,24 @@
lm_date = DateTime.Now.ToString()
}
});
+ //鍐欏叆宸ュ簭鍏宠仈宸ヤ綔绔欒〃
+ for (int j = 0; j < eqpcodelist.Length; j++)
+ {
+ sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date)
+ values(@eqp_code,@step_code,@style,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ eqp_code = eqpcodelist[j].ToString(),
+ step_code = excelTable[0].Rows[i][0].ToString().Trim(),
+ style = excelTable[0].Rows[i][2].ToString().Trim(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -5850,7 +5933,7 @@
message = "瀵煎叆澶辫触锛�";
}
//鏌ヨ宸ュ簭鑺傛媿琛ㄤ腑锛氫骇鍝�+宸ヨ壓璺嚎+宸ュ簭+璁惧鏄惁瀛樺湪
- sql = @"select * from TPrteEqp_Stad
+ sql = @"select * from TPrteStep_Price
where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
dynamicParams.Add("@partcode", partcode);
dynamicParams.Add("@routecode", routecode);
@@ -5859,7 +5942,7 @@
var data6 = DapperHelper.selectdata(sql, dynamicParams);
if (data6.Rows.Count > 0)
{
- sql = @"update TPrteEqp_Stad set stand_value=@stand_value,eqp_value=@eqp_value,cavity_qty=@cavity_qty,unprice=@unprice,lm_user=@username,lm_date=@userdate
+ sql = @"update TPrteStep_Price set stand_value=@stand_value,eqp_value=@eqp_value,cavity_qty=@cavity_qty,unprice=@unprice,lm_user=@username,lm_date=@userdate
where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode ";
list.Add(new
{
@@ -5881,7 +5964,7 @@
}
else
{
- sql = @"insert into TPrteEqp_Stad(materiel_code,eqp_code,stand_value,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,step_code)
+ sql = @"insert into TPrteStep_Price(materiel_code,eqp_code,stand_value,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,step_code)
values(@partcode,@eqpcode,@stand_value,@routecode,@unprice,@eqp_value,@cavity_qty,@wkspcode,@username,@userdate,@stepcode)";
list.Add(new
{
--
Gitblit v1.9.3