bug

lu

昨天 9702c6a4dc358c7bff2eb18c8426229a0140e34a

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -46,7 +46,11 @@
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            }, lbGuid);
            }, lbGuid, toolBarMenu1
            , () =>
            {
                ucRptCgdhd1.Initialize();
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置组织
@@ -86,6 +90,7 @@
                        lst = ee.StringList;
                        string strReturn = "";
                        ReturnModel<DataTable> dt;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        #region 这是Srm来的单子
                        if (lst == null)
                        {
@@ -106,6 +111,8 @@
                            gvMx1quantity.OptionsColumn.ReadOnly = true;
                            txt_paperBillNo.ReadOnly = true;
                            txt_isSrm.Checked = true;
                            DataTable _newTable = dt.rtnData;
                            _oldTable = _newTable;
                        }
                        #endregion
                        #region 这是普通的单
@@ -119,21 +126,21 @@
                            gvMx1quantity.OptionsColumn.ReadOnly = false;
                            txt_paperBillNo.ReadOnly = false;
                            txt_isSrm.Checked = false;
                            DataTable _newTable = dt.rtnData;
                            DataRow[] sourceRows = _newTable.Select();
                            for (int i = 0; i < sourceRows.Length; i++)
                            {
                                _oldTable.ImportRow(sourceRows[i]);
                            }
                        }
                        #endregion

                        DataTable _newTable = dt.rtnData;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        DataRow[] sourceRows = _newTable.Select();
                        for (int i = 0; i < sourceRows.Length; i++)
                        {
                            _oldTable.ImportRow(sourceRows[i]);
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _oldTable;
                        gcMx1.ForceInitialize();
                        gvMx1.PostEditor();
                        gvMx1.UpdateCurrentRow();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    catch (Exception ex)
                    {
@@ -143,7 +150,6 @@
                frm.ShowDialog();
            };
        }


        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -169,12 +175,17 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                gridView1.ActiveFilter.Clear();
                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
                frm.UpdateParent += Frm_UpdateParent;
                frm.ShowDialog();
                return;
            }
            ucRptCgdhd1.ToolBarMenu1_btnQueryClick(sender, e);
        }

        /// <summary>
@@ -253,12 +264,14 @@
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                }
                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -269,19 +282,20 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim());
            else
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                //_filterList.Clear();
                //if (gridView1.ActiveFilter.Count > 0)
                //{
                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                //    gridView1.ActiveFilter.Clear();
                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                //}
                //getPageList(1);
                getPageList(this.pageBar1.CurrentPage);
                return;
            }
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(lbGuid.Text.Trim());
                return;
            }
            if (xtraTabControl1.SelectedTabPageIndex == 2)
            {
                ucRptCgdhd1.ToolBarMenu1_btnLoadClick(sender, e);
                return;
            }
        }

@@ -297,7 +311,7 @@
                lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -311,6 +325,10 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
            setSrm();
            txt_receiveOrgId.IsReadly = true;
            txt_suppId.IsReadly = true;
        }

        /// <summary>
@@ -328,7 +346,8 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId);
            setSrm(false);
            txt_isSrm.Checked = false;
            setSrm();
        }

        /// <summary>
@@ -389,7 +408,7 @@
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        ItemId = int.Parse(row["itemId"].ToString()),
                        Quantity = decimal.Parse(row["quantity"].ToString()),
                        UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
                        UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":", "").Replace("普通", "").Replace("急料", "").Replace("一般", "")),
                        Remark = row["memo"].ToString(),
                    });
                }
@@ -427,7 +446,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ReceiveOrgId in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
@@ -513,14 +536,6 @@
                    else
                    {
                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    //如果是srm,禁用
                    if (txt_isSrm.Checked)
                    {
                        setSrm(true);
                    }
                    else {
                        setSrm(false);
                    }
                }
                else
@@ -648,9 +663,9 @@
                    _webServiceName + _meth,
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -660,10 +675,12 @@
                    int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
                    UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -683,22 +700,25 @@
            frm.ShowDialog();
        }

        private void setSrm(bool isSrm) {
        private void setSrm()
        {
            bool isSrm = (txt_isSrm.Checked);
            if (isSrm == true)
            {
                gvMx1quantity.OptionsColumn.ReadOnly = true;
                txt_paperBillNo.ReadOnly = true;
                txt_isSrm.Checked = true;
                txt_receiveOrgId.Enabled = false;
                txt_suppId.Enabled = false;
                txt_receiveOrgId.IsReadly = true;
                txt_suppId.IsReadly = true;
                btnSelect.Enabled = false;
            }
            else {
            else
            {
                gvMx1quantity.OptionsColumn.ReadOnly = false;
                txt_paperBillNo.ReadOnly = false;
                txt_isSrm.Checked = false;
                txt_receiveOrgId.Enabled = true;
                txt_suppId.Enabled = true;
                txt_receiveOrgId.IsReadly = false;
                txt_suppId.IsReadly = false;
                btnSelect.Enabled = true;
            }
        }