From da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 28 四月 2026 17:07:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index c9cd240..0c441da 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -875,7 +875,23 @@
var _value = sMainSub["sMainSub"].ToString();
string msg1 = _value.ToString();
//淇濆瓨鍗曟嵁
- return objJsonResult = AddBillMain(msg1);
+ objJsonResult = AddBillMain(msg1);
+
+ JObject resultJObj = JObject.FromObject(objJsonResult);
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))
+ {
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ resultJObj["NotShowTips"] = true;
+ }
+ else
+ {
+ resultJObj["NotShowTips"] = false;
+ }
+ }
+
+ return resultJObj;
}
public json AddBillMain(string msg1)
@@ -1056,7 +1072,7 @@
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
//鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
- var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillOld.omodel.HInterID + "," + 7520, "h_p_OA_WorkLinkBill_Create");
+ var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillNew.omodel.HInterID + "," + 7520, "h_p_OA_WorkLinkBill_Create");
if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
{
@@ -1064,7 +1080,8 @@
LogService.Write("鎵ц娑堟伅鎺ㄩ��..." + HInterID);
// 瑙﹀彂娑堟伅鎺ㄩ��
- new SCGL.Sc_MESTransFerWorkBillController().AuditOA_WorkLinkBill(HInterID, 0, user);
+ Service.GeTuiService.PubishSingle(HInterID);
+
}
}
}
--
Gitblit v1.9.1