From ec4b90fd8520deac37d34832388ce738d795ae1a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 23 十一月 2023 16:17:28 +0800
Subject: [PATCH] App生产报工、外协收发料图片
---
VueWebCoreApi/Tools/ImportExcelData.cs | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 71e7ec5..8d2194d 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -1045,7 +1045,7 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 7)
+ else if (excelTable[0].Columns.Count != 6)
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -1081,22 +1081,16 @@
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鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
- return Message;
- }
- else if (excelTable[0].Columns[6].ColumnName != "鍓╀綑瀵垮懡(娆�)")
- {
- code = "301";
- Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
return Message;
}
else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
@@ -3479,8 +3473,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("妯″叿缂栫爜"))
+ select rr.Field<string>("*妯″叿缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("妯″叿缂栫爜").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -3605,7 +3599,7 @@
list.Add(erro);
}
//閫氳繃妯″叿鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿鐐规椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
- var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+ var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
if (ds.Rows.Count > 0)
{
@@ -3635,15 +3629,16 @@
{
if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
- sql = @"select * from TMouldchk_Item where code=@code";
+ sql = @"select * from TMouldchk_Item where code=@code and name=@name";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count < 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴),*妯″叿鐐规椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏风偣妫�椤逛腑涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -3652,8 +3647,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿"))
+ select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -3777,7 +3772,7 @@
list.Add(erro);
}
//閫氳繃妯″叿淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿淇濆吇椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
- var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+ var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
if (ds.Rows.Count > 0)
{
@@ -3807,15 +3802,16 @@
{
if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
- sql = @"select * from TMouldmai_Item where code=@code";
+ sql = @"select * from TMouldmai_Item where code=@code and name=@name";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count < 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴),*妯″叿淇濆吇椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏蜂繚鍏婚」涓笉瀛樺湪";
list.Add(erro);
}
}
@@ -3824,8 +3820,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿"))
+ select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -5393,8 +5389,8 @@
//瀵煎叆妯″叿娓呭崟
for (int k = 0; k < excelTable[0].Rows.Count; k++)
{
- sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date)
- values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
+ 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)";
list.Add(new
{
str = sql,
@@ -5403,11 +5399,9 @@
code = excelTable[0].Rows[k][0].ToString().Trim(),
name = excelTable[0].Rows[k][1].ToString().Trim(),
spec = excelTable[0].Rows[k][2].ToString().Trim(),
- status = excelTable[0].Rows[k][3].ToString().Trim()=="姝ｅ父"?"Y":"N",
- usestatus = "0",//浣跨敤鐘舵�侊細鍦ㄥ簱/鍑哄簱/涓婃満/涓嬫満/缁翠慨/澶栧��(0,1,2,3,4,5)
- warehousecode = excelTable[0].Rows[k][4].ToString().Trim(),
- surp_life =decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()),
- resi_life = decimal.Parse(excelTable[0].Rows[k][6].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()),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
--
Gitblit v1.9.3