细节

lu

2025-01-08 c77fa816dd42d7cd437301efbfdff93ea56f6c79

细节

 DevApp/Gs.DevApp/App.config

@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs

@@ -364,7 +364,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1125, 371);
            this.tabMxPage1.Size = new System.Drawing.Size(1125, 377);
            this.tabMxPage1.Text = "检验项目明细";
            // 
            // gcMx1
@@ -380,7 +380,7 @@
            this.rptJSSP,
            this.rptJYSP,
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1125, 371);
            this.gcMx1.Size = new System.Drawing.Size(1125, 377);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -458,7 +458,7 @@
            // 
            this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tname.Appearance.Options.UseFont = true;
            this.lb_tname.Location = new System.Drawing.Point(9, 54);
            this.lb_tname.Location = new System.Drawing.Point(9, 52);
            this.lb_tname.Name = "lb_tname";
            this.lb_tname.Size = new System.Drawing.Size(68, 21);
            this.lb_tname.TabIndex = 370;
@@ -466,13 +466,13 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Enabled = false;
            this.txt_itemNo.Location = new System.Drawing.Point(85, 50);
            this.txt_itemNo.Location = new System.Drawing.Point(85, 48);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(262, 28);
            this.txt_itemNo.TabIndex = 370;
            this.txt_itemNo.Tag = "readOnly";
            // 
            // gv_isenabled
            // 
@@ -494,7 +494,7 @@
            // 
            this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fversion.Appearance.Options.UseFont = true;
            this.lb_fversion.Location = new System.Drawing.Point(361, 54);
            this.lb_fversion.Location = new System.Drawing.Point(361, 52);
            this.lb_fversion.Name = "lb_fversion";
            this.lb_fversion.Size = new System.Drawing.Size(39, 21);
            this.lb_fversion.TabIndex = 298;
@@ -503,7 +503,7 @@
            // txt_fversion
            // 
            this.txt_fversion.Enabled = false;
            this.txt_fversion.Location = new System.Drawing.Point(405, 50);
            this.txt_fversion.Location = new System.Drawing.Point(405, 48);
            this.txt_fversion.Name = "txt_fversion";
            this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fversion.Properties.Appearance.Options.UseFont = true;
@@ -528,7 +528,7 @@
            // 
            this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 54);
            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 52);
            this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
            this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
            this.lb_ftwoCheckdate.TabIndex = 285;
@@ -536,13 +536,13 @@
            // 
            // txt_ftwoCheckdate
            // 
            this.txt_ftwoCheckdate.Enabled = false;
            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 50);
            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 48);
            this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
            this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(172, 28);
            this.txt_ftwoCheckdate.TabIndex = 285;
            this.txt_ftwoCheckdate.Tag = "readOnly";
            // 
            // lb_ftwoCheckor
            // 
@@ -556,13 +556,13 @@
            // 
            // txt_ftwoCheckor
            // 
            this.txt_ftwoCheckor.Enabled = false;
            this.txt_ftwoCheckor.Location = new System.Drawing.Point(685, 16);
            this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
            this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_ftwoCheckor.Size = new System.Drawing.Size(172, 28);
            this.txt_ftwoCheckor.TabIndex = 280;
            this.txt_ftwoCheckor.Tag = "readOnly";
            // 
            // gv_ftwoCheckor
            // 
@@ -575,14 +575,14 @@
            this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
            this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
            this.gv_ftwoCheckor.Visible = true;
            this.gv_ftwoCheckor.VisibleIndex = 11;
            this.gv_ftwoCheckor.VisibleIndex = 10;
            this.gv_ftwoCheckor.Width = 94;
            // 
            // lb_ftwoChecked
            // 
            this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_ftwoChecked.Appearance.Options.UseFont = true;
            this.lb_ftwoChecked.Location = new System.Drawing.Point(361, 86);
            this.lb_ftwoChecked.Location = new System.Drawing.Point(361, 83);
            this.lb_ftwoChecked.Name = "lb_ftwoChecked";
            this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
            this.lb_ftwoChecked.TabIndex = 273;
