Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2023-08-03 0fb2957ffd729c1f09b51a73aa2af1c3d39fdcad

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

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

namespace WorkM
{
@@ -46,6 +47,11 @@
            DataSet DSet;
            string sSql = "";
            string sWhere = "";

            if (chkWJieAn.Checked == true)
            {
                sWhere = " and HBillStatus<>3 ";
            }

            if (frmCondition.SqlStr.Trim().Length == 0)
            {
@@ -153,6 +159,7 @@
            oSumGrid.ogrdMain = grdMain;  //初始化 new
            oSumGrid.oGridsum = grdSum;
            initGrid();
            chkWJieAn.Checked = true;
        }

        private void grdMain_DblClick(object sender, EventArgs e)
@@ -211,11 +218,26 @@
            {
                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 s = "";
                    int sYear = 0;
                    int sPeriod = 0;
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(oBill.omodel.HDate), ref sYear, ref sPeriod, ref s) == false)
                    {
                        MessageBox.Show(s, "提示");
                        return;
                    }


                    string c = "";

                    SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -616,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);
@@ -643,5 +665,19 @@
            DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);

        }

        private void fj_Click(object sender, EventArgs e)
        {
            if (grdMain.CurrentRow == null)
                return;
            string sBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("单据号")].Value);
            if (sBillNo.Trim() != "")
            {
                BLL.Xt_File oFile = new BLL.Xt_File();
                oFile.HBillType = ModName;
                oFile.HBillNo = sBillNo;
                oFile.ShowDialog();
            }
        }
    }
}