From 164ed043c7dc88fd05074244c3951a9ccc0ceead Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 三月 2023 10:54:50 +0800
Subject: [PATCH] 车间看板取数修改、订单下达获取工单语句修改、生产工单手工创建获取单号接口
---
VueWebApi/Tools/ImportExcelData.cs | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 26eb138..1e7b4a1 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -1945,7 +1945,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{鐢ㄦ埛缂栫爜(鍞竴)}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
@@ -1959,7 +1959,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{缁勭粐缂栫爜}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -3293,8 +3293,8 @@
break;
}
- sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype)
- values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype)";
+ sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
+ values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@usergroup_code)";
list.Add(new
{
str = sql,
@@ -3309,7 +3309,8 @@
Email = excelTable[1].Rows[i][6].ToString().Trim(),
Operator = User,
StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
- wagetype = WageType
+ wagetype = WageType,
+ usergroup_code = excelTable[1].Rows[i][9].ToString().Trim()
}
});
}
@@ -3439,24 +3440,24 @@
//瀵煎叆寰�鏉ュ崟浣嶈〃
for (int i = 0; i < excelTable.Rows.Count; i++)
{
- string WGType = "", WXType = "", KHType = "";
+ string Type = "";
switch (excelTable.Rows[i][3].ToString().Trim())
{
- case "澶栬喘渚涙柟":
- WGType = "WG";
- break;
- case "澶栧崗渚涙柟":
- WXType = "WX";
+ case "渚涘簲鍟�":
+ Type = "226";
break;
case "瀹㈡埛":
- KHType = "KH";
+ Type = "211";
+ break;
+ case "瀹㈡埛/渚涘簲鍟�":
+ Type = "228";
break;
default:
break;
}
- sql = @"insert into TCustomer(code,name,mtype,conttacts,conttphone,addr,lm_user,lm_date,btype,htype)
- values(@code,@name,@mtype,@conttacts,@conttphone,@addr,@Operator,@CreateDate,@btype,@htype)";
+ sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date)
+ values(@code,@name,@type,@conttacts,@conttphone,@addr,@Operator,@CreateDate)";
list.Add(new
{
str = sql,
@@ -3464,14 +3465,12 @@
{
code = excelTable.Rows[i][1].ToString().Trim(),
name = excelTable.Rows[i][2].ToString().Trim(),
- mtype = WGType,
+ type = Type,
conttacts = excelTable.Rows[i][4].ToString().Trim(),
conttphone = excelTable.Rows[i][5].ToString().Trim(),
addr = excelTable.Rows[i][6].ToString().Trim(),
Operator = User,
- CreateDate = DateTime.Now.ToString(),
- btype = WXType,
- htype = KHType
+ CreateDate = DateTime.Now.ToString()
}
});
}
--
Gitblit v1.9.3