From dc21d9a0e78853f81b4c3ec95b5b38bed32d9bc7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 14 十月 2024 11:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index a14f30b..7b484c2 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -2157,7 +2157,7 @@
HProQty = oItemSub.HProQty;
sql = "select * from h_v_Sc_ProcessExchangeBill_BatchSplit where hmainid = " + oItemSub.HICMOInterID + " and hentryid = "
- + oItemSub.HICMOEntryID;
+ + oItemSub.HICMOEntryID + " and HRoutingID = " + oItemSub.HRoutingInterID.ToString();
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBill_BatchSplit");
//涓昏〃璧嬪��
if (ds.Tables[0].Rows.Count > 0 && ds != null)
@@ -2341,6 +2341,8 @@
oItemSubs.HSeOrderInterID = 0;
oItemSubs.HSeOrderEntryID = 0;
oItemSubs.HSNCtrl = false;
+ oItemSubs.HRoutingBillMainID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HRoutingID"]);
+ oItemSubs.HRoutingBillEntryID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HRoutingEntryID"]);
oBill.DetailColl.Add(oItemSubs);//娣诲姞鏄庣粏琛屽��
}
--
Gitblit v1.9.1