bug
lu
3 天以前 b9b29d15b0503e76d5148b6f966404c6580ae6b9
bug
已修改6个文件
464 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs 303 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -261,6 +261,7 @@
            //2025/07/12加上修改状态下不能修改
            txt_qt023.IsReadly = true;
            txt_qt024.IsReadly = true;
            ucLookHuoZhu1.Enabled = false;
        }
        /// <summary>
        /// 新增事件
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -80,10 +80,10 @@
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            };
            //选择srm明细
            //选择源单明细
            txt_qt035.ButtonClick += (s, e) =>
            {
                string strSrmNo = "";
@@ -171,10 +171,10 @@
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_qtck, gridView1,"qtck");
                lbGuid, txt_qtck, gridView1, "qtck");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
@@ -192,17 +192,19 @@
                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);
            }
        }
@@ -240,7 +242,7 @@
                lbGuid, txt_qtck, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -256,6 +258,9 @@
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
                ucLookHuoZhu1.Enabled = true;
            }
            //2025/07/12加上修改状态下不能修改
            txt_qt022.IsReadly = true;
            ucLookHuoZhu1.Enabled = false;
        }
        /// <summary>
        /// 新增事件
@@ -295,35 +300,35 @@
            string kcCk = txt_qt008.GetId();//仓库
            if (string.IsNullOrEmpty(kcZz))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存组织!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织!");
                txt_qt022.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inHzlx))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择货主类型!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主类型!");
                return;
            }
            if (string.IsNullOrEmpty(inHz))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择货主!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主!");
                return;
            }
            if (txt_qt003.TextTxt.Length < 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择单据类型!");
                txt_qt003.Focus();
                return;
            }
            if (txt_qt019.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存方向!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存方向!");
                txt_qt019.Focus();
                return;
            }
            if (string.IsNullOrEmpty(kcBm) && string.IsNullOrEmpty(kcGys))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("部门或供应商必须选一个!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("部门或供应商必须选一个!");
                txt_qt009.Focus();
                return;
            }
@@ -381,9 +386,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_qtck.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -395,10 +400,12 @@
                    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);
            }
        }
@@ -456,7 +463,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -525,11 +532,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);
            }
        }
@@ -542,6 +549,9 @@
            gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
            gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]);
            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
        }
        /// <summary>
        /// 移出明细
@@ -577,13 +587,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);
                }
            }
        }
@@ -663,7 +675,7 @@
                case 0:
                    strMsg = "反审核";
                    break;
                      case 30:
                case 30:
                    strMsg = "财务审核";
                    break;
                case 31:
@@ -675,14 +687,15 @@
                case 41:
                    strMsg = "采购反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
               lbGuid, txt_qtck, gridView1, "qtck");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -698,9 +711,10 @@
                    _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());
@@ -708,16 +722,17 @@
                    //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    //gridView1.FocusedRowHandle = rowHandle;
                    //UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
                    //注意,这里和其它页面有点不一样
                    getPageList(this.pageBar1.CurrentPage);
                    int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
@@ -741,6 +756,5 @@
            };
            frm.ShowDialog();
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -150,6 +150,7 @@
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -161,7 +162,6 @@
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -286,6 +286,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
@@ -297,7 +298,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -1227,6 +1227,7 @@
            // 
            this.split99.Panel2.Controls.Add(this.gcMx1);
            this.split99.Panel2.Text = "Panel2";
            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split99.Size = new System.Drawing.Size(1256, 378);
            this.split99.SplitterPosition = 138;
@@ -1252,7 +1253,7 @@
            this.lay99.Name = "lay99";
            this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(306, 272, 812, 500);
            this.lay99.Root = this.layoutControlGroup1;
            this.lay99.Size = new System.Drawing.Size(1256, 138);
            this.lay99.Size = new System.Drawing.Size(0, 0);
            this.lay99.TabIndex = 0;
            this.lay99.Text = "layoutControl1";
            // 
