From c5a629655949aa14868b66e8517e6c5505b2ad8a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 07 三月 2024 10:26:41 +0800
Subject: [PATCH] 工序工价新增字段；PDA 设备，质量模块查询列表
---
WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
index af22e2f..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";
@@ -498,6 +500,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+ else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏈浜庡鏍哥姸鎬�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.BeginTran();
//鍙嶅啓婧愬崟鏁版嵁
--
Gitblit v1.9.1