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
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 130 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 1 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 0dfe75b..3a9380d 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2450,8 +2450,18 @@
{
omodel.SB_EquipICMOTechParamBill_Check = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //审核后是否安灯
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_OAErrMsg")
+ {
+ omodel.SB_EquipICMOTechParamBill_OAErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //审核后是否发送NG工艺参数消息
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_ErrMsg")
+ {
+ omodel.SB_EquipICMOTechParamBill_ErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
-
+
//=========工序委外发出单
//自动新增
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
@@ -2787,6 +2797,59 @@
omodel.Sc_ShiftsBeginInfoBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //=========模具点检记录单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldDotCheckBill_AutoCheck")
+ {
+ omodel.Sc_MouldDotCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具保养记录单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMaintainBill_AutoCheck")
+ {
+ omodel.Sc_MouldMaintainBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具故障登记单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldConkBookBill_AutoCheck")
+ {
+ omodel.Sc_MouldConkBookBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具维修派工单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairSendWorkBill_AutoCheck")
+ {
+ omodel.Sc_MouldRepairSendWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具维修记录单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairWorkBill_AutoCheck")
+ {
+ omodel.Sc_MouldRepairWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具维修验收单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairCheckBill_AutoCheck")
+ {
+ omodel.Sc_MouldRepairCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========上模单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldUpperBill_AutoCheck")
+ {
+ omodel.Sc_MouldUpperBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========下模单 - 必须做上模单才能生成下模单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_MouldUpper")
+ {
+ omodel.Sc_MouldLowerBill_MouldUpper = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========下模单 - 自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_AutoCheck")
+ {
+ omodel.Sc_MouldLowerBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
// 投料防错表是否启用 投料校验(反写物料档案 单据状态)
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_FeedingErrorProofingBill_BarCodeCTL")
@@ -2809,6 +2872,12 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_BarCodeBill_Rework_Ctrl")
{
omodel.Gy_BarCodeBill_Rework_Ctrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ // 取样单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
+ {
+ omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
}
sReturn = "显示单据成功！";
@@ -5559,6 +5628,65 @@
{
omodel.HR_PostSkillBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+
+ //=========模具点检记录单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldDotCheckBill_AutoCheck")
+ {
+ omodel.Sc_MouldDotCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具保养记录单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMaintainBill_AutoCheck")
+ {
+ omodel.Sc_MouldMaintainBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具故障登记单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldConkBookBill_AutoCheck")
+ {
+ omodel.Sc_MouldConkBookBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具维修派工单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairSendWorkBill_AutoCheck")
+ {
+ omodel.Sc_MouldRepairSendWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具维修记录单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairWorkBill_AutoCheck")
+ {
+ omodel.Sc_MouldRepairWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========模具维修验收单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairCheckBill_AutoCheck")
+ {
+ omodel.Sc_MouldRepairCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========上模单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldUpperBill_AutoCheck")
+ {
+ omodel.Sc_MouldUpperBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========下模单 - 必须做上模单才能生成下模单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_MouldUpper")
+ {
+ omodel.Sc_MouldLowerBill_MouldUpper = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========下模单 - 自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_AutoCheck")
+ {
+ omodel.Sc_MouldLowerBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //=========取样单 - 自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
+ {
+ omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
}
sReturn = "显示单据成功！";
return true;
--
Gitblit v1.9.1