@@ -1440,6 +1441,18 @@
            this.txtWlgg.StyleController = this.lay99;
            this.txtWlgg.TabIndex = 218;
            // 
            // layoutControlItem33
            //
            this.layoutControlItem33.Control = this.lbMxGuid;
            this.layoutControlItem33.Location = new System.Drawing.Point(1020, 72);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem33.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem33.Text = "lbMxGuid";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem33.TextVisible = false;
            //
            // layoutControlGroup1
            // 
            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1604,18 +1617,6 @@
            this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem32.TextVisible = false;
            // 
            // layoutControlItem33
            //
            this.layoutControlItem33.Control = this.lbMxGuid;
            this.layoutControlItem33.Location = new System.Drawing.Point(1020, 72);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem33.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem33.Text = "lbMxGuid";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem33.TextVisible = false;
            //
            // gcMx1
            // 
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1626,7 +1627,7 @@
            this.repositoryItemButtonEdit1,
            this.rptBl,
            this.repositoryItemMemoEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1256, 228);
            this.gcMx1.Size = new System.Drawing.Size(1256, 378);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -2164,6 +2165,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
@@ -2175,7 +2177,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -490,7 +490,6 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
@@ -503,6 +502,7 @@
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    getModel(lbGuid.Text);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
@@ -586,15 +586,12 @@
                    _ucGg = "";
                    if (txt_tbl005.Text == "良品退料")
                    {
                        split99.Panel1.Enabled = false;
                        split99.Panel1.Visible = false;
                        this.split99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
                    }
                    else
                    {
                        split99.Panel1.Enabled = true;
                        split99.Panel1.Enabled = true;
                        this.split99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
                    }
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -726,7 +723,7 @@
            //如果是审核,询问要不要生成补料beg
            string txt_chkOut = "0";
            if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "作业不良退料")
            if (_inFieldValue == 1 && txt_tbl005.Text.Trim() != "良品退料")
            {
                var frm = new Frm_MesItemTblShow();
                frm.UpdateParent += (ss, ee) =>
@@ -756,7 +753,6 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
@@ -819,7 +815,7 @@
                txtQuantity.Text = row["tld005"].ToString();//申请总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
                txt_psnQty_1.Text = row["mrtmsl"].ToString(); //默认每张条码数量
                txt_psnQty_1.Text = row["tld005"].ToString(); //默认每张条码数量
            }
            else
            {
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs
@@ -33,16 +33,16 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            this.txt_hzabc = new DevExpress.XtraEditors.SearchLookUpEdit();
            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.txt_hzlxabc = new DevExpress.XtraEditors.ComboBoxEdit();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_hzlxabc = new DevExpress.XtraEditors.ComboBoxEdit();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzabc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
            this.layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -69,24 +69,6 @@
            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
            // 
            // txt_hzlxabc
            //
            this.txt_hzlxabc.EditValue = "请选择货主类型";
            this.txt_hzlxabc.Location = new System.Drawing.Point(92, 0);
            this.txt_hzlxabc.Name = "txt_hzlxabc";
            this.txt_hzlxabc.Properties.Appearance.Options.UseFont = true;
            this.txt_hzlxabc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_hzlxabc.Properties.Items.AddRange(new object[] {
            "请选择货主类型",
            "组织(BD_OwnerOrg)",
            "供应商(BD_Supplier)",
            "客户(BD_Customer)"});
            this.txt_hzlxabc.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_hzlxabc.Size = new System.Drawing.Size(310, 24);
            this.txt_hzlxabc.StyleController = this.layoutControl1;
            this.txt_hzlxabc.TabIndex = 313;
            //
            // layoutControl1
            // 
            this.layoutControl1.Controls.Add(this.txt_hzlxabc);
@@ -100,6 +82,23 @@
            this.layoutControl1.Size = new System.Drawing.Size(402, 78);
            this.layoutControl1.TabIndex = 318;
            this.layoutControl1.Text = "layoutControl1";
            //
            // txt_hzlxabc
            //
            this.txt_hzlxabc.EditValue = "组织(BD_OwnerOrg)";
            this.txt_hzlxabc.Location = new System.Drawing.Point(92, 0);
            this.txt_hzlxabc.Name = "txt_hzlxabc";
            this.txt_hzlxabc.Properties.Appearance.Options.UseFont = true;
            this.txt_hzlxabc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_hzlxabc.Properties.Items.AddRange(new object[] {
            "组织(BD_OwnerOrg)",
            "供应商(BD_Supplier)",
            "客户(BD_Customer)"});
            this.txt_hzlxabc.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_hzlxabc.Size = new System.Drawing.Size(310, 24);
            this.txt_hzlxabc.StyleController = this.layoutControl1;
            this.txt_hzlxabc.TabIndex = 313;
            // 
            // Root
            // 
@@ -157,9 +156,9 @@
            this.Size = new System.Drawing.Size(402, 78);
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzabc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
            this.layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
@@ -29,145 +29,12 @@
            InitializeComponent();
            txt_hzabc.Properties.NullText = "请选择货主";
            txt_hzlxabc.Properties.NullText = "请选择货主类型";
            //先读取组织列表
            getData(0);
            this.txt_hzlxabc.SelectedIndexChanged += (s, e) =>
            {
                txt_hzabc.EditValue = null;
                int _strType = txt_hzlxabc.SelectedIndex;
                string _orgId = OrgId;
                this.searchLookUpEdit1View.Columns.Clear();
                txt_hzabc.Properties.DataSource = null;
                if (_strType <= 0) return;
                string _strMeth = "";
                string _DisplayMember = "";
                string _ValueMember = "";
                PageQueryModel pgq = new PageQueryModel(1, 999999, "", "", "", "");
                DevExpress.XtraGrid.Columns.GridColumn gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
                DevExpress.XtraGrid.Columns.GridColumn gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
                DevExpress.XtraGrid.Columns.GridColumn gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
                DevExpress.XtraGrid.Columns.GridColumn gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
                DevExpress.XtraGrid.Columns.GridColumn gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
                switch (_strType)
                {
                    case 1://组织
                        pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
                        _strMeth = "Organization/GetListPage";
                        _DisplayMember = "name";
                        _ValueMember = "fid";
                        gridColumn1.Caption = "组织ID";
                        gridColumn1.FieldName = "fid";
                        gridColumn1.Name = "gridColumn1";
                        gridColumn5.Caption = "组织名称";
                        gridColumn5.FieldName = "name";
                        gridColumn5.Name = "gridColumn5";
                        gridColumn5.Visible = true;
                        gridColumn2.Caption = "组织编号";
                        gridColumn2.FieldName = "fNumber";
                        gridColumn2.MinWidth = 80;
                        gridColumn2.Name = "gridColumn2";
                        gridColumn2.UnboundDataType = typeof(string);
                        gridColumn2.Visible = true;
                        gridColumn2.VisibleIndex = 1;
                        gridColumn2.Width = 80;
                        gridColumn4.Caption = "guid";
                        gridColumn4.FieldName = "guid";
                        gridColumn4.Name = "gridColumn4";
                        break;
                    case 2://供应商
                        pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.supp_no", "asc", "", " and a.FSubsidiary ='" + _orgId + "'");
                        _strMeth = "MesSupplierManager/GetListPage";
                        _DisplayMember = "suppName";
                        _ValueMember = "id";
                        gridColumn5.Caption = "使用组织";
                        gridColumn5.FieldName = "fSubsidiary";
                        gridColumn5.Name = "gridColumn5";
                        gridColumn5.Visible = true;
                        gridColumn5.VisibleIndex = 0;
                        gridColumn1.Caption = "供应商ID";
                        gridColumn1.FieldName = "id";
                        gridColumn1.MaxWidth = 100;
                        gridColumn1.MinWidth = 80;
                        gridColumn1.Name = "gridColumn1";
                        gridColumn1.UnboundDataType = typeof(string);
                        gridColumn1.Width = 100;
                        gridColumn2.Caption = "供应商编号";
                        gridColumn2.FieldName = "suppNo";
                        gridColumn2.MinWidth = 80;
                        gridColumn2.Name = "gridColumn2";
                        gridColumn2.Visible = true;
                        gridColumn2.VisibleIndex = 2;
                        gridColumn2.Width = 80;
                        gridColumn3.Caption = "供应商名称";
                        gridColumn3.FieldName = "suppName";
                        gridColumn3.MinWidth = 100;
                        gridColumn3.Name = "gridColumn3";
                        gridColumn3.Visible = true;
                        gridColumn3.VisibleIndex = 1;
                        gridColumn3.Width = 100;
                        gridColumn4.Caption = "guid";
                        gridColumn4.FieldName = "guid";
                        gridColumn4.Name = "gridColumn4";
                        break;
                    case 3://客户
                        pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.cust_no", "asc", "", " and a.FSubsidiary ='" + _orgId + "'");
                        _strMeth = "MesCustomerManager/GetListPage";
                        _DisplayMember = "custName";
                        _ValueMember = "id";
                        gridColumn5.Caption = "所在组织";
                        gridColumn5.FieldName = "fSubsidiary";
                        gridColumn5.MinWidth = 200;
                        gridColumn5.Name = "gridColumn5";
                        gridColumn5.Visible = true;
                        gridColumn5.VisibleIndex = 0;
                        gridColumn5.Width = 200;
                        gridColumn1.Caption = "客户ID";
                        gridColumn1.FieldName = "id";
                        gridColumn1.MinWidth = 50;
                        gridColumn1.Name = "gridColumn1";
                        gridColumn1.Visible = true;
                        gridColumn1.VisibleIndex = 1;
                        gridColumn2.Caption = "客户编号";
                        gridColumn2.FieldName = "custNo";
                        gridColumn2.MinWidth = 80;
                        gridColumn2.Name = "gridColumn2";
                        gridColumn2.Visible = true;
                        gridColumn2.VisibleIndex = 2;
                        gridColumn2.Width = 80;
                        gridColumn3.Caption = "客户名称";
                        gridColumn3.FieldName = "custName";
                        gridColumn3.MinWidth = 100;
                        gridColumn3.Name = "gridColumn3";
                        gridColumn3.Visible = true;
                        gridColumn3.VisibleIndex = 3;
                        gridColumn3.Width = 100;
                        gridColumn4.Caption = "guid";
                        gridColumn4.FieldName = "guid";
                        gridColumn4.Name = "gridColumn4";
                        break;
                }
                this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
                            gridColumn1,
                            gridColumn5,
                            gridColumn3,
                            gridColumn2,
                           gridColumn4 });
                var json = JsonConvert.SerializeObject(pgq);
                try
                {
                    var strReturn = UtilityHelper.HttpPost("", _strMeth, json);
                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                    var dt = rtn.rtnData.list;
                    txt_hzabc.Properties.DataSource = dt;
                    txt_hzabc.Properties.DisplayMember = _DisplayMember;
                    txt_hzabc.Properties.ValueMember = _ValueMember;
                    txt_hzabc.ForceInitialize();
                    txt_hzabc.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                    if (!string.IsNullOrEmpty(HzId))
                        SetHzId(HzId);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
                getData(_strType);
            };
        }