@@ -608,7 +608,7 @@
            // 
            this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_foneCheckdate.Appearance.Options.UseFont = true;
            this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 127);
            this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 124);
            this.lb_foneCheckdate.Name = "lb_foneCheckdate";
            this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
            this.lb_foneCheckdate.TabIndex = 267;
@@ -616,13 +616,13 @@
            // 
            // txt_foneCheckdate
            // 
            this.txt_foneCheckdate.Enabled = false;
            this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 123);
            this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 120);
            this.txt_foneCheckdate.Name = "txt_foneCheckdate";
            this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
            this.txt_foneCheckdate.Size = new System.Drawing.Size(172, 28);
            this.txt_foneCheckdate.TabIndex = 267;
            this.txt_foneCheckdate.Tag = "readOnly";
            // 
            // gv_foneCheckdate
            // 
@@ -635,14 +635,14 @@
            this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
            this.gv_foneCheckdate.Visible = true;
            this.gv_foneCheckdate.VisibleIndex = 10;
            this.gv_foneCheckdate.VisibleIndex = 9;
            this.gv_foneCheckdate.Width = 120;
            // 
            // lb_foneCheckor
            // 
            this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_foneCheckor.Appearance.Options.UseFont = true;
            this.lb_foneCheckor.Location = new System.Drawing.Point(629, 86);
            this.lb_foneCheckor.Location = new System.Drawing.Point(629, 83);
            this.lb_foneCheckor.Name = "lb_foneCheckor";
            this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
            this.lb_foneCheckor.TabIndex = 262;
@@ -650,13 +650,13 @@
            // 
            // txt_foneCheckor
            // 
            this.txt_foneCheckor.Enabled = false;
            this.txt_foneCheckor.Location = new System.Drawing.Point(685, 86);
            this.txt_foneCheckor.Location = new System.Drawing.Point(685, 83);
            this.txt_foneCheckor.Name = "txt_foneCheckor";
            this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
            this.txt_foneCheckor.Size = new System.Drawing.Size(172, 28);
            this.txt_foneCheckor.TabIndex = 262;
            this.txt_foneCheckor.Tag = "readOnly";
            // 
            // gv_foneCheckor
            // 
@@ -669,14 +669,14 @@
            this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
            this.gv_foneCheckor.Visible = true;
            this.gv_foneCheckor.VisibleIndex = 9;
            this.gv_foneCheckor.VisibleIndex = 8;
            this.gv_foneCheckor.Width = 94;
            // 
            // lb_foneChecked
            // 
            this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_foneChecked.Appearance.Options.UseFont = true;
            this.lb_foneChecked.Location = new System.Drawing.Point(361, 127);
            this.lb_foneChecked.Location = new System.Drawing.Point(361, 124);
            this.lb_foneChecked.Name = "lb_foneChecked";
            this.lb_foneChecked.Size = new System.Drawing.Size(68, 21);
            this.lb_foneChecked.TabIndex = 258;
@@ -719,7 +719,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_b.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 6;
            this.gv_itemNo.VisibleIndex = 5;
            this.gv_itemNo.Width = 150;
            // 
            // lb_memo
@@ -752,7 +752,7 @@
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 14;
            this.gv_memo.VisibleIndex = 13;
            this.gv_memo.Width = 150;
            // 
            // toolBarMenu1
@@ -832,8 +832,6 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.AllowEdit = false;
            this.gridColumn7.Tag = "query_a.ITEM_ID";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 5;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn3
@@ -845,7 +843,7 @@
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Tag = "query_b.item_name";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 250;
            // 
            // gridColumn2
@@ -857,7 +855,7 @@
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Tag = "query_b.item_model";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 100;
            // 
            // gridColumn1
@@ -869,7 +867,7 @@
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "query_a.CREATE_BY";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 12;
            this.gridColumn1.VisibleIndex = 11;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
@@ -881,7 +879,7 @@
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "query_a.CREATE_DATE";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 13;
            this.gridColumn4.VisibleIndex = 12;
            this.gridColumn4.Width = 180;
            // 
            // xtraTabControl1
