不良评审单、工序进站单、工序出站单、委外接收单、委外发出单删除时增加制单人与删除人是否一致系统参数控制；不良明细良率报表修改优化，原报表取值数据代码里...

yxj

2022-05-17 27d7b50f43c85f12507ab1a61290fa9551d4d780

不良评审单、工序进站单、工序出站单、委外接收单、委外发出单删除时增加制单人与删除人是否一致系统参数控制；不良明细良率报表修改优化，原报表取值数据代码里写死改为取存储过程里数据显示

 LMES/bin/x86/Debug.zip

Binary files differ

 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"]);
                    }

                    //==========生产汇报单
                    //自动审核

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -178,20 +178,25 @@
        public string MES_StationInBill_OneCtl;                 //一张流转卡只允许一次进站
        public string MES_StationInBill_FirstCheckOut;          //必须首件检验通过才能保存单据
        public string MES_StationInBill_ProcessCheckCtl;        //进站单当前工序的上道工序是否做工序检验
        public string MES_StationInBill_DeleteCtl;              //删除单据时制单人与删除人必须一致
        //出站单
        public string MES_StationOutBill_QtyCtl;                //出站数量不能大于本道进站汇总数
        public string MES_StationOutBill_ProcessCheckOut;          //必须工序检验通过才能保存单据
        public string MES_StationOutBill_FirstCheckOut;       //出战单判断本道工序是否做首件检验 
        public string MES_StationOutBill_DeleteCtl;             //删除单据时制单人与删除人必须一致
        //不良品评审单
        public string QC_NoPassProdCheckBill_QtyCtl;            //不良品数不能大于出站单报废数量
        public string QC_NoPassProdCheckBill_BadReasonQtyCtrl;  //不良品评审单不良数量和不良原因总数必须一致
        public string QC_NoPassProdCheckBill_DeleteCtl;         //删除单据时制单人与删除人必须一致
        //委外发出 
        public string MES_StationEntrustInBill_FIFOCtl;         //工站或工序先进先出（同上）
        public string MES_StationEntrustInBill_FullMoveCtl;     //上道完全出站控制（同上）
        public string MES_StationEntrustInBill_QtyCtl;          //进站数量不能大于上道出站汇总合格数（同上）
        public string MES_StationEntrustInBill_OneCtl;          //一张流转卡只允许一次委外发出
        public string MES_StationEntrustInBill_DeleteCtl;       //删除单据时制单人与删除人必须一致
        //委外接收
        public string MES_StationEntrustOutBill_QtyCtl;         //出站数量不能大于本道进站汇总数
        public string MES_StationEntrustOutBill_DeleteCtl;      //删除单据时制单人与删除人必须一致


        //MES

 WorkM/±¨±í·ÖÎö/DefectiveDetailedYieldReport.cs

