From 96475c2fd6a0f8b11c24f06ca65d9d8955302b26 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 27 十月 2025 08:12:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 151 insertions(+), 0 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 1ae017b..9748ac5 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -246,6 +246,10 @@
{
omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_AutoBarCode")
+ {
+ omodel.Kf_POStockInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_ERPMode")
{
omodel.Kf_POStockInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -327,6 +331,10 @@
{
omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_AutoBarCode")
+ {
+ omodel.Kf_ProductInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_ERPMode")
{
omodel.Kf_ProductInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -403,6 +411,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
{
omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_AutoBarCode")
+ {
+ omodel.Kf_OtherInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_ERPMode")
{
@@ -543,6 +555,10 @@
{
omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_MateOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_ERPMode")
{
omodel.Kf_MateOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -636,6 +652,10 @@
{
omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_SellOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_ERPMode")
{
omodel.Kf_SellOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -716,6 +736,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
{
omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_OtherOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_ERPMode")
{
@@ -802,6 +826,10 @@
{
omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_EntrustOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_ERPMode")
{
omodel.Kf_EntrustOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -883,6 +911,10 @@
{
omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_MateReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_ERPMode")
{
omodel.Kf_MateReplenishOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -963,6 +995,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
{
omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_ERPMode")
{
@@ -1048,6 +1084,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_SourceBarCodeCtl")
{
omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_AutoBarCode")
+ {
+ omodel.Kf_MoveStockBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_ERPMode")
{
@@ -2054,6 +2094,12 @@
{
omodel.Sc_MESStopWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //==========停工恢复单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESStopRestoreWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESStopWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========产量汇报单
//自动审核
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoCheck")
@@ -2170,6 +2216,71 @@
omodel.QC_FirstPieceCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //=============================来料检验单
+ //保存后是否自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_POStockInCheckBill_AutoCheck")
+ {
+ omodel.QC_POStockInCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //保存后变为新增状态
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_POStockInCheckBill_SaveAutoAddnew")
+ {
+ omodel.QC_POStockInCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //删除人必须是制单人
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_POStockInCheckBill_DeleterAndMakerMustSame")
+ {
+ omodel.QC_POStockInCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //质检方案来源
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_POStockInCheckBill_QCSchemeSource")
+ {
+ omodel.QC_POStockInCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=============================出厂检验单
+ //保存后是否自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_OutCompCheckBill_AutoCheck")
+ {
+ omodel.QC_OutCompCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //保存后变为新增状态
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_OutCompCheckBill_SaveAutoAddnew")
+ {
+ omodel.QC_OutCompCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //删除人必须是制单人
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_OutCompCheckBill_DeleterAndMakerMustSame")
+ {
+ omodel.QC_OutCompCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //质检方案来源
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_OutCompCheckBill_QCSchemeSource")
+ {
+ omodel.QC_OutCompCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=============================入库检验单
+ //保存后是否自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_LastPieceCheckBill_AutoCheck")
+ {
+ omodel.QC_LastPieceCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //保存后变为新增状态
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_LastPieceCheckBill_SaveAutoAddnew")
+ {
+ omodel.QC_LastPieceCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //删除人必须是制单人
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_LastPieceCheckBill_DeleterAndMakerMustSame")
+ {
+ omodel.QC_LastPieceCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //质检方案来源
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_LastPieceCheckBill_QCSchemeSource")
+ {
+ omodel.QC_LastPieceCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=============================巡检单
@@ -2576,6 +2687,10 @@
{
omodel.Kf_POStockInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_AutoBarCode")
+ {
+ omodel.Kf_POStockInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_ERPMode")
{
omodel.Kf_POStockInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2657,6 +2772,10 @@
{
omodel.Kf_ProductInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_AutoBarCode")
+ {
+ omodel.Kf_ProductInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_ERPMode")
{
omodel.Kf_ProductInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2733,6 +2852,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_SourceBarCodeCtl")
{
omodel.Kf_OtherInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_AutoBarCode")
+ {
+ omodel.Kf_OtherInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_ERPMode")
{
@@ -2873,6 +2996,10 @@
{
omodel.Kf_MateOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_MateOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_ERPMode")
{
omodel.Kf_MateOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2966,6 +3093,10 @@
{
omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_SellOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_ERPMode")
{
omodel.Kf_SellOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3046,6 +3177,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_SourceBarCodeCtl")
{
omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_OtherOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_ERPMode")
{
@@ -3132,6 +3267,10 @@
{
omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_EntrustOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_ERPMode")
{
omodel.Kf_EntrustOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3213,6 +3352,10 @@
{
omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_MateReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_ERPMode")
{
omodel.Kf_MateReplenishOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3293,6 +3436,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl")
{
omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_AutoBarCode")
+ {
+ omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_ERPMode")
{
@@ -3379,6 +3526,10 @@
{
omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_AutoBarCode")
+ {
+ omodel.Kf_MoveStockBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_ERPMode")
{
omodel.Kf_MoveStockBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
--
Gitblit v1.9.1