From 27d7b50f43c85f12507ab1a61290fa9551d4d780 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 17 五月 2022 16:58:35 +0800
Subject: [PATCH] 不良评审单、工序进站单、工序出站单、委外接收单、委外发出单删除时增加制单人与删除人是否一致系统参数控制;不良明细良率报表修改优化,原报表取值数据代码里写死改为取存储过程里数据显示

---
 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 4a18d08..e95380d 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -662,7 +662,11 @@
                     {
                         omodel.MES_StationInBill_ProcessCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-
+                    //删除单据时制单人与删除人必须一致
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DeleteCtl")
+                    {
+                        omodel.MES_StationInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
                     //===============出站单
                     //出站数量不能大于本道进站汇总数
@@ -674,6 +678,11 @@
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FirstCheckOut")
                     {
                         omodel.MES_StationOutBill_FirstCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    //删除单据时制单人与删除人必须一致
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_DeleteCtl")
+                    {
+                        omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
                     //=====不良评审单
@@ -687,6 +696,12 @@
                     {
                         omodel.QC_NoPassProdCheckBill_BadReasonQtyCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //删除单据时制单人与删除人必须一致
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_NoPassProdCheckBill_DeleteCtl")
+                    {
+                        omodel.QC_NoPassProdCheckBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+
                     //=======委外发出
                     //工站或工序先进先出(同上)
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
@@ -708,6 +723,11 @@
                     {
                         omodel.MES_StationEntrustInBill_OneCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //删除单据时制单人与删除人必须一致
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_DeleteCtl")
+                    {
+                        omodel.MES_StationEntrustInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
                     //===========委外接收单
                     //出站数量不能大于本道进站汇总数
@@ -715,6 +735,11 @@
                     {
                         omodel.MES_StationEntrustOutBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //删除单据时制单人与删除人必须一致
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_DeleteCtl")
+                    {
+                        omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
                     //==========生产汇报单
                     //自动审核

--
Gitblit v1.9.1