lu
2024-12-27 aa61ade84d2657a9fb37993378c6fba4680b5ddf
调拨
已修改3个文件
68 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookCk.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -48,6 +48,8 @@
            txt_fromFcode.getSuppler("");
            this.txt_invFcode.EditChanged += (s, e) =>
            {
                txt_fstockoutorgidNo.Text = txt_invFcode.GetOrgName();
                txt_fowneroutidhead.Text = txt_invFcode.GetOrgId();
                var _obj = new
                {
                    currentPage = 1,
@@ -68,6 +70,10 @@
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            };
            this.txt_fromFcode.EditChanged += (s, e) => {
                txt_fstockorgidNo.Text = txt_fromFcode.GetOrgName();
                txt_fowneridhead.Text = txt_fromFcode.GetOrgId();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -230,13 +236,13 @@
             string _inRkId = txt_fromFcode.GetId();//入
            if (string.IsNullOrEmpty(_inCkId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单!");
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择出货仓库!");
                txt_invFcode.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_inRkId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择仓库!");
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择收货仓库!");
                txt_fromFcode.Focus();
                return;
            }
@@ -430,7 +436,7 @@
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "blNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
@@ -482,7 +488,7 @@
            if (e.Button.Index == 0)
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                var mxGuid = dr["id"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -344,25 +344,22 @@
                            var txt = colType as ComboBoxEdit;
                            if (txt.Properties.TextEditStyle ==
                                TextEditStyles.DisableTextEditor)
                                txt.SelectedIndex = int.Parse(strVal);
                            else
                                txt.Text = strVal;
                            txt.ReadOnly = isEdt;
                            continue;
                        }
                                try
                                {
                                    txt.SelectedIndex = int.Parse(strVal);
                                }
                                catch (Exception)
                                {
                        //下拉
                        if (colType is ComboBoxEdit)
                        {
                            var txt = colType as ComboBoxEdit;
                            if (txt.Properties.TextEditStyle ==
                                TextEditStyles.DisableTextEditor)
                                txt.SelectedIndex = int.Parse(strVal);
                                    txt.Text = strVal;
                                }
                            else
                                txt.Text = strVal;
                            txt.ReadOnly = isEdt;
                            continue;
                        }
                        //自定义下拉
                        if (colType is UcComBox)
DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -87,7 +87,38 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            if(!string.IsNullOrEmpty(Code))
            lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
        }
        /// <summary>
        /// 读取组织ID
        /// </summary>
        /// <returns></returns>
        public string GetOrgId()
        {
            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
            if (row != null)
            {
                string id = row["OrgId"].ToString();
                return id;
            }
            return "";
        }
        /// <summary>
        /// 读取组织名称
        /// </summary>
        /// <returns></returns>
        public string GetOrgName()
        {
            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
            if (row != null)
            {
                string id = row["OrgName"].ToString();
                return id;
            }
            return "";
        }
    }
}