From 81689bc05bd2f72cfeaa98ee7f876564c40e26bc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 十月 2022 17:10:49 +0800
Subject: [PATCH] 1

---
 WorkM/流转卡管理/MES_StationOutBillList.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
index 2bb87a6..f6be688 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
@@ -10,6 +10,7 @@
 using DBUtility;
 using System.IO;
 using System.Reflection;
+using Pub_Class;
 
 namespace WorkM
 {
@@ -217,9 +218,12 @@
             {
                 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_StationOutBill_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;
                     }
 
@@ -634,9 +638,9 @@
             for (int i = 0; i < grdMain.SelectedRows.Count; i++)
             {
                 BillSelect oSelect = new BillSelect();
-                oSelect.BillNo = ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[BillNoCol].Value);
-                oSelect.BillMainID = ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
-                oSelect.BillSubID = ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
+                oSelect.BillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[BillNoCol].Value);
+                oSelect.BillMainID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
+                oSelect.BillSubID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
                 oSelect.BillTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
                 oSelect.BillType = ModName;
                 oBillSelectColl.Add(oSelect);

--
Gitblit v1.9.1