1
lu
2024-11-13 13e0b579eb4ad6151e2f27b822837be81d3f6143
1
已修改12个文件
67 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookCk.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookItems.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1478,6 +1478,7 @@
            // txt_suppId
            // 
            this.txt_suppId.Enabled = false;
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.KeyFile = "";
            this.txt_suppId.Location = new System.Drawing.Point(706, 92);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
@@ -1517,11 +1518,13 @@
            // txt_itemId
            // 
            this.txt_itemId.Enabled = false;
            this.txt_itemId.IsReadly = true;
            this.txt_itemId.KeyFile = "";
            this.txt_itemId.Location = new System.Drawing.Point(97, 48);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Size = new System.Drawing.Size(266, 33);
            this.txt_itemId.TabIndex = 791;
            this.txt_itemId.Tag = "no";
            // 
            // lb_itemModel
            // 
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -63,6 +63,7 @@
            this.btnLoad.Click += BtnLoad_Click;
            ucUpFile1.UpChanged += UcUpFile1_UpChanged;
            xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
        }
        private void GcMx1_MouseClick(object sender, MouseEventArgs e)
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -1170,6 +1170,7 @@
            // 
            // txt_depotsId
            // 
            this.txt_depotsId.IsReadly = true;
            this.txt_depotsId.KeyFile = "";
            this.txt_depotsId.Location = new System.Drawing.Point(421, 50);
            this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
@@ -1198,6 +1199,7 @@
            // 
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.KeyFile = "";
            this.txt_suppId.Location = new System.Drawing.Point(98, 50);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -12,7 +12,6 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.Office.Model;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
@@ -475,7 +474,10 @@
                        {
                            var txt = colType as UcLookCk;
                            txt.SetIdOrCode(strVal);
                            if (txt.IsReadly == false)
                            txt.Enabled = !isEdt;
                            else
                                txt.Enabled = false;
                            continue;
                        }
                        //自定义供应商
@@ -483,7 +485,10 @@
                        {
                            var txt = colType as UcLookSupplier;
                            txt.SetIdOrCode(strVal);
                            if (txt.IsReadly == false)
                            txt.Enabled = !isEdt;
                            else
                                txt.Enabled = false;
                            continue;
                        }
                        //自定义物料
@@ -491,7 +496,10 @@
                        {
                            var txt = colType as UcLookItems;
                            txt.SetIdOrCode(strVal);
                            if (txt.IsReadly == false)
                            txt.Enabled = !isEdt;
                            else
                                txt.Enabled = false;
                            continue;
                        }
                        if (colType is SimpleButton)
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -16,8 +16,11 @@
{
    public partial class ShowLogcs : DevExpress.XtraEditors.XtraForm
    {
        public ShowLogcs()
        public string guidKey;
        public ShowLogcs(string _guidKey)
        {
            this.guidKey = _guidKey;
            InitializeComponent();
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -46,6 +49,7 @@
        private void getPageList(int curPage, int pageSize)
        {
            var _sbSqlWhere = new StringBuilder();
            _sbSqlWhere.Append(" and ABT_GUID='"+this.guidKey + "'");
            var pgq = new PageQueryModel(curPage, pageSize, "OPERATION_TIME",
                "desc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -30,11 +30,11 @@
        {
            this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
            this.SuspendLayout();
@@ -65,6 +65,14 @@
            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "使用组织";
            this.gridColumn5.FieldName = "fSubsidiary";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            // 
            // gridColumn1
            // 
@@ -104,14 +112,6 @@
            this.gridColumn4.Caption = "guid";
            this.gridColumn4.FieldName = "guid";
            this.gridColumn4.Name = "gridColumn4";
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "使用组织";
            this.gridColumn5.FieldName = "fSubsidiary";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            // 
            // UcLookCk
            // 
DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -17,7 +17,7 @@
                LookSearchSupplier_EditValueChanged;
        }
        public bool IsReadly { get; set; }
        private string _KeyFile = "";
        public string KeyFile
        {
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -120,6 +120,7 @@
            this.Controls.Add(this.lookSearchSupplier);
            this.Name = "UcLookItems";
            this.Size = new System.Drawing.Size(266, 33);
            this.Tag = "no";
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
            this.ResumeLayout(false);
DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -24,7 +24,7 @@
                LookSearchSupplier_EditValueChanged;
        }
        public bool IsReadly { get; set; }
        private string _KeyFile = "";
        public string KeyFile
        {
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
@@ -30,11 +30,11 @@
        {
            this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
            this.SuspendLayout();
@@ -64,6 +64,14 @@
            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "使用组织";
            this.gridColumn5.FieldName = "fSubsidiary";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            // 
            // gridColumn1
            // 
@@ -102,14 +110,6 @@
            this.gridColumn4.Caption = "guid";
            this.gridColumn4.FieldName = "guid";
            this.gridColumn4.Name = "gridColumn4";
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "使用组织";
            this.gridColumn5.FieldName = "fSubsidiary";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            // 
            // UcLookSupplier
            // 
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -18,7 +18,7 @@
                LookSearchSupplier_EditValueChanged;
            getSuppler();
        }
        public bool IsReadly { get; set; }
        private string _KeyFile = "";
        public string KeyFile
        {
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -229,7 +229,7 @@
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UserControl.ShowLogcs frm = new ShowLogcs();
            UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
            frm.ShowDialog();
        }