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

ch

2022-05-07 64eee12be4c7d513ac170bf13889b3de50be7f2b

 BaseSet/¹«ÓÃ×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/Gy_StdWorkTimes.cs

@@ -32,6 +32,8 @@
        public const Int16 HLowerlimit = 11;
        public const Int16 HUSEORGID = 12;
        public const Int16 HRemarkCol = 13;
        public const Int16 HStdPiece = 14;
        public const Int16 HStdPric = 15;
        public bool BillChange;   //
        public DBUtility.ClsPub.Enum_OKTag OkTag;
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -46,8 +48,9 @@
        public DAL.ClsGy_StdWorkTimes_Ctl BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
        public Model.ClsGy_StdWorkTimes_Model BillOld = new Model.ClsGy_StdWorkTimes_Model();
        ClsGridViewSum oSumGrid = new ClsGridViewSum();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        

        #region å›ºå®šä»£ç 
        //合计
        private void Total()
@@ -58,12 +61,12 @@
        private void bclk_Click(object sender, EventArgs e)
        {
            //保存列宽
            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain1, this.Name);
        }

        private void mrlk_Click(object sender, EventArgs e)
        {
            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain1, this.Name);
        }
       
        //清空界面
@@ -184,10 +187,13 @@
        {
            //打印初始化    
            oSumGrid.NoCol = HSnoCol;
            oSumGrid.ogrdMain = grdMain;
            oSumGrid.ogrdMain = grdMain1;
            oSumGrid.oGridsum = grdSum;
            lblCaption.Text = ModName;
            textBox1.Hide();
            textBox2.Hide();
            this.Text = ModName;
           
        }


@@ -236,7 +242,59 @@
        //修改按纽
        private void xg_Click(object sender, EventArgs e)
        {
            this.Sub_EditBill();
            try
            {
                if (Convert.ToDecimal(txtHStdWorkTimes.Text.ToString())<=0)
                {
                    MessageBox.Show("标准工时必须大于0", "提示");
                    return;
                }
                if (Convert.ToDecimal(txtHUpperlimit.Text) <= 0)
                {
                    MessageBox.Show("上限比例必须大于0", "提示");
                    return;
                }
                if (Convert.ToDecimal(txtHLowerlimit.Text) <= 0)
                {
                    MessageBox.Show("下线比例必须大于0", "提示");
                    return;
                }
                if (Convert.ToDecimal(txtHStdPiece.Text) <= 0)
                {
                    MessageBox.Show("标准计件必须大于0", "提示");
                    return;
                }
                if (Convert.ToDecimal(txtHStdPric.Text) <= 0)
                {
                    MessageBox.Show("标准计价必须大于0", "提示");
                    return;
                }
                string sql = string.Format(@"Update Gy_StdWorkTimes set" +
                            " HMaterID=" + textBox1.Text +
                            ",HProcID=" + textBox2.Text +
                            ",HStdWorkTimes=" + txtHStdWorkTimes.Text +
                            ",HUpperlimit=" + txtHUpperlimit.Text +
                            ",HLowerlimit=" + txtHLowerlimit.Text +
                            ",HStdPiece=" + txtHStdPiece.Text +
                            ",HStdPric=" + txtHStdPric.Text +
                            ",HMaker='" + DBUtility.ClsPub.CurUserName + "'" +
                            ",HMakeDate='" + DateTime.Now + "'" +
                            ",HUSEORGID=" + DBUtility.ClsPub.HOrgID +
                             " where HItemID=" + BillOld.HItemID);
                oCn.BeginTran();
                oCn.RunProc(sql);
                oCn.Commit();
                MessageBox.Show("修改成功,请退出并刷新", "提示");
            }
            catch (Exception)
            {
                oCn.RollBack();
                MessageBox.Show("修改失败", "提示");
                throw;
            }
            

            
        }
        //删除按钮
        private void sc_Click(object sender, EventArgs e)
@@ -293,7 +351,7 @@
        {
            timer1.Enabled = false;
            Sub_ControlLocation();
            if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)//|| BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Viewonly
            if (BillOld.HItemID.ToString()!=null&& BillOld.HItemID.ToString() !="0")//|| BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Viewonly
            {
                this.Sub_ShowBill();
            }