@@ -191,7 +58,7 @@
        /// <returns></returns>
        public string GetHzLx()
        {
            if (txt_hzlxabc.SelectedIndex <= 0)
            if (txt_hzlxabc.SelectedIndex < 0)
                return "";
            string id = txt_hzlxabc.Text.Trim();
            return id;
@@ -223,5 +90,167 @@
            else
                txt_hzlxabc.Text = Code;
        }
        private void getData(int _strType)
        {
            txt_hzabc.EditValue = null;
            string _orgId = OrgId;
            this.searchLookUpEdit1View.Columns.Clear();
            txt_hzabc.Properties.DataSource = null;
            if (_strType < 0) return;
            string _strMeth = "";
            string _DisplayMember = "";
            string _ValueMember = "";
            PageQueryModel pgq = new PageQueryModel(1, 999999, "", "", "", "");
            DevExpress.XtraGrid.Columns.GridColumn gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            DevExpress.XtraGrid.Columns.GridColumn gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            DevExpress.XtraGrid.Columns.GridColumn gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            DevExpress.XtraGrid.Columns.GridColumn gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            DevExpress.XtraGrid.Columns.GridColumn gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            switch (_strType)
            {
                case 0://组织
                    pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
                    _strMeth = "Organization/GetListPage";
                    _DisplayMember = "name";
                    _ValueMember = "fid";
                    gridColumn1.Caption = "组织ID";
                    gridColumn1.FieldName = "fid";
                    gridColumn1.Name = "gridColumn1";
                    gridColumn5.Caption = "组织名称";
                    gridColumn5.FieldName = "name";
                    gridColumn5.Name = "gridColumn5";
                    gridColumn5.Visible = true;
                    gridColumn2.Caption = "组织编号";
                    gridColumn2.FieldName = "fNumber";
                    gridColumn2.MinWidth = 80;
                    gridColumn2.Name = "gridColumn2";
                    gridColumn2.UnboundDataType = typeof(string);
                    gridColumn2.Visible = true;
                    gridColumn2.VisibleIndex = 1;
                    gridColumn2.Width = 80;
                    gridColumn4.Caption = "guid";
                    gridColumn4.FieldName = "guid";
                    gridColumn4.Name = "gridColumn4";
                    break;
                case 1://供应商
                    pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.supp_no", "asc", "", " and a.FSubsidiary ='" + _orgId + "'");
                    _strMeth = "MesSupplierManager/GetListPage";
                    _DisplayMember = "suppName";
                    _ValueMember = "id";
                    gridColumn5.Caption = "使用组织";
                    gridColumn5.FieldName = "fSubsidiary";
                    gridColumn5.Name = "gridColumn5";
                    gridColumn5.Visible = true;
                    gridColumn5.VisibleIndex = 0;
                    gridColumn1.Caption = "供应商ID";
                    gridColumn1.FieldName = "id";
                    gridColumn1.MaxWidth = 100;
                    gridColumn1.MinWidth = 80;
                    gridColumn1.Name = "gridColumn1";
                    gridColumn1.UnboundDataType = typeof(string);
                    gridColumn1.Width = 100;
                    gridColumn2.Caption = "供应商编号";
                    gridColumn2.FieldName = "suppNo";
                    gridColumn2.MinWidth = 80;
                    gridColumn2.Name = "gridColumn2";
                    gridColumn2.Visible = true;
                    gridColumn2.VisibleIndex = 2;
                    gridColumn2.Width = 80;
                    gridColumn3.Caption = "供应商名称";
                    gridColumn3.FieldName = "suppName";
                    gridColumn3.MinWidth = 100;
                    gridColumn3.Name = "gridColumn3";
                    gridColumn3.Visible = true;
                    gridColumn3.VisibleIndex = 1;
                    gridColumn3.Width = 100;
                    gridColumn4.Caption = "guid";
                    gridColumn4.FieldName = "guid";
                    gridColumn4.Name = "gridColumn4";
                    break;
                case 2://客户
                    pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.cust_no", "asc", "", " and a.FSubsidiary ='" + _orgId + "'");
                    _strMeth = "MesCustomerManager/GetListPage";
                    _DisplayMember = "custName";
                    _ValueMember = "id";
                    gridColumn5.Caption = "所在组织";
                    gridColumn5.FieldName = "fSubsidiary";
                    gridColumn5.MinWidth = 200;
                    gridColumn5.Name = "gridColumn5";
                    gridColumn5.Visible = true;
                    gridColumn5.VisibleIndex = 0;
                    gridColumn5.Width = 200;
                    gridColumn1.Caption = "客户ID";
                    gridColumn1.FieldName = "id";
                    gridColumn1.MinWidth = 50;
                    gridColumn1.Name = "gridColumn1";
                    gridColumn1.Visible = true;
                    gridColumn1.VisibleIndex = 1;
                    gridColumn2.Caption = "客户编号";
                    gridColumn2.FieldName = "custNo";
                    gridColumn2.MinWidth = 80;
                    gridColumn2.Name = "gridColumn2";
                    gridColumn2.Visible = true;
                    gridColumn2.VisibleIndex = 2;
                    gridColumn2.Width = 80;
                    gridColumn3.Caption = "客户名称";
                    gridColumn3.FieldName = "custName";
                    gridColumn3.MinWidth = 100;
                    gridColumn3.Name = "gridColumn3";
                    gridColumn3.Visible = true;
                    gridColumn3.VisibleIndex = 3;
                    gridColumn3.Width = 100;
                    gridColumn4.Caption = "guid";
                    gridColumn4.FieldName = "guid";
                    gridColumn4.Name = "gridColumn4";
                    break;
            }
            this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
                            gridColumn1,
                            gridColumn5,
                            gridColumn3,
                            gridColumn2,
                           gridColumn4 });
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _strMeth, json);
                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = rtn.rtnData.list;
                txt_hzabc.Properties.DataSource = dt;
                txt_hzabc.Properties.DisplayMember = _DisplayMember;
                txt_hzabc.Properties.ValueMember = _ValueMember;
                txt_hzabc.ForceInitialize();
                txt_hzabc.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                if (!string.IsNullOrEmpty(HzId))
                    SetHzId(HzId);
                //增加时,默认组织beg
                if (_strType == 0)
                {
                    string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
                    var pgq66 = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
                    var json66 = JsonConvert.SerializeObject(pgq66);
                    try
                    {
                        var strReturn66 = UtilityHelper.HttpPost("", "Organization/GetListPage", json66);
                        var _obj = UtilityHelper.ReturnToDynamic(strReturn66);
                        string _extendText = _obj.rtnData.extendText;
                        string[] _dftOrg = _extendText.Split(',');
                        if (_dftOrg.Length > 0)
                        {
                            txt_hzabc.EditValue = (_dftOrg[0].Trim());
                        }
                    }
                    catch (Exception ex)
                    {
                    }
                }
                //增加时,默认组织end
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}