From dc7a3e285365ae7ded6c1606b4beb462f99ada84 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index b440953..b6107d7 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -985,7 +985,7 @@
lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
oBill.oModel = lsmain[0];
- LogService.Write("鐗╂枡鍚屾鎻掍欢,淇濆瓨鏂规硶鎵ц瀹屾垚寮傚父锛�"+ msg1);
+ LogService.Write("鐗╂枡锛�"+ msg1);
//淇濆瓨
bool bResult = oBill.AddNewApi();
if (bResult)
@@ -4547,11 +4547,11 @@
}
else
{
- tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HSPGroupID"].ToString();
}
string HWHID = tb2.Rows[i]["HWHID"].ToString();
//鏌ヨ浠撲綅
- ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID+ " and HUSEORGID=" + HORGid + "", "Gy_Warehouse");
+ ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID+ " and HUSEORGID=" + HORGid + "", "Gy_StockPlace");
if (ds.Tables[0].Rows.Count == 0)
{
--
Gitblit v1.9.1