@@ -137,74 +137,94 @@
        {
            SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
            DataSet DSet = new DataSet();
            ////过滤条件Dlg
            //string sDlgWhere = "";
            //if (txtHProcessExchangeBillNo.Text != "")//流转卡
            //{
            //    sDlgWhere = sDlgWhere + "and c.HProcExchBillNo like '%" + txtHProcessExchangeBillNo.Text + "%'";
            //}
            //if (txtHICMOBillNo.Text != "")//生产订单
            //{
            //    sDlgWhere = sDlgWhere + "and a.HICMOBillNo like '%" + txtHICMOBillNo.Text + "%'";
            //}
            //if (textHmaterName.Text != "")//物料
            //{
            //    sDlgWhere = sDlgWhere + "and b.HName like '%" + textHmaterName.Text + "%'";
            //}
            //if (textHprocName.Text != "")//工序
            //{
            //    sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
            //}
            //if (dtpHBDate.Value.ToShortDateString() != "")//开始日期
            //{
            //    sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
            //}
            //if (dtpHEDate.Value.ToShortDateString() != "")//结束日期
            //{
            //    sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
            //}
            ////过滤条件
            ////string sWhere = "";
            ////sWhere = sWhere + ",'" + this.dtpHBDate.Value.ToShortDateString() + "'";
            ////sWhere = sWhere + ",'" + this.dtpHEDate.Value.ToShortDateString() + "'";
            ////sWhere = sWhere + ",1,3";
            //////sWhere = sWhere + ",'" + frmQuery.dtpHBakEndDate.Value.ToShortDateString() + "'";
            //////sWhere = sWhere + "," + frmQuery.txtHCusID.Tag.ToString().Trim();
            ////if (sWhere.Trim().Length > 0)
            ////{
            ////    sWhere = sWhere.Substring(1, sWhere.Length - 1);
            ////}
            ////
            //DSet = SubCn.RunProcReturn("select " +
            //    "MAX(a.HMakeDate) æ±‡æŠ¥æ—¥æœŸ, a.HICMOBillNo ä»»åŠ¡å•å·, c.HProcExchBillNo æµè½¬å¡å·, c.HProcID, d.HName å·¥åºåç§°" +
            //    ", sum(a.HWorkTimes) å·¥æ—¶, b.HName ç‰©æ–™åç§°, a.HICMOQty ç”Ÿäº§è®¢å•æ•°é‡, a.HPlanQty è®¡åˆ’数量, c.HQty è¿›ç«™æ•°é‡" +
            //    ", co.HQty å‡ºç«™åˆæ ¼æ•°é‡, c.HQty - co.HQty - co.HWasterQty æœªè¿›ç«™æ•°é‡" +
            //    ", co.HWasterQty ä¸åˆæ ¼æ•°é‡, co.HQty /  nullif((co.HQty+co.HWasterQty),0) å‡ºç«™è‰¯çŽ‡,a.hb, co.HName ä¸è‰¯æ˜Žç»†, co.HBadQty ä¸è‰¯æ•°é‡ " +
            //    " FROM Sc_StationOutBillMain a " +
            //    "left join Gy_Material  b on a.HMaterID = b.HItemID " +
            //    "left join( " +
            //    "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
            //    "from Sc_StationInBillMain aa " +
            //    "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
            //    ") c on a.HProcExchInterID = c.HProcExchInterID and a.HProcID = c.HProcID " +
            //    "left join( " +
            //    "select sum(aa.HQty) HQty, sum(aa.HWasterQty) HWasterQty, bad.HBadQty, bad.HName" +
            //    ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
            //    "from Sc_StationOutBillMain aa " +
            //    "left join ( " +
            //    "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
            //    "from QC_NoPassProdCheckBillMain qa " +
            //    "left join QC_NoPassProdCheckBillsub qb on qa.HInterID = qb.HInterID " +
            //    "left join Gy_BadReason qbr on qb.HBadReasonID = qbr.HItemID " +
            //    "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty " +
            //    ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
            //    "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
            //    ") co on a.HProcExchInterID = co.HProcExchInterID and a.HProcID = co.HProcID " +
            //    "left join Gy_Process d on c.HProcID = d.HItemID " +
            //    "where 1 = 1 " + sDlgWhere +
            //    "group by a.HICMOBillNo,c.HProcExchBillNo,d.HName,b.HName,a.HICMOQty,c.HQty,a.HPlanQty" +
            //    ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty " +
            //    "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);





            //过滤条件Dlg
            string sDlgWhere = "";
            if (txtHProcessExchangeBillNo.Text != "")//流转卡
            sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + textHmaterName.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + textHprocName.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
            sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
            if (sDlgWhere.Trim().Length > 0)
            {
                sDlgWhere = sDlgWhere + "and c.HProcExchBillNo like '%" + txtHProcessExchangeBillNo.Text + "%'";
                sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
            }
            if (txtHICMOBillNo.Text != "")//生产订单
            {
                sDlgWhere = sDlgWhere + "and a.HICMOBillNo like '%" + txtHICMOBillNo.Text + "%'";
            }
            if (textHmaterName.Text != "")//物料
            {
                sDlgWhere = sDlgWhere + "and b.HName like '%" + textHmaterName.Text + "%'";
            }
            if (textHprocName.Text != "")//工序
            {
                sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
            }
            if (dtpHBDate.Value.ToShortDateString() != "")//开始日期
            {
                sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
            }
            if (dtpHEDate.Value.ToShortDateString() != "")//结束日期
            {
                sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
            }
            //过滤条件
            //string sWhere = "";
            //sWhere = sWhere + ",'" + this.dtpHBDate.Value.ToShortDateString() + "'";
            //sWhere = sWhere + ",'" + this.dtpHEDate.Value.ToShortDateString() + "'";
            //sWhere = sWhere + ",1,3";
            ////sWhere = sWhere + ",'" + frmQuery.dtpHBakEndDate.Value.ToShortDateString() + "'";
            ////sWhere = sWhere + "," + frmQuery.txtHCusID.Tag.ToString().Trim();
            //if (sWhere.Trim().Length > 0)
            //{
            //    sWhere = sWhere.Substring(1, sWhere.Length - 1);
            //}
            //
            DSet = SubCn.RunProcReturn("select " +
                "MAX(a.HMakeDate) æ±‡æŠ¥æ—¥æœŸ, a.HICMOBillNo ä»»åŠ¡å•å·, c.HProcExchBillNo æµè½¬å¡å·, c.HProcID, d.HName å·¥åºåç§°" +
                ", sum(a.HWorkTimes) å·¥æ—¶, b.HName ç‰©æ–™åç§°, a.HICMOQty ç”Ÿäº§è®¢å•æ•°é‡, a.HPlanQty è®¡åˆ’数量, c.HQty è¿›ç«™æ•°é‡" +
                ", co.HQty å‡ºç«™åˆæ ¼æ•°é‡, c.HQty - co.HQty - co.HWasterQty æœªè¿›ç«™æ•°é‡" +
                ", co.HWasterQty ä¸åˆæ ¼æ•°é‡, co.HQty /  nullif((co.HQty+co.HWasterQty),0) å‡ºç«™è‰¯çŽ‡, co.HName ä¸è‰¯æ˜Žç»†, co.HBadQty ä¸è‰¯æ•°é‡ " +
                " FROM Sc_StationOutBillMain a " +
                "left join Gy_Material  b on a.HMaterID = b.HItemID " +
                "left join( " +
                "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
                "from Sc_StationInBillMain aa " +
                "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
                ") c on a.HProcExchInterID = c.HProcExchInterID and a.HProcID = c.HProcID " +
                "left join( " +
                "select sum(aa.HQty) HQty, sum(aa.HWasterQty) HWasterQty, bad.HBadQty, bad.HName" +
                ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
                "from Sc_StationOutBillMain aa " +
                "left join ( " +
                "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
                "from QC_NoPassProdCheckBillMain qa " +
                "left join QC_NoPassProdCheckBillsub qb on qa.HInterID = qb.HInterID " +
                "left join Gy_BadReason qbr on qb.HBadReasonID = qbr.HItemID " +
                "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty " +
                ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
                "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
                ") co on a.HProcExchInterID = co.HProcExchInterID and a.HProcID = co.HProcID " +
                "left join Gy_Process d on c.HProcID = d.HItemID " +
                "where 1 = 1 " + sDlgWhere +
                "group by a.HICMOBillNo,c.HProcExchBillNo,d.HName,b.HName,a.HICMOQty,c.HQty,a.HPlanQty" +
                ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty " +
                "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);

            DSet = SubCn.RunProcReturn("exec h_p_DefectiveDetailedYieldReport_New " + sDlgWhere, "h_p_DefectiveDetailedYieldReport_New");

            //生成首行标题
            if (DSet == null)
            {

 WorkM/Á÷ת¿¨¹ÜÀí/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)
                    //{

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationEntrustOutBillList.cs

@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
using Pub_Class;

namespace WorkM
{
@@ -262,11 +263,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_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;
                    }

                    //检查是否开票
                    //string d = "";
                    //if (oBill.CheckIsKP(oBill.omodel.HInterID, ref d) == false)

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationInBillList.cs

@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
using Pub_Class;

namespace WorkM
{
@@ -216,9 +217,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_StationInBill_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;
                    }


 WorkM/Á÷ת¿¨¹ÜÀí/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);

 WorkM/³µ¼ä¹ÜÀí/QC_NoPassProdCheckBill.cs

@@ -179,6 +179,15 @@
                return;
            }
            //
            ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
            string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("QC_NoPassProdCheckBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);

            if (DeleteCtl == "Y" && BillOld.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
            {
                MessageBox.Show("登录用户与制单人不一致，不允许删除", "提示");
                return;
            }
            //
            if (MessageBox.Show("确定要删除当前单据？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
            {