调整审核的文字提示

cdk

5 天以前 adc3fd8af6ff791cd3f924890419cd0cba385f51

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -34,14 +34,14 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            });
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置申请组织
@@ -61,16 +61,33 @@
                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                    var dt = rtn.rtnData.list;
                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
                    //  repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                    //Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };

            this.gvMx1.InitNewRow += (s, e) =>
            {
                string _orgId = txt_fapporgid.GetId();
                string _orgName = txt_fapporgid.GetName();
                if (string.IsNullOrEmpty(_orgId)) return;
                gvMx1.SetFocusedRowCellValue("dcOrg", _orgName);
                gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("drOrg", _orgName);
                gvMx1.SetFocusedRowCellValue("drOrgGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("drHz", _orgName);
                gvMx1.SetFocusedRowCellValue("drHzGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
                gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -93,7 +110,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -127,7 +144,7 @@
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_fBillNo, gridView1, "fBillNo");
                lbGuid, txt_fBillNo, gridView1, "FBillNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
@@ -148,20 +165,20 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }

                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }

        }

        /// <summary>
@@ -194,7 +211,7 @@
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "billno");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -203,15 +220,19 @@
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(lbGuid.Text.Trim());
                getModel(rowGuid);
            }
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl( splitMx1.Panel1.Controls, true, gvList);
               
                UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
            txt_fapporgid.IsReadly = true;
            txt_ftranstype.ReadOnly = true;
            txt_fOwnerTypeIdHead.ReadOnly = true;
            txt_fOwnerTypeInIdHead.ReadOnly = true;
        }
        /// <summary>
        /// 新增事件
@@ -226,6 +247,8 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_fapporgid);

        }
        /// <summary>
@@ -251,28 +274,28 @@
            //}
            if (txt_fTransferDirect.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调拨方向！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择调拨方向！");
                txt_fTransferDirect.Focus();
                return;
            }
            if (string.IsNullOrEmpty(sqOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择申请组织！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择申请组织！");
                txt_fapporgid.Focus();
                return;
            }
            if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调出货主类型！");
                txt_fOwnerTypeIdHead.Focus();
                return;
            }
            if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调入货主类型！");
                txt_fOwnerTypeInIdHead.Focus();
                return;
            }
            //if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调出货主类型！");
            //    txt_fOwnerTypeIdHead.Focus();
            //    return;
            //}
            //if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调入货主类型！");
            //    txt_fOwnerTypeInIdHead.Focus();
            //    return;
            //}
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
@@ -287,6 +310,7 @@
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
            {
@@ -354,9 +378,9 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_fBillNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -364,11 +388,14 @@
                    gvList.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -391,7 +418,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -401,16 +428,16 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gcMain1.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
@@ -434,7 +461,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -465,6 +492,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {
@@ -472,11 +500,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -517,13 +545,14 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
@@ -539,9 +568,9 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -550,13 +579,21 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }

        }


        /// <summary>
        /// 选择物料
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
        {
            SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
@@ -567,9 +604,15 @@
            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
            gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
        }

        /// <summary>
        /// 删除物料
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx1.FocusedRowHandle;
@@ -599,13 +642,15 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }
@@ -645,9 +690,10 @@
            var strOrgGuid = dr["dcOrgGuid"].ToString();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.Warning("提示：请先选择调出组织！");
                MsgHelper.ShowError("提示：请先选择调出组织！");
                return;
            };
            }
            ;
            SelectCk frm = new SelectCk(strOrgGuid);
            frm.UpdateParent += (ss, ee) =>
            {
@@ -671,15 +717,17 @@
            var dr = gvMx1.GetDataRow(rowhandle);
            if (dr["dcCkGuid"] == null)
            {
                MsgHelper.Warning("提示：请先选择调出仓库！");
                MsgHelper.ShowError("提示：请先选择调出仓库！");
                return;
            };
            }
            ;
            var strCkGuid = dr["dcCkGuid"].ToString();
            if (string.IsNullOrEmpty(strCkGuid))
            {
                MsgHelper.Warning("提示：请先选择调出仓库！");
                MsgHelper.ShowError("提示：请先选择调出仓库！");
                return;
            };
            }
            ;
            SelectCw frm = new SelectCw(strCkGuid);
            frm.UpdateParent += (ss, ee) =>
            {
@@ -725,9 +773,10 @@
            var strOrgGuid = dr["drOrgGuid"].ToString();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.Warning("提示：请先选择调入组织！");
                MsgHelper.ShowError("提示：请先选择调入组织！");
                return;
            };
            }
            ;
            SelectCk frm = new SelectCk(strOrgGuid);
            frm.UpdateParent += (ss, ee) =>
            {
@@ -751,15 +800,17 @@
            var dr = gvMx1.GetDataRow(rowhandle);
            if (dr["drCkGuid"] == null)
            {
                MsgHelper.Warning("提示：请先选择调入仓库！");
                MsgHelper.ShowError("提示：请先选择调入仓库！");
                return;
            };
            }
            ;
            var strCkGuid = dr["drCkGuid"].ToString();
            if (string.IsNullOrEmpty(strCkGuid))
            {
                MsgHelper.Warning("提示：请先选择调入仓库！");
                MsgHelper.ShowError("提示：请先选择调入仓库！");
                return;
            };
            }
            ;
            SelectCw frm = new SelectCw(strCkGuid);
            frm.UpdateParent += (ss, ee) =>
            {
@@ -779,14 +830,14 @@
        private void rptDrHz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            //if (rowhandle < 0)
            //    return;
            int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
            if (_drhzlx <= 0)
            {
                MsgHelper.Warning("提示：请先选择调入货主类型！");
                return;
            }
            //if (_drhzlx <= 0)
            //{
            //    MsgHelper.Warning("提示：请先选择调入货主类型！");
            //    return;
            //}
            SelectHz frm = new SelectHz("", _drhzlx.ToString());
            frm.UpdateParent += (ss, ee) =>
            {
@@ -794,6 +845,7 @@
                lst = ee.DynamicList;
                gvMx1.SetFocusedRowCellValue("drHz", lst[0].name);
                gvMx1.SetFocusedRowCellValue("drHzGuid", lst[0].guid);

            };
            frm.ShowDialog();
        }
@@ -806,14 +858,14 @@
        private void rptDcHz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            //if (rowhandle < 0)
            //    return;
            int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
            if (_drhzlx <= 0)
            {
                MsgHelper.Warning("提示：请先选择调出货主类型！");
                return;
            }
            //if (_drhzlx <= 0)
            //{
            //    MsgHelper.Warning("提示：请先选择调出货主类型！");
            //    return;
            //}
            SelectHz frm = new SelectHz("", _drhzlx.ToString());
            frm.UpdateParent += (ss, ee) =>
            {