DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -220,6 +220,7 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -463,7 +464,8 @@ this.gridColumn30, this.gridColumn13, this.gridColumn17, this.gridColumn7}); this.gridColumn7, this.gridColumn6}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -2419,6 +2421,16 @@ // this.gridView4.Name = "gridView4"; // // gridColumn6 // this.gridColumn6.Caption = "生产组织"; this.gridColumn6.FieldName = "fSubsidiary"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 21; this.gridColumn6.Width = 94; // // Frm_FqcDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2736,5 +2748,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; } } DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -676,7 +676,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 daa.erp_sczz in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -188,6 +188,7 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -406,7 +407,8 @@ this.gridColumn13, this.gridColumn17, this.gridColumn5, this.gridColumn6}); this.gridColumn6, this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -1966,6 +1968,16 @@ // this.gridView4.Name = "gridView4"; // // gridColumn7 // this.gridColumn7.Caption = "生产组织"; this.gridColumn7.FieldName = "fSubsidiary"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 23; this.gridColumn7.Width = 94; // // Frm_ShouJianDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2223,5 +2235,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptButtonUrl; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; } } DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Configuration; using System.Data; using System.Linq; using System.Net; using System.Threading.Tasks; using System.Windows.Forms; @@ -211,8 +212,11 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); // _sbSqlWhere += " and isnull(fsubmit,0)=0"; gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and daa.erp_sczz in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
@@ -182,6 +182,7 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -397,7 +398,8 @@ this.gridColumn13, this.gridColumn17, this.gridColumn5, this.gridColumn6}); this.gridColumn6, this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -1937,6 +1939,16 @@ // this.gridView4.Name = "gridView4"; // // gridColumn7 // this.gridColumn7.Caption = "生产组织"; this.gridColumn7.FieldName = "fSubsidiary"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 21; this.gridColumn7.Width = 94; // // Frm_XunJianDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2192,5 +2204,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; } } DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Configuration; using System.Data; using System.Linq; using System.Net; using System.Threading.Tasks; using System.Windows.Forms; @@ -226,8 +227,11 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); // _sbSqlWhere += " and isnull(fsubmit,0)=0"; gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and daa.erp_sczz in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -586,7 +586,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(" a.ReceiveOrgId in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -274,8 +274,14 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and b.guid is not null"; gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and b.guid is not null"); _sbSqlWhere.Append(" and org.fid in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.ITEM_NO", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; @@ -437,9 +438,14 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and b.guid is not null"; _sbSqlWhere += " and a.FTYPE='" + this.strType + "'"; gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and b.guid is not null"); _sbSqlWhere.Append(" and a.FTYPE='" + this.strType + "'"); _sbSqlWhere.Append(" and org.fid in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -140,7 +140,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(" arn.ReceiveOrgId in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -329,7 +329,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.fSubsidiary in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.fabm", "desc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
@@ -235,6 +235,7 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -489,7 +490,8 @@ this.gridColumn17, this.gridColumn30, this.gridColumn5, this.gridColumn6}); this.gridColumn6, this.gridColumn31}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -1047,9 +1049,9 @@ // // txt_aboutGuid // this.txt_aboutGuid.Location = new System.Drawing.Point(800, 124); this.txt_aboutGuid.Location = new System.Drawing.Point(1125, 149); this.txt_aboutGuid.Name = "txt_aboutGuid"; this.txt_aboutGuid.Size = new System.Drawing.Size(183, 24); this.txt_aboutGuid.Size = new System.Drawing.Size(184, 24); this.txt_aboutGuid.StyleController = this.layoutMx1; this.txt_aboutGuid.TabIndex = 816; // @@ -1109,11 +1111,11 @@ // layoutControlItem36 // this.layoutControlItem36.Control = this.txt_aboutGuid; this.layoutControlItem36.Location = new System.Drawing.Point(650, 112); this.layoutControlItem36.Location = new System.Drawing.Point(975, 140); this.layoutControlItem36.Name = "layoutControlItem36"; this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem36.Size = new System.Drawing.Size(325, 28); this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem36.Size = new System.Drawing.Size(326, 28); this.layoutControlItem36.Text = "生产退料明细GUID"; this.layoutControlItem36.TextSize = new System.Drawing.Size(126, 18); // @@ -2520,6 +2522,16 @@ // this.gridView4.Name = "gridView4"; // // gridColumn31 // this.gridColumn31.Caption = "入库组织"; this.gridColumn31.FieldName = "receivingOrg"; this.gridColumn31.MinWidth = 25; this.gridColumn31.Name = "gridColumn31"; this.gridColumn31.Visible = true; this.gridColumn31.VisibleIndex = 20; this.gridColumn31.Width = 94; // // RkDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2820,7 +2832,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; private DevExpress.XtraEditors.TextEdit txt_aboutGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; @@ -2844,5 +2855,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraEditors.TextEdit txt_receiveOrgId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36; private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; } } DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -502,6 +502,8 @@ { 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)); if (strType == QcSeason.其它入库检.ToString()) { DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
@@ -128,6 +128,7 @@ this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -230,6 +231,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -242,7 +244,8 @@ // // split1.Panel2 // this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -280,7 +283,8 @@ this.gv_createDate, this.gv_remark, this.gridColumn8, this.gridColumn9}); this.gridColumn9, this.gridColumn10}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -507,7 +511,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -518,6 +522,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); this.splitMx1.SplitterPosition = 139; this.splitMx1.TabIndex = 0; @@ -1259,6 +1264,16 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // gridColumn10 // this.gridColumn10.Caption = "领料组织"; this.gridColumn10.FieldName = "stockownerName"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 15; this.gridColumn10.Width = 94; // // Frm_WwLlDj // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1425,5 +1440,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; } } DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -158,7 +158,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 hzOrg.FID in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -133,6 +133,7 @@ this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -285,7 +286,8 @@ this.gv_tbl010, this.gv_tbl011, this.gv_tbl012, this.gridColumn11}); this.gridColumn11, this.gridColumn14}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -553,7 +555,7 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; this.btnSelect.Location = new System.Drawing.Point(12, 97); this.btnSelect.Location = new System.Drawing.Point(12, 105); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(86, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -562,10 +564,10 @@ // // txt_itemName // this.txt_itemName.Location = new System.Drawing.Point(626, 35); this.txt_itemName.Location = new System.Drawing.Point(636, 43); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; this.txt_itemName.Size = new System.Drawing.Size(195, 24); this.txt_itemName.Size = new System.Drawing.Size(200, 24); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 464; this.txt_itemName.Tag = "readonly"; @@ -573,7 +575,7 @@ // txt_tbl005 // this.txt_tbl005.EditValue = "-请选择-"; this.txt_tbl005.Location = new System.Drawing.Point(84, 66); this.txt_tbl005.Location = new System.Drawing.Point(84, 74); this.txt_tbl005.Name = "txt_tbl005"; this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -583,102 +585,102 @@ "来料不良退料", "作业不良退料"}); this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_tbl005.Size = new System.Drawing.Size(195, 24); this.txt_tbl005.Size = new System.Drawing.Size(200, 24); this.txt_tbl005.StyleController = this.layoutMx1; this.txt_tbl005.TabIndex = 459; // // txt_tbl002 // this.txt_tbl002.IsReadly = false; this.txt_tbl002.Location = new System.Drawing.Point(84, 35); this.txt_tbl002.Location = new System.Drawing.Point(84, 43); this.txt_tbl002.Name = "txt_tbl002"; this.txt_tbl002.Size = new System.Drawing.Size(195, 24); this.txt_tbl002.Size = new System.Drawing.Size(200, 24); this.txt_tbl002.TabIndex = 462; // // txt_billNo // this.txt_billNo.Location = new System.Drawing.Point(84, 4); this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(195, 24); this.txt_billNo.Size = new System.Drawing.Size(200, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; this.txt_billNo.Tag = "readonly"; // // txt_tbl012 // this.txt_tbl012.Location = new System.Drawing.Point(897, 35); this.txt_tbl012.Location = new System.Drawing.Point(912, 43); this.txt_tbl012.Name = "txt_tbl012"; this.txt_tbl012.Properties.Appearance.Options.UseFont = true; this.txt_tbl012.Size = new System.Drawing.Size(196, 24); this.txt_tbl012.Size = new System.Drawing.Size(202, 24); this.txt_tbl012.StyleController = this.layoutMx1; this.txt_tbl012.TabIndex = 247; this.txt_tbl012.Tag = "readonly"; // // txt_daa014 // this.txt_daa014.Location = new System.Drawing.Point(355, 4); this.txt_daa014.Location = new System.Drawing.Point(360, 12); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Properties.Appearance.Options.UseFont = true; this.txt_daa014.Size = new System.Drawing.Size(195, 24); this.txt_daa014.Size = new System.Drawing.Size(200, 24); this.txt_daa014.StyleController = this.layoutMx1; this.txt_daa014.TabIndex = 217; this.txt_daa014.Tag = "readonly"; // // txt_itemNo // this.txt_itemNo.Location = new System.Drawing.Point(626, 4); this.txt_itemNo.Location = new System.Drawing.Point(636, 12); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Size = new System.Drawing.Size(195, 24); this.txt_itemNo.Size = new System.Drawing.Size(200, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 298; this.txt_itemNo.Tag = "readonly"; // // txt_tbl011 // this.txt_tbl011.Location = new System.Drawing.Point(897, 4); this.txt_tbl011.Location = new System.Drawing.Point(912, 12); this.txt_tbl011.Name = "txt_tbl011"; this.txt_tbl011.Properties.Appearance.Options.UseFont = true; this.txt_tbl011.Size = new System.Drawing.Size(196, 24); this.txt_tbl011.Size = new System.Drawing.Size(202, 24); this.txt_tbl011.StyleController = this.layoutMx1; this.txt_tbl011.TabIndex = 243; this.txt_tbl011.Tag = "readonly"; // // txt_itemModel // this.txt_itemModel.Location = new System.Drawing.Point(626, 66); this.txt_itemModel.Location = new System.Drawing.Point(636, 74); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Properties.Appearance.Options.UseFont = true; this.txt_itemModel.Size = new System.Drawing.Size(195, 24); this.txt_itemModel.Size = new System.Drawing.Size(200, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 219; this.txt_itemModel.Tag = "readonly"; // // txt_tbl006 // this.txt_tbl006.Location = new System.Drawing.Point(355, 66); this.txt_tbl006.Location = new System.Drawing.Point(360, 74); this.txt_tbl006.Name = "txt_tbl006"; this.txt_tbl006.Properties.Appearance.Options.UseFont = true; this.txt_tbl006.Size = new System.Drawing.Size(195, 24); this.txt_tbl006.Size = new System.Drawing.Size(200, 24); this.txt_tbl006.StyleController = this.layoutMx1; this.txt_tbl006.TabIndex = 226; // // txt_tbl013 // this.txt_tbl013.Location = new System.Drawing.Point(825, 66); this.txt_tbl013.Location = new System.Drawing.Point(840, 74); this.txt_tbl013.Name = "txt_tbl013"; this.txt_tbl013.Properties.Caption = "审核状态"; this.txt_tbl013.Size = new System.Drawing.Size(268, 24); this.txt_tbl013.Size = new System.Drawing.Size(274, 24); this.txt_tbl013.StyleController = this.layoutMx1; this.txt_tbl013.TabIndex = 465; this.txt_tbl013.Tag = "readonly"; // // txt_erpProductionOrderNo // this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 35); this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(360, 43); this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo"; this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24); this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(200, 24); this.txt_erpProductionOrderNo.StyleController = this.layoutMx1; this.txt_erpProductionOrderNo.TabIndex = 467; this.txt_erpProductionOrderNo.Tag = "readonly"; @@ -741,7 +743,7 @@ rowDefinition2, rowDefinition3, rowDefinition4}); this.Root.Size = new System.Drawing.Size(1105, 144); this.Root.Size = new System.Drawing.Size(1126, 144); this.Root.TextVisible = false; // // layoutControlItem1 @@ -749,27 +751,27 @@ this.layoutControlItem1.Control = this.txt_billNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(271, 31); this.layoutControlItem1.Size = new System.Drawing.Size(276, 31); this.layoutControlItem1.Text = "申请单号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_daa014; this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); this.layoutControlItem2.Location = new System.Drawing.Point(276, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(271, 31); this.layoutControlItem2.Size = new System.Drawing.Size(276, 31); this.layoutControlItem2.Text = "投料单号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_itemNo; this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); this.layoutControlItem3.Location = new System.Drawing.Point(552, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(271, 31); this.layoutControlItem3.Size = new System.Drawing.Size(276, 31); this.layoutControlItem3.Text = "产品编码"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // @@ -779,29 +781,29 @@ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem4.Size = new System.Drawing.Size(271, 31); this.layoutControlItem4.Size = new System.Drawing.Size(276, 31); this.layoutControlItem4.Text = "委外工单"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_itemName; this.layoutControlItem5.Location = new System.Drawing.Point(542, 31); this.layoutControlItem5.Location = new System.Drawing.Point(552, 31); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(271, 31); this.layoutControlItem5.Size = new System.Drawing.Size(276, 31); this.layoutControlItem5.Text = "产品名称"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_itemModel; this.layoutControlItem6.Location = new System.Drawing.Point(542, 62); this.layoutControlItem6.Location = new System.Drawing.Point(552, 62); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem6.Size = new System.Drawing.Size(271, 31); this.layoutControlItem6.Size = new System.Drawing.Size(276, 31); this.layoutControlItem6.Text = "产品型号"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // @@ -811,39 +813,39 @@ this.layoutControlItem7.Location = new System.Drawing.Point(0, 62); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem7.Size = new System.Drawing.Size(271, 31); this.layoutControlItem7.Size = new System.Drawing.Size(276, 31); this.layoutControlItem7.Text = "退料类型"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_tbl011; this.layoutControlItem9.Location = new System.Drawing.Point(813, 0); this.layoutControlItem9.Location = new System.Drawing.Point(828, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem9.Size = new System.Drawing.Size(272, 31); this.layoutControlItem9.Size = new System.Drawing.Size(278, 31); this.layoutControlItem9.Text = "审核人"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_tbl012; this.layoutControlItem10.Location = new System.Drawing.Point(813, 31); this.layoutControlItem10.Location = new System.Drawing.Point(828, 31); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem10.Size = new System.Drawing.Size(272, 31); this.layoutControlItem10.Size = new System.Drawing.Size(278, 31); this.layoutControlItem10.Text = "审核时间"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_tbl013; this.layoutControlItem11.Location = new System.Drawing.Point(813, 62); this.layoutControlItem11.Location = new System.Drawing.Point(828, 62); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(272, 31); this.layoutControlItem11.Size = new System.Drawing.Size(278, 31); this.layoutControlItem11.Text = "审核状态"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; @@ -851,22 +853,22 @@ // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_erpProductionOrderNo; this.layoutControlItem15.Location = new System.Drawing.Point(271, 31); this.layoutControlItem15.Location = new System.Drawing.Point(276, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem15.Size = new System.Drawing.Size(271, 31); this.layoutControlItem15.Size = new System.Drawing.Size(276, 31); this.layoutControlItem15.Text = "任务单号"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_tbl006; this.layoutControlItem8.Location = new System.Drawing.Point(271, 62); this.layoutControlItem8.Location = new System.Drawing.Point(276, 62); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem8.Size = new System.Drawing.Size(271, 31); this.layoutControlItem8.Size = new System.Drawing.Size(276, 31); this.layoutControlItem8.Text = "备注"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // @@ -878,7 +880,7 @@ this.layoutControlItem13.MinSize = new System.Drawing.Size(90, 31); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(271, 31); this.layoutControlItem13.Size = new System.Drawing.Size(276, 31); this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem13.Text = "选择按钮"; this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); @@ -1302,6 +1304,16 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // gridColumn14 // this.gridColumn14.Caption = "入库货主"; this.gridColumn14.FieldName = "tlOrg"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 13; this.gridColumn14.Width = 94; // // Frm_WwTbl // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1467,5 +1479,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; } } DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -386,7 +386,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 rwd.STOCKOWNER in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
@@ -156,7 +156,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)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; @@ -383,8 +384,12 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and a.bl008='" + strType + "'"; gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and a.bl008='" + strType + "'"); _sbSqlWhere.Append(" and a.org_id in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
@@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; @@ -172,8 +173,11 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and a.out_type='" + strType + "'"; gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and a.out_type='" + strType + "'"); _sbSqlWhere.Append(" and sq.org_id in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -155,6 +155,7 @@ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -313,7 +314,8 @@ this.gridColumn23, this.gridColumn37, this.gridColumn38, this.gridColumn3}); this.gridColumn3, this.gridColumn19}); this.gridView1.GridControl = this.gcMain1; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; @@ -1511,6 +1513,16 @@ this.gridColumn25.VisibleIndex = 12; this.gridColumn25.Width = 94; // // gridColumn19 // this.gridColumn19.Caption = "生产组织"; this.gridColumn19.FieldName = "fSubsidiary"; this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 11; this.gridColumn19.Width = 94; // // Frm_Repair // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1708,5 +1720,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -132,7 +132,13 @@ private void getPageList(int curPage) { txt_barCode111.Text = ""; gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and d.erp_sczz in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -170,7 +170,12 @@ private void getPageList(int curPage) { gcMain1.DataSource = null; gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and a.FSubsidiary in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq);
