From f4a1be66a1b64705d490bc0ad06f64e7c6737acd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 29 六月 2023 10:06:43 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/POOrderBillExcelController.cs | 74 +++++++++++++-----------------------
1 files changed, 27 insertions(+), 47 deletions(-)
diff --git a/WebAPI/Controllers/POOrderBillExcelController.cs b/WebAPI/Controllers/POOrderBillExcelController.cs
index 128ca98..063e8f5 100644
--- a/WebAPI/Controllers/POOrderBillExcelController.cs
+++ b/WebAPI/Controllers/POOrderBillExcelController.cs
@@ -141,7 +141,7 @@
{
for (int j = 0; j < tb2.Columns.Count; j++)
{
- if (tb2.Rows[i][j].ToString() == ""&& tb2.Columns[i].ToString()!= "鍖呰鏍囪瘑")
+ if (tb2.Rows[i][j].ToString() == ""&& tb2.Columns[j].ToString()!= "鍖呰鏍囪瘑")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -190,68 +190,45 @@
private object Checkdata(DataTable dt)
{
DataSet ds = new DataSet();
+ string error = "";
for (int i = 0; i < dt.Rows.Count; i++)
{
//缁勭粐
ds = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS where Hname='" + dt.Rows[i]["缁勭粐"].ToString() + "' ", "Xt_ORGANIZATIONS");
if (ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,缁勭粐涓簕dt.Rows[i]["缁勭粐"].ToString()}涓嶅瓨鍦�!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error+ $"绗瑊(i + 1)}琛�,缁勭粐涓簕dt.Rows[i]["缁勭粐"].ToString()}涓嶅瓨鍦�!";
}
//渚涘簲鍟�
ds = oCn.RunProcReturn("select * from Gy_Supplier where Hname='" + dt.Rows[i]["渚涘簲鍟�"].ToString() + "' ", "Gy_Supplier");
if (ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,渚涘簲鍟嗕负{dt.Rows[i]["渚涘簲鍟�"].ToString()}涓嶅瓨鍦�!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + $"绗瑊(i + 1)}琛�,渚涘簲鍟嗕负{dt.Rows[i]["渚涘簲鍟�"].ToString()}涓嶅瓨鍦�!";
}
//鏀舵枡浠撳簱
ds = oCn.RunProcReturn("select * from Gy_Warehouse where Hname='" + dt.Rows[i]["鏀舵枡浠撳簱"].ToString() + "' ", "Gy_Warehouse");
if (ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,鏀舵枡浠撳簱涓簕dt.Rows[i]["鏀舵枡浠撳簱"].ToString()}涓嶅瓨鍦�!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + $"绗瑊(i + 1)}琛�,鏀舵枡浠撳簱涓簕dt.Rows[i]["鏀舵枡浠撳簱"].ToString()}涓嶅瓨鍦�!";
}
//鐗╂枡缂栫爜
if (!DBUtility.ClsPub.AllowNumber(dt.Rows[i]["鐗╂枡缂栫爜"].ToString()))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
}
ds = oCn.RunProcReturn("select * from Gy_Material where HNumber='" + dt.Rows[i]["鐗╂枡缂栫爜"].ToString() + "' ", "Gy_Material");
if (ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,鐗╂枡缂栫爜涓簕dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}涓嶅瓨鍦�!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + $"绗瑊(i + 1)}琛�,鐗╂枡缂栫爜涓簕dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}涓嶅瓨鍦�!";
}
//鏁伴噺
if (dt.Rows[i]["鏁伴噺"].ToString() == "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,鏁伴噺涓嶄负0!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + $"绗瑊(i + 1)}琛�,鏁伴噺涓嶄负0!";
}
//鍒ゆ柇瀵煎叆鐗╂枡鐨勬暟閲忔槸鍚﹀ぇ浜庡崟鎹墿鏂欑殑鎬诲拰鏁伴噺
@@ -264,33 +241,36 @@
double NumCount = 0;//鎬绘暟閲�
foreach (DataRow item in ds.Tables[0].Rows)
{
- NumCount += double.Parse(item["鏈叧鑱旀暟閲�"].ToString());
+ NumCount += double.Parse(item["鍓╀綑鏀舵枡鏁伴噺"].ToString());
}
if (NumCount < double.Parse(dt.Rows[i]["鏁伴噺"].ToString()))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛屽鍏ユ暟閲忓ぇ浜庨噰璐鍗曞悎璁℃暟閲�,璇锋壘閲囪喘鍛樼敵璇峰仛閲囪喘璁㈠崟!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + $"绗瑊(i + 1)}琛屽鍏ユ暟閲忓ぇ浜庨噰璐鍗曞悎璁℃暟閲�,璇锋壘閲囪喘鍛樼敵璇峰仛閲囪喘璁㈠崟!";
}
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,鍖归厤涓嶅埌鏁版嵁淇℃伅!";
- objJsonResult.data = null;
- return objJsonResult;
+ error = error + $"绗瑊(i + 1)}琛�,鐗╂枡缂栫爜:{dt.Rows[i]["鐗╂枡缂栫爜"].ToString()},鍖呰鏍囪瘑:{dt.Rows[i]["鍖呰鏍囪瘑"].ToString()},閲囪喘璁㈠崟鍙敤鏁伴噺:0,灏忎簬璁㈠崟鎬婚渶姹傛暟閲�:{dt.Rows[i]["鏁伴噺"].ToString()},鍖归厤涓嶅埌鏁版嵁淇℃伅!";
}
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "娌℃湁闂";
- objJsonResult.data = null;
- return objJsonResult;
+ if (error == "")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁闂";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = error;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
#endregion
--
Gitblit v1.9.1