@@ -324,37 +382,27 @@
        {
            switch (BillStatus)
            {
                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
                    //case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Viewonly:
                    //浏览状态
                    yl.Enabled = true;
                    xz.Enabled = true;
                case 0:
                    xg.Enabled = true;
                    sc.Enabled = true;
                    AddRow.Enabled = false;
                    DelRow.Enabled = false;
                    bc.Enabled = false;
                    tc.Enabled = true;
                    //未审核
                    if (txtHChecker.Text.Trim() == "")
                    {
                        xg.Enabled = true;
                        sc.Enabled = true;
                    }
                    else
                    {
                        xg.Enabled = false;
                        sc.Enabled = false;
                    }
                    Sub_LrtextStatus(true);
                    grdStatus = true;
                    break;
                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
                    xg.Enabled = true;
                    AddRow.Enabled = false;
                    DelRow.Enabled = false;
                    bc.Enabled = false;
                    tc.Enabled = true;
                    Sub_LrtextStatus(false);
                    grdStatus = false;
                    break;
                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
                    //新增状态
                    yl.Enabled = false;
                    xz.Enabled = false;
                    xg.Enabled = false;
                    sc.Enabled = false;
                    AddRow.Enabled = true;
                    DelRow.Enabled = true;
                    bc.Enabled = true;
@@ -364,10 +412,7 @@
                    break;
                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
                    //修改状态
                    yl.Enabled = false;
                    xz.Enabled = false;
                    xg.Enabled = false;
                    sc.Enabled = false;
                    AddRow.Enabled = true;
                    DelRow.Enabled = true;
                    bc.Enabled = true;
@@ -375,6 +420,7 @@
                    Sub_LrtextStatus(true);
                    grdStatus = true;
                    break;

            }

        }
@@ -387,60 +433,27 @@
            DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();
            DAL.ClsIF_Process_View oProc = new DAL.ClsIF_Process_View();
            //判断是否存在单据
            if (BillNew.ShowBill(BillOld.HItemID, ref ClsPub.sExeReturnInfo) == false)
            {
                MessageBox.Show(ClsPub.sExeReturnInfo, "提示");
                return;
            }
            DataSet DsSub = oCn.RunProcReturn("Select * from h_v_Gy_StdWorkTimesListNew Where HitemID=" + BillOld.HItemID.ToString(), "Gy_StdWorkTimes");
            DataRow dr = DsSub.Tables[0].Rows[0];
            
            //清空
            Sub_ClearBill();
            
            //
            this.txtHMaker.Text = BillOld.HMaker;
            this.txtHMakeDate.Text = BillOld.HMakeDate;
            this.txtHChecker.Text = BillOld.HChecker;

            //加载表体
            initGrid();
            int i = 0;
            foreach (Model.ClsGy_StdWorkTimes_Model oSub in BillNew.DetailColl)
            {
                //
                if (i >= grdMain.RowCount - 1)
                    grdMain.Rows.Add();
                grdMain.Rows[i].Cells[HTagCol].Value = "*";
                grdMain.Rows[i].Cells[HMaterIDCol].Value = oSub.HMaterID.ToString();
                if (oMater.GetInfoByID(oSub.HMaterID))
                {
                    grdMain.Rows[i].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
                    grdMain.Rows[i].Cells[HMaterNameCol].Value = oMater.omodel.HName;
                    grdMain.Rows[i].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
                }
                else
                {
                    grdMain.Rows[i].Cells[HMaterNumberCol].Value = "";
                    grdMain.Rows[i].Cells[HMaterNameCol].Value = "";
                    grdMain.Rows[i].Cells[HMaterModelCol].Value = "";
                }
                grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
                if (oProc.GetInfoByID(oSub.HProcID))
                {
                    grdMain.Rows[i].Cells[HProcNumberCol].Value = oProc.omodel.HNumber;
                    grdMain.Rows[i].Cells[HProcNameCol].Value = oProc.omodel.HName;
                }
                else
                {
                    grdMain.Rows[i].Cells[HProcNumberCol].Value = "";
                    grdMain.Rows[i].Cells[HProcNameCol].Value = "";
                }
                
                grdMain.Rows[i].Cells[HStdWorkTimes].Value = oSub.HStdWorkTimes.ToString();
                grdMain.Rows[i].Cells[HUpperlimit].Value = oSub.HUpperlimit.ToString();
                grdMain.Rows[i].Cells[HLowerlimit].Value = oSub.HLowerlimit.ToString();
                grdMain.Rows[i].Cells[HUSEORGID].Value = oSub.HUSEORGID.ToString();
                grdMain.Rows[i].Cells[HRemarkCol].Value = oSub.HRemark;
                i = i + 1;
            }
            //
            this.textBox1.Text = dr["HMaterID"].ToString();
            this.txtHMaterID.Text = dr["物料代码"].ToString();
            this.txtHMaterName.Text = dr["物料名称"].ToString();
            this.txtHMaterModel.Text = dr["规格型号"].ToString();
            this.textBox2.Text = dr["HProcID"].ToString();
            this.txtHProcID.Text = dr["工序代码"].ToString();
            this.txtHProcName.Text = dr["工序名称"].ToString();
            this.txtHStdWorkTimes.Text = dr["标准工时"].ToString();
            this.txtHUpperlimit.Text = dr["上线比例"].ToString();
            this.txtHLowerlimit.Text = dr["下线比例"].ToString();
            this.txtHStdPiece.Text = dr["标准计件"].ToString();
            this.txtHStdPric.Text = dr["标准计价"].ToString();

            
            //GRID允许刷新
            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
            //合计
