From d077c84b9a62a6c148198232154591f0cbd578f5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 18 十月 2023 13:35:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI

---
 WebAPI/Controllers/POOrderBillExcelController.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/POOrderBillExcelController.cs b/WebAPI/Controllers/POOrderBillExcelController.cs
index c3ed747..27b8b53 100644
--- a/WebAPI/Controllers/POOrderBillExcelController.cs
+++ b/WebAPI/Controllers/POOrderBillExcelController.cs
@@ -233,7 +233,7 @@
                 {
                     error = error + "鐗╂枡浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
                 }
-                ds = oCn.RunProcReturn("select * from Gy_Material where HNumber='" + dt.Rows[i]["鐗╂枡缂栫爜"].ToString() + "' ", "Gy_Material");
+                ds = oCn.RunProcReturn("select top 1 HItemID from Gy_Material where HNumber='" + dt.Rows[i]["鐗╂枡缂栫爜"].ToString() + "' ", "Gy_Material");
                 if (ds.Tables[0].Rows.Count == 0)
                 {
                     error = error + $"绗瑊(i + 1)}琛�,鐗╂枡缂栫爜涓簕dt.Rows[i]["鐗╂枡缂栫爜"].ToString()}涓嶅瓨鍦�!";
@@ -246,7 +246,7 @@
                 }
 
                 //鍒ゆ柇瀵煎叆鐗╂枡鐨勬暟閲忔槸鍚﹀ぇ浜庡崟鎹墿鏂欑殑鎬诲拰鏁伴噺
-                ds = oCn.RunProcReturn("select * from h_v_POOrderBill_Excel " +
+                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 鍏抽棴鐘舵��='鏈叧闂�' ", "h_v_POOrderBill_Excel");

--
Gitblit v1.9.1