| DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
@@ -1,4 +1,6 @@ namespace Gs.DevApp.DevFrm.RkQC using Gs.DevApp.ToolBox; namespace Gs.DevApp.DevFrm.RkQC { partial class Frm_Cqfa { @@ -91,8 +93,7 @@ this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.frm_CqfaItems1 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems(); this.frm_CqfaItems2 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -735,7 +736,7 @@ // // splitContainerControl1.Panel1 // this.splitContainerControl1.Panel1.Controls.Add(this.frm_CqfaItems1); this.splitContainerControl1.Panel1.Text = "Panel1"; // // splitContainerControl1.Panel2 @@ -761,7 +762,7 @@ // // splitContainerControl2.Panel2 // this.splitContainerControl2.Panel2.Controls.Add(this.frm_CqfaItems2); this.splitContainerControl2.Panel2.Text = "Panel2"; this.splitContainerControl2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.False; this.splitContainerControl2.Size = new System.Drawing.Size(559, 415); @@ -806,22 +807,7 @@ this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Width = 94; // // frm_CqfaItems1 // this.frm_CqfaItems1.Dock = System.Windows.Forms.DockStyle.Fill; this.frm_CqfaItems1.Location = new System.Drawing.Point(0, 0); this.frm_CqfaItems1.Name = "frm_CqfaItems1"; this.frm_CqfaItems1.Size = new System.Drawing.Size(628, 415); this.frm_CqfaItems1.TabIndex = 0; // // frm_CqfaItems2 // this.frm_CqfaItems2.Dock = System.Windows.Forms.DockStyle.Fill; this.frm_CqfaItems2.Location = new System.Drawing.Point(0, 0); this.frm_CqfaItems2.Name = "frm_CqfaItems2"; this.frm_CqfaItems2.Size = new System.Drawing.Size(476, 415); this.frm_CqfaItems2.TabIndex = 0; // // Frm_Cqfa // @@ -950,7 +936,6 @@ private DevExpress.XtraEditors.SimpleButton btnIn; private DevExpress.XtraEditors.SimpleButton btnOut; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private Frm_CqfaItems frm_CqfaItems1; private Frm_CqfaItems frm_CqfaItems2; } } DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -200,7 +200,7 @@ txt_fabm.ReadOnly = true; txt_fSubsidiary.Enabled = false; } } /// <summary> /// 新增事件 @@ -371,6 +371,28 @@ dynamic dy = _rtn.rtnData; lbGuid.Text = strGuid; UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit); Frm_CqfaItems frm_CqfaItems1 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems(QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId()); Frm_CqfaItems frm_CqfaItems2 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems(QcSeason.cqcjno.ToString(), txt_fSubsidiary.GetId()); // // frm_CqfaItems1 // frm_CqfaItems1.Dock = System.Windows.Forms.DockStyle.Fill; frm_CqfaItems1.Location = new System.Drawing.Point(0, 0); frm_CqfaItems1.Name = "frm_CqfaItems1"; frm_CqfaItems1.Size = new System.Drawing.Size(628, 415); frm_CqfaItems1.TabIndex = 0; // // frm_CqfaItems2 // frm_CqfaItems2.Dock = System.Windows.Forms.DockStyle.Fill; frm_CqfaItems2.Location = new System.Drawing.Point(0, 0); frm_CqfaItems2.Name = "frm_CqfaItems2"; frm_CqfaItems2.Size = new System.Drawing.Size(476, 415); frm_CqfaItems2.TabIndex = 0; this.splitContainerControl1.Panel1.Controls.Add(frm_CqfaItems1); this.splitContainerControl2.Panel2.Controls.Add(frm_CqfaItems2); frm_CqfaItems1.Initialize(); frm_CqfaItems2.Initialize(); } else ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
@@ -36,6 +36,7 @@ this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); @@ -48,7 +49,7 @@ this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gvMain; this.gcMain.Name = "gcMain"; this.gcMain.Size = new System.Drawing.Size(877, 665); this.gcMain.Size = new System.Drawing.Size(877, 647); this.gcMain.TabIndex = 9; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMain}); @@ -66,6 +67,7 @@ this.gv2, this.gv_salesOrderId, this.gv_orderLineId, this.gridColumn1, this.gv_itemId}); this.gvMain.GridControl = this.gcMain; this.gvMain.IndicatorWidth = 50; @@ -141,6 +143,17 @@ this.gv_orderLineId.VisibleIndex = 3; this.gv_orderLineId.Width = 50; // // gridColumn1 // this.gridColumn1.Caption = "加入"; this.gridColumn1.FieldName = "idAdd"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Tag = "a.guid"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 5; this.gridColumn1.Width = 94; // // gv_itemId // this.gv_itemId.AppearanceCell.Options.UseFont = true; @@ -155,7 +168,7 @@ // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; this.pageBar1.Location = new System.Drawing.Point(0, 617); this.pageBar1.Location = new System.Drawing.Point(0, 647); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; @@ -167,10 +180,10 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pageBar1); this.Controls.Add(this.gcMain); this.Controls.Add(this.pageBar1); this.Name = "Frm_CqfaItems"; this.Size = new System.Drawing.Size(877, 665); this.Size = new System.Drawing.Size(877, 695); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit(); this.ResumeLayout(false); @@ -189,5 +202,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId; private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } } DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
@@ -1,14 +1,9 @@ using DevExpress.XtraEditors; using Gs.DevApp.Entity; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -16,12 +11,15 @@ { public partial class Frm_CqfaItems : DevExpress.XtraEditors.XtraUserControl { string strType = "iqc"; string strType = ""; string orgId = ""; private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesQmCheckitemManager/"; public Frm_CqfaItems() public Frm_CqfaItems(string _strType, string _orgId) { InitializeComponent(); strType = _strType; orgId = _orgId; pageBar1.setBar(false); this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); }; @@ -30,9 +28,12 @@ this.colChkInt.OptionsFilter.AllowFilter = false; this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False; this.pageBar1.setBar(false); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain); } public void Initialize() { getPageList(1); } #region 源物料数据绑定 @@ -62,7 +63,7 @@ { gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); //_sbSqlWhere += " and q.guid is null"; _sbSqlWhere += " and org.fid=" + orgId + ""; var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType); var json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2439,7 +2439,9 @@ 生产退料入库检, 其它入库检, 销售退货入库检, 超期检 超期检, cqcjyes,//重检方案 cqcjno,//重检方案 }