@@ -453,30 +466,25 @@
        //单据完整性判断          æœªå®Œæˆ
        private bool Sub_AllowSave()
        {
            //必输项目是否为空
            //ClsK3_DepartmentHlp oDept = new ClsK3_DepartmentHlp();
            //if(!oDept.GetInfoByID(ClsPub.isLong(txtHDeptID.Tag)))
            //{
            //    MessageBox.Show("部门不存在！");
            //    return false;
            //}

            //明细表是否为零行
            bool b = false;
            for (int i = 0; i < grdMain.RowCount; i++)
            {
                if (!IsNullRow(i))
                {
                    b = true;
                    break;
                }
            }
            if (b == false)
            if (!IsNullRow(0))
            {
                MessageBox.Show("表体明细行不存在！请录入！", "提示");
                return false;
            }
            return true;
            else
            {

                return true;
            }
        }
        //是否是空行
        private bool IsNullRow(int Row)
        {
            if (ClsPub.isInt(grdMain1.Rows[Row].Cells[HMaterIDCol].Value) == 0&& ClsPub.isInt(grdMain1.Rows[Row].Cells[HProcIDCol].Value) == 0&& ClsPub.isDoule( grdMain1.Rows[Row].Cells[HStdWorkTimes].Value )== 0&& ClsPub.isDoule(grdMain1.Rows[Row].Cells[HUpperlimit].Value) == 0&& ClsPub.isDoule(grdMain1.Rows[Row].Cells[HLowerlimit].Value) == 0&& ClsPub.isStrNull(grdMain1.Rows[Row].Cells[HRemarkCol].Value) == ""&& ClsPub.isDoule(grdMain1.Rows[Row].Cells[HStdPiece].Value) == 0&& ClsPub.isDoule(grdMain1.Rows[Row].Cells[HStdPiece].Value) == 0)
            {
                return true;
            }
            return false;
        }
        //保存单据
        private bool Sub_SaveBill()
@@ -485,35 +493,51 @@
            Int32 i;
            bool bResult;
            BillNew = new DAL.ClsGy_StdWorkTimes_Ctl();
            //编辑权限
            //if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
            //{
            //    return false;
            //}
            
            //失去焦点
            lblCaption.Focus();
            //
            if (!Sub_AllowSave())//单据完整性判断
                return false;
            { return false; }

            //
            //明细类赋值
            BillNew.DetailColl = new List<Model.ClsGy_StdWorkTimes_Model>();
            for (i = 0; i <= grdMain.RowCount - 1; i++)
            for (i = 0; i <= grdMain1.RowCount - 1; i++)
            {
                if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 && DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value) != 0)
                if (IsNullRow(i))
                {
                    Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
                    oSub.HMaterID = ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value);
                    oSub.HProcID = ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value);
                    oSub.HStdWorkTimes = ClsPub.isDoule(grdMain.Rows[i].Cells[HStdWorkTimes].Value);
                    oSub.HUpperlimit = ClsPub.isDoule(grdMain.Rows[i].Cells[HUpperlimit].Value);
                    oSub.HLowerlimit = ClsPub.isDoule(grdMain.Rows[i].Cells[HLowerlimit].Value);
                    oSub.HUSEORGID = ClsPub.HOrgID;
                    oSub.HStopflag = true;
                    oSub.HMaker = ClsPub.CurUserName;
                    oSub.HMakeDate = DateTime.Today.ToString();
                    oSub.HRemark = ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
                    BillNew.DetailColl.Add(oSub);
                    break;
                }
                if (DBUtility.ClsPub.isStrNull(grdMain1.Rows[i].Cells[HMaterIDCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain1.Rows[i].Cells[HProcIDCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain1.Rows[i].Cells[HStdWorkTimes].Value) != "")
                {
                    if (DBUtility.ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdWorkTimes].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain1.Rows[i].Cells[HUpperlimit].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain1.Rows[i].Cells[HLowerlimit].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdPiece].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdPric].Value) > 0)
                    {
                        Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
                        oSub.HMaterID = ClsPub.isLong(grdMain1.Rows[i].Cells[HMaterIDCol].Value);
                        oSub.HProcID = ClsPub.isLong(grdMain1.Rows[i].Cells[HProcIDCol].Value);
                        oSub.HStdWorkTimes = ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdWorkTimes].Value);
                        oSub.HUpperlimit = ClsPub.isDoule(grdMain1.Rows[i].Cells[HUpperlimit].Value);
                        oSub.HLowerlimit = ClsPub.isDoule(grdMain1.Rows[i].Cells[HLowerlimit].Value);
                        oSub.HStdPiece = ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdPiece].Value);
                        oSub.HStdPric = ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdPric].Value);
                        oSub.HUSEORGID = ClsPub.HOrgID;
                        oSub.HStopflag = false;
                        oSub.HMaker = ClsPub.CurUserName;
                        oSub.HMakeDate = DateTime.Today.ToString();
                        oSub.HRemark = ClsPub.isStrNull(grdMain1.Rows[i].Cells[HRemarkCol].Value);
                        BillNew.DetailColl.Add(oSub);
                    }
                    else
                    {
                        MessageBox.Show("第" + (i + 1) + "行,标准工时,上限比例,下限比例，标准计件和标准计价都应大于0", "提示");
                        return false;
                    }
                }
                else
                {
                    MessageBox.Show("第" + (i + 1) + "行,物料、工序和标准工时不能为空", "提示");
                    return false;
                }
            }
            //保存完毕后处理
