From fc8498c2b7d6cf56f1f8a2e3c1b740fbf05ac4fd Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 01 十二月 2022 15:07:56 +0800
Subject: [PATCH] 代码上传
---
WebAPI/Controllers/POOrderBillExcelController.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/POOrderBillExcelController.cs b/WebAPI/Controllers/POOrderBillExcelController.cs
index 323e83b..128ca98 100644
--- a/WebAPI/Controllers/POOrderBillExcelController.cs
+++ b/WebAPI/Controllers/POOrderBillExcelController.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
@@ -29,7 +30,7 @@
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
- ds1 = oCn.RunProcReturn($"exec h_p_POOrderBill_Excel {ds.Tables[0].Rows[i]["HQty"].ToString()},'{ds.Tables[0].Rows[i]["MaterialNum"].ToString()}'", "POOrderBill_Excel");
+ ds1 = oCn.RunProcReturn($"exec h_p_POOrderBill_Excel {ds.Tables[0].Rows[i]["HQty"].ToString()},'{ds.Tables[0].Rows[i]["MaterialNum"].ToString()}','1'", "POOrderBill_Excel");
if (i == 0)
{
@@ -46,10 +47,6 @@
}
}
-
-
-
-
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
@@ -83,7 +80,7 @@
file.SaveAs(ExcelPath);
NpoiHelper np = new NpoiHelper();
- DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "2");
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
//鍒犻櫎鏂囦欢
File.Delete(ExcelPath);
@@ -144,7 +141,7 @@
{
for (int j = 0; j < tb2.Columns.Count; j++)
{
- if (tb2.Rows[i][j].ToString() == "")
+ if (tb2.Rows[i][j].ToString() == ""&& tb2.Columns[i].ToString()!= "鍖呰鏍囪瘑")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -261,13 +258,13 @@
ds = oCn.RunProcReturn("select * from h_v_POOrderBill_Excel " +
$"where 閲囪喘缁勭粐='{dt.Rows[i]["缁勭粐"].ToString()}' and 渚涘簲鍟�='{dt.Rows[i]["渚涘簲鍟�"].ToString()}' " +
$"and 鍖呰鏍囪瘑='{dt.Rows[i]["鍖呰鏍囪瘑"].ToString()}'" +
- $"and 鐗╂枡缂栫爜='{dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}' and 鍏抽棴鐘舵��='鏈叧闂�' and 瀹℃牳鐘舵��='宸插鏍�' ", "h_v_POOrderBill_Excel");
+ $"and 鐗╂枡缂栫爜='{dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}' and 鍏抽棴鐘舵��='鏈叧闂�' ", "h_v_POOrderBill_Excel");
if (ds.Tables[0].Rows.Count != 0)
{
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()))
@@ -283,7 +280,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊(i + 1)}琛�,鍖归厤涓嶅埌鐗╂枡淇℃伅!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛�,鍖归厤涓嶅埌鏁版嵁淇℃伅!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -296,5 +293,7 @@
return objJsonResult;
}
#endregion
+
+
}
}
--
Gitblit v1.9.1