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

---
 WorkM/流转卡管理/MES_StationEntrustInBillList.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
index ec5b2b8..8b46c94 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
@@ -10,6 +10,7 @@
 using DBUtility;
 using System.IO;
 using System.Reflection;
+using Pub_Class;
 
 namespace WorkM
 {
@@ -263,11 +264,15 @@
             {
                 if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.OK)
                 {
-                    if (oBill.omodel.HMaker != ClsPub.CurUserName && (ClsPub.CurUserName != "admin" && ClsPub.CurUserName != "Admin"))
+                    ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+                    string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("MES_StationEntrustInBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+                    if (DeleteCtl == "Y" && oBill.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
                     {
-                        MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
+                        MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
                         return;
                     }
+
                     string c = "";
                     //if (oBill.DeleteCheck(oBill.omodel.HInterID, "濮斿鍙戝嚭鍗�", ref c) == false)
                     //{

--
Gitblit v1.9.1