| DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/Gs.DevApp.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/App.config
@@ -36,7 +36,7 @@ </runtime> <appSettings> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <!--<add key="webapiurl" value="http://localhost:5263/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs
@@ -35,7 +35,8 @@ this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); @@ -78,7 +79,8 @@ this.gv_depotCode, this.gv_depottype, this.gv_createBy, this.gv_isNg}); this.gridColumn1, this.gridColumn2}); this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -135,18 +137,25 @@ this.gv_createBy.VisibleIndex = 3; this.gv_createBy.Width = 71; // // gv_isNg // gridColumn1 // this.gv_isNg.AppearanceCell.Options.UseFont = true; this.gv_isNg.Caption = "打印机备注"; this.gv_isNg.FieldName = "remark"; this.gv_isNg.MinWidth = 50; this.gv_isNg.Name = "gv_isNg"; this.gv_isNg.OptionsColumn.AllowEdit = false; this.gv_isNg.Tag = "query_a.is_ng"; this.gv_isNg.Visible = true; this.gv_isNg.VisibleIndex = 4; this.gv_isNg.Width = 100; this.gridColumn1.Caption = "所属车间"; this.gridColumn1.FieldName = "departmentname"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 4; this.gridColumn1.Width = 94; // // gridColumn2 // this.gridColumn2.Caption = "使用组织"; this.gridColumn2.FieldName = "kcOrg"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 5; this.gridColumn2.Width = 94; // // panelControl1 // @@ -202,7 +211,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode; private DevExpress.XtraGrid.Columns.GridColumn gv_depottype; private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; private DevExpress.XtraGrid.Columns.GridColumn gv_isNg; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; } } DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs
@@ -91,7 +91,7 @@ private void getPageList(int curPage) { var _sbSqlWhere = ""; var pgq = new PageQueryModel(curPage, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString(), userGuid); var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc,a.line_no", "asc", "", _sbSqlWhere.ToString(), userGuid); var json = JsonConvert.SerializeObject(pgq); try { DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
@@ -34,36 +34,38 @@ this.split1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView(); this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_itemBarcode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_depotId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_quantity = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridColumn6 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_ownerType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_ownerType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -158,7 +160,8 @@ this.gridBand13, this.gridBand14, this.gridBand15, this.gridBand3}); this.gridBand3, this.gridBand16}); this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] { this.gv_guid, this.gv_itemBarcode, @@ -173,7 +176,8 @@ this.gv_ownerType, this.gv_ownerId, this.gridColumn5, this.bandedGridColumn1}); this.bandedGridColumn1, this.bandedGridColumn2}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -182,18 +186,6 @@ this.gridView1.OptionsView.ShowColumnHeaders = false; this.gridView1.OptionsView.ShowFooter = true; this.gridView1.OptionsView.ShowGroupPanel = false; // // gridBand1 // this.gridBand1.AppearanceHeader.Options.UseTextOptions = true; this.gridBand1.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand1.Caption = "采购明细GUID"; this.gridBand1.Columns.Add(this.gv_guid); this.gridBand1.Name = "gridBand1"; this.gridBand1.Visible = false; this.gridBand1.VisibleIndex = -1; this.gridBand1.Width = 95; // // gv_guid // @@ -207,16 +199,6 @@ this.gv_guid.Visible = true; this.gv_guid.Width = 95; // // gridBand4 // this.gridBand4.AppearanceHeader.Options.UseTextOptions = true; this.gridBand4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand4.Caption = "采购单号"; this.gridBand4.Columns.Add(this.gv_itemBarcode); this.gridBand4.Name = "gridBand4"; this.gridBand4.VisibleIndex = 0; this.gridBand4.Width = 77; // // gv_itemBarcode // this.gv_itemBarcode.AppearanceCell.Options.UseFont = true; @@ -228,15 +210,6 @@ this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE"; this.gv_itemBarcode.Visible = true; this.gv_itemBarcode.Width = 77; // // gridBand7 // this.gridBand7.Caption = "物料ID"; this.gridBand7.Columns.Add(this.gv_itemId); this.gridBand7.Name = "gridBand7"; this.gridBand7.Visible = false; this.gridBand7.VisibleIndex = -1; this.gridBand7.Width = 74; // // gv_itemId // @@ -250,14 +223,6 @@ this.gv_itemId.Visible = true; this.gv_itemId.Width = 74; // // gridBand8 // this.gridBand8.Caption = "物料编码"; this.gridBand8.Columns.Add(this.gridColumn3); this.gridBand8.Name = "gridBand8"; this.gridBand8.VisibleIndex = 1; this.gridBand8.Width = 77; // // gridColumn3 // this.gridColumn3.Caption = "物料编码"; @@ -266,14 +231,6 @@ this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.Width = 77; // // gridBand9 // this.gridBand9.Caption = "物料名称"; this.gridBand9.Columns.Add(this.gridColumn2); this.gridBand9.Name = "gridBand9"; this.gridBand9.VisibleIndex = 2; this.gridBand9.Width = 77; // // gridColumn2 // @@ -284,14 +241,6 @@ this.gridColumn2.Visible = true; this.gridColumn2.Width = 77; // // gridBand10 // this.gridBand10.Caption = "规格型号"; this.gridBand10.Columns.Add(this.gridColumn4); this.gridBand10.Name = "gridBand10"; this.gridBand10.VisibleIndex = 3; this.gridBand10.Width = 77; // // gridColumn4 // this.gridColumn4.Caption = "规格型号"; @@ -300,17 +249,6 @@ this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.Width = 77; // // gridBand11 // this.gridBand11.AppearanceHeader.Options.UseTextOptions = true; this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand11.Caption = "采购单位"; this.gridBand11.Columns.Add(this.gv_depotId); this.gridBand11.MinWidth = 30; this.gridBand11.Name = "gridBand11"; this.gridBand11.VisibleIndex = 4; this.gridBand11.Width = 77; // // gv_depotId // @@ -323,19 +261,6 @@ this.gv_depotId.Tag = "query_a.DEPOT_ID"; this.gv_depotId.Visible = true; this.gv_depotId.Width = 77; // // gridBand12 // this.gridBand12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridBand12.AppearanceHeader.Options.UseForeColor = true; this.gridBand12.AppearanceHeader.Options.UseTextOptions = true; this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand12.Caption = "采购单数量"; this.gridBand12.Columns.Add(this.gv_quantity); this.gridBand12.MinWidth = 50; this.gridBand12.Name = "gridBand12"; this.gridBand12.VisibleIndex = 5; this.gridBand12.Width = 60; // // gv_quantity // @@ -353,19 +278,6 @@ this.gv_quantity.Visible = true; this.gv_quantity.Width = 60; // // gridBand13 // this.gridBand13.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridBand13.AppearanceHeader.Options.UseForeColor = true; this.gridBand13.AppearanceHeader.Options.UseTextOptions = true; this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand13.Caption = "累计实入库"; this.gridBand13.Columns.Add(this.gridColumn6); this.gridBand13.MinWidth = 50; this.gridBand13.Name = "gridBand13"; this.gridBand13.VisibleIndex = 6; this.gridBand13.Width = 60; // // gridColumn6 // this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue; @@ -378,19 +290,6 @@ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "qtySjrk", "合计={0:0.##}")}); this.gridColumn6.Visible = true; this.gridColumn6.Width = 60; // // gridBand14 // this.gridBand14.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridBand14.AppearanceHeader.Options.UseForeColor = true; this.gridBand14.AppearanceHeader.Options.UseTextOptions = true; this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand14.Caption = "总欠料"; this.gridBand14.Columns.Add(this.gridColumn1); this.gridBand14.MinWidth = 50; this.gridBand14.Name = "gridBand14"; this.gridBand14.VisibleIndex = 7; this.gridBand14.Width = 60; // // gridColumn1 // @@ -407,15 +306,6 @@ this.gridColumn1.Visible = true; this.gridColumn1.Width = 60; // // gridBand15 // this.gridBand15.Caption = "交货进度"; this.gridBand15.Columns.Add(this.bandedGridColumn1); this.gridBand15.MinWidth = 300; this.gridBand15.Name = "gridBand15"; this.gridBand15.VisibleIndex = 8; this.gridBand15.Width = 327; // // bandedGridColumn1 // this.bandedGridColumn1.Caption = "比例"; @@ -425,6 +315,174 @@ this.bandedGridColumn1.Tag = "query_a.guid"; this.bandedGridColumn1.Visible = true; this.bandedGridColumn1.Width = 327; // // gv_ownerType // this.gv_ownerType.AppearanceCell.Options.UseFont = true; this.gv_ownerType.Caption = "累计收料数量"; this.gv_ownerType.FieldName = "sl"; this.gv_ownerType.MinWidth = 50; this.gv_ownerType.Name = "gv_ownerType"; this.gv_ownerType.OptionsColumn.AllowEdit = false; this.gv_ownerType.Tag = "query_a.Owner_Type"; this.gv_ownerType.Visible = true; this.gv_ownerType.Width = 105; // // gridColumn5 // this.gridColumn5.Caption = "累计仓退"; this.gridColumn5.FieldName = "ct"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.Width = 105; // // gv_ownerId // this.gv_ownerId.AppearanceCell.Options.UseFont = true; this.gv_ownerId.Caption = "累计验退"; this.gv_ownerId.FieldName = "yt"; this.gv_ownerId.MinWidth = 50; this.gv_ownerId.Name = "gv_ownerId"; this.gv_ownerId.OptionsColumn.AllowEdit = false; this.gv_ownerId.Tag = "query_a.Owner_Id"; this.gv_ownerId.Visible = true; this.gv_ownerId.Width = 130; // // bandedGridColumn2 // this.bandedGridColumn2.Caption = "收料组织"; this.bandedGridColumn2.FieldName = "tlOrg"; this.bandedGridColumn2.MinWidth = 25; this.bandedGridColumn2.Name = "bandedGridColumn2"; this.bandedGridColumn2.Visible = true; this.bandedGridColumn2.Width = 94; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; this.pageBar1.Location = new System.Drawing.Point(0, 519); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.Size = new System.Drawing.Size(1310, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // // gridBand1 // this.gridBand1.AppearanceHeader.Options.UseTextOptions = true; this.gridBand1.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand1.Caption = "采购明细GUID"; this.gridBand1.Columns.Add(this.gv_guid); this.gridBand1.Name = "gridBand1"; this.gridBand1.Visible = false; this.gridBand1.VisibleIndex = -1; this.gridBand1.Width = 95; // // gridBand4 // this.gridBand4.AppearanceHeader.Options.UseTextOptions = true; this.gridBand4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand4.Caption = "采购单号"; this.gridBand4.Columns.Add(this.gv_itemBarcode); this.gridBand4.Name = "gridBand4"; this.gridBand4.VisibleIndex = 0; this.gridBand4.Width = 77; // // gridBand7 // this.gridBand7.Caption = "物料ID"; this.gridBand7.Columns.Add(this.gv_itemId); this.gridBand7.Name = "gridBand7"; this.gridBand7.Visible = false; this.gridBand7.VisibleIndex = -1; this.gridBand7.Width = 74; // // gridBand8 // this.gridBand8.Caption = "物料编码"; this.gridBand8.Columns.Add(this.gridColumn3); this.gridBand8.Name = "gridBand8"; this.gridBand8.VisibleIndex = 1; this.gridBand8.Width = 77; // // gridBand9 // this.gridBand9.Caption = "物料名称"; this.gridBand9.Columns.Add(this.gridColumn2); this.gridBand9.Name = "gridBand9"; this.gridBand9.VisibleIndex = 2; this.gridBand9.Width = 77; // // gridBand10 // this.gridBand10.Caption = "规格型号"; this.gridBand10.Columns.Add(this.gridColumn4); this.gridBand10.Name = "gridBand10"; this.gridBand10.VisibleIndex = 3; this.gridBand10.Width = 77; // // gridBand11 // this.gridBand11.AppearanceHeader.Options.UseTextOptions = true; this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand11.Caption = "采购单位"; this.gridBand11.Columns.Add(this.gv_depotId); this.gridBand11.MinWidth = 30; this.gridBand11.Name = "gridBand11"; this.gridBand11.VisibleIndex = 4; this.gridBand11.Width = 77; // // gridBand12 // this.gridBand12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridBand12.AppearanceHeader.Options.UseForeColor = true; this.gridBand12.AppearanceHeader.Options.UseTextOptions = true; this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand12.Caption = "采购单数量"; this.gridBand12.Columns.Add(this.gv_quantity); this.gridBand12.MinWidth = 50; this.gridBand12.Name = "gridBand12"; this.gridBand12.VisibleIndex = 5; this.gridBand12.Width = 60; // // gridBand13 // this.gridBand13.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridBand13.AppearanceHeader.Options.UseForeColor = true; this.gridBand13.AppearanceHeader.Options.UseTextOptions = true; this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand13.Caption = "累计实入库"; this.gridBand13.Columns.Add(this.gridColumn6); this.gridBand13.MinWidth = 50; this.gridBand13.Name = "gridBand13"; this.gridBand13.VisibleIndex = 6; this.gridBand13.Width = 60; // // gridBand14 // this.gridBand14.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridBand14.AppearanceHeader.Options.UseForeColor = true; this.gridBand14.AppearanceHeader.Options.UseTextOptions = true; this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand14.Caption = "总欠料"; this.gridBand14.Columns.Add(this.gridColumn1); this.gridBand14.MinWidth = 50; this.gridBand14.Name = "gridBand14"; this.gridBand14.VisibleIndex = 7; this.gridBand14.Width = 60; // // gridBand15 // this.gridBand15.Caption = "交货进度"; this.gridBand15.Columns.Add(this.bandedGridColumn1); this.gridBand15.MinWidth = 300; this.gridBand15.Name = "gridBand15"; this.gridBand15.VisibleIndex = 8; this.gridBand15.Width = 327; // // gridBand3 // @@ -450,18 +508,6 @@ this.gridBand2.VisibleIndex = 0; this.gridBand2.Width = 105; // // gv_ownerType // this.gv_ownerType.AppearanceCell.Options.UseFont = true; this.gv_ownerType.Caption = "累计收料数量"; this.gv_ownerType.FieldName = "sl"; this.gv_ownerType.MinWidth = 50; this.gv_ownerType.Name = "gv_ownerType"; this.gv_ownerType.OptionsColumn.AllowEdit = false; this.gv_ownerType.Tag = "query_a.Owner_Type"; this.gv_ownerType.Visible = true; this.gv_ownerType.Width = 105; // // gridBand6 // this.gridBand6.AppearanceHeader.Options.UseTextOptions = true; @@ -471,15 +517,6 @@ this.gridBand6.Name = "gridBand6"; this.gridBand6.VisibleIndex = 1; this.gridBand6.Width = 105; // // gridColumn5 // this.gridColumn5.Caption = "累计仓退"; this.gridColumn5.FieldName = "ct"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.Width = 105; // // gridBand5 // @@ -491,29 +528,13 @@ this.gridBand5.VisibleIndex = 2; this.gridBand5.Width = 130; // // gv_ownerId // gridBand16 // this.gv_ownerId.AppearanceCell.Options.UseFont = true; this.gv_ownerId.Caption = "累计验退"; this.gv_ownerId.FieldName = "yt"; this.gv_ownerId.MinWidth = 50; this.gv_ownerId.Name = "gv_ownerId"; this.gv_ownerId.OptionsColumn.AllowEdit = false; this.gv_ownerId.Tag = "query_a.Owner_Id"; this.gv_ownerId.Visible = true; this.gv_ownerId.Width = 130; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; this.pageBar1.Location = new System.Drawing.Point(0, 519); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.Size = new System.Drawing.Size(1310, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; this.gridBand16.Caption = "收料组织"; this.gridBand16.Columns.Add(this.bandedGridColumn2); this.gridBand16.Name = "gridBand16"; this.gridBand16.VisibleIndex = 10; this.gridBand16.Width = 94; // // Ckcgmx // @@ -560,6 +581,7 @@ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ownerId; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn5; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7; @@ -575,5 +597,6 @@ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16; } } DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs
@@ -100,7 +100,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.RECEIVING_ORG in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -116,8 +120,8 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
@@ -50,6 +50,7 @@ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); @@ -91,7 +92,8 @@ this.gv_purchaseUnit, this.gv_inventoryUnit, this.gridColumn1, this.gridColumn2}); this.gridColumn2, this.gridColumn10}); this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -337,6 +339,16 @@ this.btnIn.TabIndex = 4; this.btnIn.Text = "确定导入"; // // gridColumn10 // this.gridColumn10.Caption = "生产组织"; this.gridColumn10.FieldName = "fSubsidiary"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 15; this.gridColumn10.Width = 94; // // SelectWompba // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -382,5 +394,6 @@ private DevExpress.XtraEditors.SimpleButton btnIn; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -84,6 +84,7 @@ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -96,6 +97,10 @@ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -114,11 +119,6 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -163,6 +163,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); @@ -175,6 +176,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -185,11 +190,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -299,8 +299,6 @@ this.gridColumn2.FieldName = "id"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 0; this.gridColumn2.Width = 94; // // gv_itemNo @@ -313,7 +311,7 @@ this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_a.item_no"; this.gv_itemNo.Visible = true; this.gv_itemNo.VisibleIndex = 1; this.gv_itemNo.VisibleIndex = 0; this.gv_itemNo.Width = 120; // // gv_itemName @@ -328,7 +326,7 @@ this.gv_itemName.OptionsColumn.AllowEdit = false; this.gv_itemName.Tag = "query_a.item_name"; this.gv_itemName.Visible = true; this.gv_itemName.VisibleIndex = 2; this.gv_itemName.VisibleIndex = 1; this.gv_itemName.Width = 250; // // gv_itemModel @@ -341,7 +339,7 @@ this.gv_itemModel.OptionsColumn.AllowEdit = false; this.gv_itemModel.Tag = "query_a.item_model"; this.gv_itemModel.Visible = true; this.gv_itemModel.VisibleIndex = 3; this.gv_itemModel.VisibleIndex = 2; this.gv_itemModel.Width = 360; // // gridColumn4 @@ -353,7 +351,7 @@ this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Tag = "org.FNumber"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 4; this.gridColumn4.VisibleIndex = 3; this.gridColumn4.Width = 250; // // splitMx1 @@ -691,6 +689,18 @@ this.layoutControlItem7.Text = "总定员"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_isCheck; this.layoutControlItem25.Location = new System.Drawing.Point(453, 95); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem25.Size = new System.Drawing.Size(151, 32); this.layoutControlItem25.Text = "审核状态"; this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem25.TextVisible = false; // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -863,6 +873,56 @@ this.layoutControlItem8.Size = new System.Drawing.Size(151, 32); this.layoutControlItem8.Text = "标准产能"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remark; this.layoutControlItem12.Location = new System.Drawing.Point(302, 63); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(302, 32); this.layoutControlItem12.Text = "流程描述"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.btnCopy; this.layoutControlItem10.Location = new System.Drawing.Point(453, 95); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem10.Size = new System.Drawing.Size(151, 32); this.layoutControlItem10.Text = "复制"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // // layoutControlItem15 // this.layoutControlItem15.Control = this.btnSelect; this.layoutControlItem15.Location = new System.Drawing.Point(302, 95); this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem15.Size = new System.Drawing.Size(151, 32); this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem15.Text = "选择工序"; this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem15.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_itemModel; this.layoutControlItem2.Location = new System.Drawing.Point(0, 95); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem2.Size = new System.Drawing.Size(302, 32); this.layoutControlItem2.Text = "规格型号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -1107,68 +1167,6 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_isCheck; this.layoutControlItem25.Location = new System.Drawing.Point(453, 95); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem25.Size = new System.Drawing.Size(151, 32); this.layoutControlItem25.Text = "审核状态"; this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem25.TextVisible = false; // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remark; this.layoutControlItem12.Location = new System.Drawing.Point(302, 63); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(302, 32); this.layoutControlItem12.Text = "流程描述"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.btnCopy; this.layoutControlItem10.Location = new System.Drawing.Point(453, 95); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem10.Size = new System.Drawing.Size(151, 32); this.layoutControlItem10.Text = "复制"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // // layoutControlItem15 // this.layoutControlItem15.Control = this.btnSelect; this.layoutControlItem15.Location = new System.Drawing.Point(302, 95); this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem15.Size = new System.Drawing.Size(151, 32); this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem15.Text = "选择工序"; this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem15.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_itemModel; this.layoutControlItem2.Location = new System.Drawing.Point(0, 95); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem2.Size = new System.Drawing.Size(302, 32); this.layoutControlItem2.Text = "规格型号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // Frm_WorkTechnique // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1223,6 +1221,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); @@ -1235,6 +1234,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1245,11 +1248,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); this.ResumeLayout(false); } DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -770,6 +770,12 @@ <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs"> <DependentUpon>CkYtmx.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Rpt\CPMX.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\Rpt\CPMX.Designer.cs"> <DependentUpon>CPMX.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Rpt\Frm_MesQL.cs"> <SubType>Form</SubType> </Compile> @@ -1828,6 +1834,9 @@ <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx"> <DependentUpon>CkYtmx.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\CPMX.resx"> <DependentUpon>CPMX.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx"> <DependentUpon>Frm_MesQL.cs</DependentUpon> </EmbeddedResource> DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -34,7 +34,10 @@ private void getSuppler() { var pgq = new PageQueryModel(1, 999999, "fNumber", "asc", "", " and IS_STATUS=1"); System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(" and IS_STATUS=1 and fid in"); _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); var pgq = new PageQueryModel(1, 999999, "fNumber", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try {