@@ -927,10 +925,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 167);
            this.tabMx.Location = new System.Drawing.Point(0, 161);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1127, 403);
            this.tabMx.Size = new System.Drawing.Size(1127, 409);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -941,7 +939,7 @@
            this.xtraTabPageCopy.Controls.Add(this.gridControl2);
            this.xtraTabPageCopy.Controls.Add(this.panelControl1);
            this.xtraTabPageCopy.Name = "xtraTabPageCopy";
            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 371);
            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 377);
            this.xtraTabPageCopy.Text = "复制到其它物料";
            // 
            // gridControl2
@@ -952,7 +950,7 @@
            this.gridControl2.Name = "gridControl2";
            this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit3});
            this.gridControl2.Size = new System.Drawing.Size(1125, 328);
            this.gridControl2.Size = new System.Drawing.Size(1125, 334);
            this.gridControl2.TabIndex = 1;
            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView2});
@@ -1127,19 +1125,18 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1127, 167);
            this.panel1.Size = new System.Drawing.Size(1127, 161);
            this.panel1.TabIndex = 1;
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Enabled = false;
            this.txt_itemModel.Location = new System.Drawing.Point(85, 86);
            this.txt_itemModel.Location = new System.Drawing.Point(85, 83);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(262, 64);
            this.txt_itemModel.TabIndex = 381;
            this.txt_itemModel.Tag = "itemName";
            this.txt_itemModel.Tag = "readOnly";
            // 
            // txt_ItemId
            // 
@@ -1153,7 +1150,7 @@
            // txt_ftwoChecked
            // 
            this.txt_ftwoChecked.Enabled = false;
            this.txt_ftwoChecked.Location = new System.Drawing.Point(434, 86);
            this.txt_ftwoChecked.Location = new System.Drawing.Point(434, 83);
            this.txt_ftwoChecked.Name = "txt_ftwoChecked";
            this.txt_ftwoChecked.Properties.Caption = "";
            this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
@@ -1162,7 +1159,7 @@
            // txt_foneChecked
            // 
            this.txt_foneChecked.Enabled = false;
            this.txt_foneChecked.Location = new System.Drawing.Point(434, 125);
            this.txt_foneChecked.Location = new System.Drawing.Point(434, 122);
            this.txt_foneChecked.Name = "txt_foneChecked";
            this.txt_foneChecked.Properties.Caption = "";
            this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
@@ -1172,7 +1169,7 @@
            // 
            this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemModel.Appearance.Options.UseFont = true;
            this.lb_itemModel.Location = new System.Drawing.Point(9, 86);
            this.lb_itemModel.Location = new System.Drawing.Point(9, 83);
            this.lb_itemModel.Name = "lb_itemModel";
            this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
            this.lb_itemModel.TabIndex = 375;

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs

@@ -303,6 +303,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            _sbSqlWhere += " and b.guid is not null";
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
                "a.create_date", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -720,8 +720,18 @@
                if (ctrl is MemoEdit)
                {
                    var txt = ctrl as MemoEdit;
                    txt.Text = "";
                    txt.ReadOnly = isEdt;
                    if (txt.Tag != null && txt.Tag.ToString().Length > 0 && txt.Tag.ToString().StartsWith("moren"))
                    {
                        txt.Text = txt.Tag.ToString().Replace("moren.", "");
                    }
                    else
                        txt.Text = "";
                    if (_isRead(txt.Tag))
                    {
                        txt.ReadOnly = true;
                    }
                    else
                        txt.ReadOnly = isEdt;
                    continue;
                }
                //下拉
@@ -969,7 +979,12 @@
                if (ctrl is MemoEdit)
                {
                    var txt = ctrl as MemoEdit;
                    txt.ReadOnly = isEdt;
                    if (_isRead(txt.Tag))
                    {
                        txt.ReadOnly = true;
                    }
                    else
                        txt.ReadOnly = isEdt;
                    continue;
                }
                //数字卡