@@ -568,34 +592,39 @@
        //初始化GRID
        private void initGrid()
        {
            grdMain.ColumnCount = 22;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
            grdMain1.ColumnCount = 22;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain1, this.Name);
            //
            grdMain.Columns[HMaterIDCol].HeaderText = "物料ID";
            grdMain.Columns[HMaterNumberCol].HeaderText = "物料代码";
            grdMain.Columns[HMaterNameCol].HeaderText = "物料名称";
            grdMain.Columns[HMaterModelCol].HeaderText = "规格型号";
            grdMain.Columns[HProcIDCol].HeaderText = "工序ID";
            grdMain.Columns[HProcNumberCol].HeaderText = "工序代码";
            grdMain.Columns[HProcNameCol].HeaderText = "工序名称";
            grdMain1.Columns[HMaterIDCol].HeaderText = "物料ID";
            grdMain1.Columns[HMaterNumberCol].HeaderText = "物料代码";
            grdMain1.Columns[HMaterNameCol].HeaderText = "物料名称";
            grdMain1.Columns[HMaterModelCol].HeaderText = "规格型号";
            grdMain1.Columns[HProcIDCol].HeaderText = "工序ID";
            grdMain1.Columns[HProcNumberCol].HeaderText = "工序代码";
            grdMain1.Columns[HProcNameCol].HeaderText = "工序名称";

            grdMain.Columns[HStdWorkTimes].HeaderText = "标准工时";
            grdMain.Columns[HUpperlimit].HeaderText = "上限比例";
            grdMain.Columns[HLowerlimit].HeaderText = "下限比例";
            grdMain.Columns[HUSEORGID].HeaderText = "组织ID";
            grdMain.Columns[HRemarkCol].HeaderText = "备注";
            grdMain1.Columns[HStdWorkTimes].HeaderText = "标准工时";
            grdMain1.Columns[HUpperlimit].HeaderText = "上限比例";
            grdMain1.Columns[HLowerlimit].HeaderText = "下限比例";
            grdMain1.Columns[HStdPiece].HeaderText = "标准计件";
            grdMain1.Columns[HStdPric].HeaderText = "标准计价";

            grdMain1.Columns[HUSEORGID].HeaderText = "组织ID";
            grdMain1.Columns[HRemarkCol].HeaderText = "备注";
            //
            //隐藏列
            grdMain.Columns[HTagCol].Visible = false;
            grdMain.Columns[HProcIDCol].Visible = false;
            grdMain.Columns[HMaterIDCol].Visible = false;
            grdMain.Columns[HUSEORGID].Visible = false;
            grdMain1.Columns[HTagCol].Visible = false;
            grdMain1.Columns[HProcIDCol].Visible = false;
            grdMain1.Columns[HMaterIDCol].Visible = false;
            grdMain1.Columns[HUSEORGID].Visible = false;
            //可编辑列
            string sAllowCol = HMaterNumberCol.ToString() +
                            "," + HProcNumberCol.ToString() +
                            "," + HStdWorkTimes.ToString() +
                            "," + HUpperlimit.ToString() +
                            "," + HLowerlimit.ToString() +
                            "," + HStdPiece.ToString() +
                            "," + HStdPric.ToString() +
                            "," + HRemarkCol.ToString();
            //合计列
            string sTotalCol = "";
