From b7ca9d7706ecb5037c9f23b419aa6ba52dcdc048 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 三月 2023 23:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 556e351..fd7de8a 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -445,6 +445,9 @@
{
Main.HBillNo = ListHbillNo[i].HBillNo;
Main.HQty = ListHbillNo[i].HQty;
+ Main.HSplitNo = ListHbillNo[i].HSplitNo;
+ Main.HAuxQty = 0;
+ Main.HAuxUnit = 0;
oBill.omodel = Main;
int j = 0;
@@ -671,7 +674,7 @@
鑹巼 HPassRate,绱鑹巼 HSumPassRate,鍥剧焊缂栧彿 HPicNum,鏈伐搴忕‘璁よ褰� HProcCheckNote,宸ヨ壓鍙傛暟 HTechnologyParameter,HDeptID,
鍔犲伐杞﹂棿浠ｇ爜 HDeptNumber,鍔犲伐杞﹂棿 HDeptName
from h_v_Sc_ProcessExchangeBillQuerySub");
- ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID, "h_v_Sc_ProcessExchangeBillQuerySub");
+ ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + " order by cast(娴佹按鍙� as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
--
Gitblit v1.9.1