From 38189dd485d2d171bcca2e0ced35d6c8d187bdd3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 06 二月 2023 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Gy_MateMouldController.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/Gy_MateMouldController.cs b/WebAPI/Controllers/Gy_MateMouldController.cs
index 4d2fc06..d92ce2b 100644
--- a/WebAPI/Controllers/Gy_MateMouldController.cs
+++ b/WebAPI/Controllers/Gy_MateMouldController.cs
@@ -183,7 +183,7 @@
}
else
{
- bResult = BillNew.ModifyByID(DBUtility.ClsPub.isLong(mainList[0].HItemID));
+ bResult = BillNew.ModifyByID(DBUtility.ClsPub.isLong(subList[0].HItemID));
}
//鎻愮ず
if (bResult == true)
@@ -234,8 +234,8 @@
// " left join Gy_Material c on a.HMaterID = c.HItemID " +
// " left join Gy_Unit d on a.HUnitID = d.HItemID where a.HItemID = " + HItemID, "Gy_MateMouldInfo");
ds = oCN.RunProcReturn("select " +
- "a.HItemID,a.妯″叿浜у搧瀵瑰簲琛ㄤ唬鐮�,a.HUnitID,b.HName 妯″叿鍚嶇О" +
- ",b.HNumber 妯″叿浠ｇ爜,a.HMaterID HMaterIDCol,c.HNumber 鐗╂枡浠ｇ爜,c.HName 鐗╂枡鍚嶇О,c.HModel 瑙勬牸鍨嬪彿" +
+ "a.HItemID,a.妯″叿浜у搧瀵瑰簲琛ㄤ唬鐮�,a.HUnitID,b.hitemid HMouldIDCol,b.HNumber 妯″叿浠ｇ爜" +
+ ",b.HName 妯″叿鍚嶇О,a.HMaterID HMaterIDCol,c.HNumber 鐗╂枡浠ｇ爜,c.HName 鐗╂枡鍚嶇О,c.HModel 瑙勬牸鍨嬪彿" +
",a.HRelationID HRelationIDCol,d.HNumber 鍗曚綅浠ｇ爜,d.HName 鍗曚綅鍚嶇О" +
",a.HUnitID HUnitIDCol" +
",a.寮�濮嬫棩鏈�,a.缁撴潫鏃ユ湡" +
--
Gitblit v1.9.1