From 37b39b9748eaaa7900271d83a94698299d53fed4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 18 十月 2023 20:00:52 +0800
Subject: [PATCH] 1.模具扫码入库、出库功能接口 2.模具维修图片上传接口修改
---
VueWebCoreApi/Tools/ImportExcelData.cs | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 6cf5cad..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 != "妯″叿缂栫爜")
@@ -5395,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,
@@ -5405,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