From af78744eacb1e41ef2ba7a2e36cde3f915100ba2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 09 四月 2026 13:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index f2030dd..2b608f1 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -334,7 +334,24 @@
return objJsonResult;
}
else
- {
+ {
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ // 鎷兼帴涓や釜鍙傛暟锛氬畨鐏�,NG鍙傛暟
+ string oa = oSystemParameter.omodel.SB_EquipICMOTechParamBill_OAErrMsg;//绯荤粺鍙傛暟 鏄惁杩涜瀹夌伅
+ string ng = oSystemParameter.omodel.SB_EquipICMOTechParamBill_ErrMsg;//绯荤粺鍙傛暟 鏄惁鍙戦�丯G宸ヨ壓鍙傛暟淇℃伅
+
+ // 鐢ㄩ�楀彿鎷兼帴锛屽墠绔寜閫楀彿鎷嗗垎
+ objJsonResult.Verify = oa + "," + ng;
+ }
+ else
+ {
+ // 澶辫触鏃剁粰榛樿鍊�
+ objJsonResult.Verify = "N,N";
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鍗曟嵁鍙凤細"+ oBill.omodel.HBillNo+ " 瀹℃牳鎴愬姛锛�";
--
Gitblit v1.9.1