From f18eac47472b4d7182e3e88d48216df0ff6ab5e2 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 08 四月 2026 17:11:38 +0800
Subject: [PATCH] 增加设备工艺参数的点检系统参数 -是否安灯 -NG是否发送工艺参数，通过审核进行触发系统参数，条码生产华舟增加自定义字段 总箱数，开工单大日志看为啥快捷开工是创建状态
---
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index 527ba00..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+ " 瀹℃牳鎴愬姛锛�";
@@ -777,12 +794,13 @@
//杩斿洖鍒楄〃淇℃伅
ds = oCn.RunProcReturn(sql, "h_p_SB_EquipCMOTechParamBillListEdit_GetCurrRecord");
+
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ヨ澶囧伐鑹哄弬鏁拌鍗曠偣妫�琛紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
- objJsonResult.data = null;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
else
--
Gitblit v1.9.1