@@ -661,15 +690,6 @@
            oSumGrid.EditStatus = false;
            return true;
        }
        //是否是空行
        private bool IsNullRow(int Row)
        {
            if (ClsPub.isInt(grdMain.Rows[Row].Cells[HMaterIDCol].Value) == 0)
            {
                return true;
            }
            return false;
        }
        //'判断网格行的录入是否正确
        private bool CheckGridRow(int Row)
        {
@@ -708,26 +728,26 @@
                        {
                            case HMaterNumberCol:
                                //BLL.ClsBaseSelect_K3.SetGridByMater_K3(grdMain, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
                                BLL.ClsBaseSelect_InterFace.SetGridByMater(grdMain, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
                                BLL.ClsBaseSelect_InterFace.SetGridByMater(grdMain1, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
                                if (rbHSelectCus.Checked)
                                {
                                    grdMain.Rows[sRow].Cells[HProcIDCol].Value = txtHProcID.Tag.ToString();
                                    grdMain.Rows[sRow].Cells[HProcNameCol].Value = txtHProcName.Text.Trim();
                                    grdMain.Rows[sRow].Cells[HProcNumberCol].Value = txtHProcID.Text.Trim();
                                    grdMain1.Rows[sRow].Cells[HProcIDCol].Value = txtHProcID.Tag.ToString();
                                    grdMain1.Rows[sRow].Cells[HProcNameCol].Value = txtHProcName.Text.Trim();
                                    grdMain1.Rows[sRow].Cells[HProcNumberCol].Value = txtHProcID.Text.Trim();
                                }
                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HMaterNumberCol].Value);
                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain1.Rows[sRow].Cells[HMaterNumberCol].Value);
                                break;
                            case HProcNumberCol:
                                //BLL.ClsBaseSelect.SetGridByProc(grdMain, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
                                BLL.ClsBaseSelect_InterFace.SetGridByProc(grdMain, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
                                BLL.ClsBaseSelect_InterFace.SetGridByProc(grdMain1, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
                                if (rbHSelectMater.Checked)
                                {
                                    grdMain.Rows[sRow].Cells[HMaterIDCol].Value = txtHMaterID.Tag.ToString();
                                    grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = txtHMaterID.Text.Trim();
                                    grdMain.Rows[sRow].Cells[HMaterNameCol].Value = txtHMaterName.Text.Trim();
                                    grdMain.Rows[sRow].Cells[HMaterModelCol].Value = txtHMaterModel.Text.Trim();
                                    grdMain1.Rows[sRow].Cells[HMaterIDCol].Value = txtHMaterID.Tag.ToString();
                                    grdMain1.Rows[sRow].Cells[HMaterNumberCol].Value = txtHMaterID.Text.Trim();
                                    grdMain1.Rows[sRow].Cells[HMaterNameCol].Value = txtHMaterName.Text.Trim();
                                    grdMain1.Rows[sRow].Cells[HMaterModelCol].Value = txtHMaterModel.Text.Trim();
                                }
                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HProcNumberCol].Value);
                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain1.Rows[sRow].Cells[HProcNumberCol].Value);
                                break;
                            default:
                                break;
@@ -745,7 +765,7 @@
        DataGridViewTextBoxEditingControl EditingControl;
        private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
        {
            int i = grdMain.CurrentCell.ColumnIndex;
            int i = grdMain1.CurrentCell.ColumnIndex;
            if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid, i))
            {
                e.Cancel = true;
@@ -783,7 +803,7 @@

        private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
        {
            if (grdMain.CurrentCell != null)
            if (grdMain1.CurrentCell != null)
            {
                if (e.Control is DataGridViewTextBoxEditingControl)
                {
@@ -797,7 +817,7 @@
        private void EditingControl_KeyDown(object sender, KeyEventArgs e)
        {
            //业务处理 
            Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
            Sub_GridKey(e.KeyValue, grdMain1.CurrentRow.Index, grdMain1.CurrentCell.ColumnIndex, EditingControl);
        }

        private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)