From c07bb60b39a9fbf5c41a724c7060f45c821f93ff Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 04 三月 2024 17:27:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
index e78e6ca..44988ea 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
@@ -488,8 +488,10 @@
                     }
 
                     //妫�鏌ユ簮鍗曟槸鍚﹀瓨鍦�
-                    string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
-                    ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub");
+                    string sql = "select * from Sc_ICMOBillMain as a " +
+                        " inner join Sc_ICMOBillSub as b on a.HInterID = b.HInterID " +
+                        " where b.HInterID = " + oBill.omodel.HMainSourceInterID + " and b.HEntryID =" + oBill.omodel.HMainSourceEntryID;
+                    ds = oCN.RunProcReturn(sql, "Sc_ICMOBill");
                     if(ds==null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";

--
Gitblit v1.9.1