DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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/FQC/Frm_FqcDetect01.Designer.cs
@@ -148,8 +148,6 @@ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -223,6 +221,10 @@ 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.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_kbSl = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -301,8 +303,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); @@ -354,6 +354,10 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); this.SuspendLayout(); // // repositoryItemComboBox1 @@ -878,6 +882,7 @@ this.layoutMx1.Controls.Add(this.txt_lineName); this.layoutMx1.Controls.Add(this.txt_itemId); this.layoutMx1.Controls.Add(this.txt_lineId); this.layoutMx1.Controls.Add(this.txt_kbSl); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem17, @@ -1202,7 +1207,7 @@ // // txt_lineName // this.txt_lineName.Location = new System.Drawing.Point(84, 99); this.txt_lineName.Location = new System.Drawing.Point(84, 128); this.txt_lineName.Name = "txt_lineName"; this.txt_lineName.Size = new System.Drawing.Size(254, 24); this.txt_lineName.StyleController = this.layoutMx1; @@ -1211,7 +1216,7 @@ // // txt_itemId // this.txt_itemId.Location = new System.Drawing.Point(84, 128); this.txt_itemId.Location = new System.Drawing.Point(744, 244); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(254, 24); this.txt_itemId.StyleController = this.layoutMx1; @@ -1278,8 +1283,6 @@ this.layoutControlItem5, this.layoutControlItem1, this.layoutControlItem28, this.txt_itemId1111, this.txt_lineName111, this.txt_boxQty11, this.layoutControlItem9, this.layoutControlItem22, @@ -1287,7 +1290,10 @@ this.layoutControlItem3, this.txt_epTagtxt, this.layoutControlItem18, this.layoutControlItem4}); this.layoutControlItem4, this.txt_itemId1111, this.txt_lineName111, this.layoutControlItem30}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1584,26 +1590,6 @@ this.layoutControlItem28.Text = "选择工单"; this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); // // txt_itemId1111 // this.txt_itemId1111.Control = this.txt_itemId; this.txt_itemId1111.Location = new System.Drawing.Point(0, 116); this.txt_itemId1111.Name = "txt_itemId1111"; this.txt_itemId1111.OptionsTableLayoutItem.RowIndex = 4; this.txt_itemId1111.Size = new System.Drawing.Size(330, 29); this.txt_itemId1111.Text = "产品ID"; this.txt_itemId1111.TextSize = new System.Drawing.Size(60, 18); // // txt_lineName111 // this.txt_lineName111.Control = this.txt_lineName; this.txt_lineName111.Location = new System.Drawing.Point(0, 87); this.txt_lineName111.Name = "txt_lineName111"; this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3; this.txt_lineName111.Size = new System.Drawing.Size(330, 29); this.txt_lineName111.Text = "生产线别"; this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18); // // txt_boxQty11 // this.txt_boxQty11.Control = this.txt_kbList; @@ -1611,7 +1597,7 @@ this.txt_boxQty11.Name = "txt_boxQty11"; this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2; this.txt_boxQty11.Size = new System.Drawing.Size(330, 29); this.txt_boxQty11.Text = "选择箱码"; this.txt_boxQty11.Text = "送检箱码"; this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 @@ -2443,6 +2429,46 @@ // this.gridView4.Name = "gridView4"; // // txt_itemId1111 // this.txt_itemId1111.Control = this.txt_itemId; this.txt_itemId1111.Location = new System.Drawing.Point(660, 232); this.txt_itemId1111.Name = "txt_itemId1111"; this.txt_itemId1111.OptionsTableLayoutItem.ColumnIndex = 2; this.txt_itemId1111.OptionsTableLayoutItem.RowIndex = 8; this.txt_itemId1111.Size = new System.Drawing.Size(330, 30); this.txt_itemId1111.Text = "产品ID"; this.txt_itemId1111.TextSize = new System.Drawing.Size(60, 18); // // txt_lineName111 // this.txt_lineName111.Control = this.txt_lineName; this.txt_lineName111.Location = new System.Drawing.Point(0, 116); this.txt_lineName111.Name = "txt_lineName111"; this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 4; this.txt_lineName111.Size = new System.Drawing.Size(330, 29); this.txt_lineName111.Text = "生产线别"; this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18); // // txt_kbSl // this.txt_kbSl.Location = new System.Drawing.Point(84, 99); this.txt_kbSl.Name = "txt_kbSl"; this.txt_kbSl.Size = new System.Drawing.Size(254, 24); this.txt_kbSl.StyleController = this.layoutMx1; this.txt_kbSl.TabIndex = 835; this.txt_kbSl.Tag = "readonly"; // // layoutControlItem30 // this.layoutControlItem30.Control = this.txt_kbSl; this.layoutControlItem30.Location = new System.Drawing.Point(0, 87); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem30.Size = new System.Drawing.Size(330, 29); this.layoutControlItem30.Text = "送检数量"; this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18); // // Frm_FqcDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2531,8 +2557,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); @@ -2584,6 +2608,10 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); this.ResumeLayout(false); } @@ -2750,8 +2778,6 @@ private DevExpress.XtraEditors.TextEdit txt_itemId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111; private DevExpress.XtraLayout.LayoutControlItem txt_lineName111; private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; @@ -2763,5 +2789,9 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraTab.XtraTabPage tabMxPage2; private UcChouJianList ucChouJianList1; private DevExpress.XtraEditors.TextEdit txt_kbSl; private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111; private DevExpress.XtraLayout.LayoutControlItem txt_lineName111; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; } } DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -93,16 +93,19 @@ { try { var lst = new List<string>(); lst = ee.StringList; var lst = new List<dynamic>(); lst = ee.DynamicList; System.Text.StringBuilder sb = new System.Text.StringBuilder(); decimal kbSl = 0; foreach (var item in lst) { if (sb.Length > 0) sb.Append(","); sb.Append(item); sb.Append(item.itemBarcode); kbSl += decimal.Parse(item.sl.ToString()); }; txt_kbList.Text = sb.ToString(); txt_kbSl.Text = kbSl.ToString(); } catch (Exception ex) { @@ -438,6 +441,7 @@ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); this.ucUpFileList1.pGuid = ""; this.ucChouJianList1.pGuid = ""; } /// <summary> /// 修改事件 @@ -667,6 +671,7 @@ gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); ucUpFileList1.pGuid = lbGuid.Text.Trim(); ucChouJianList1.pGuid = lbGuid.Text.Trim(); if (guid5.Length > 10) { int rowHandle = 0; @@ -753,7 +758,7 @@ private void setEable(bool bl) { // txtChouJian.ReadOnly=txtJianYan.ReadOnly = !bl; txtJianYan.ReadOnly = !bl; btnLoad.Enabled = bl; btnIpt.Text = (bl == true ? "录入样本" : "查看样本"); } DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs
@@ -21,21 +21,25 @@ { InitializeComponent(); this.daaNo = _daaNo; this.Text = "请选择【"+this.daaNo+"】的卡板码"; this.Text = "请选择【" + this.daaNo + "】的箱码"; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false); getPageList(1); btnIn.Click += (s, e) => { var list = new List<string>(); var list = new List<dynamic>(); int[] rows = this.gridView1.GetSelectedRows();//先获取选择行的行号 DataTable dt = this.gcMain.DataSource as DataTable;//得到GridControl的数据源 foreach (int idx in rows) { string _guid = dt.Rows[idx]["itemBarcode"].ToString(); list.Add(_guid); list.Add(new { itemBarcode = _guid, sl = "10", }); } UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); new UpdateParentEventArgs { DynamicList = list }); Close(); }; } DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.Designer.cs
@@ -111,6 +111,7 @@ this.gvMx2guid.FieldName = "guid"; this.gvMx2guid.MinWidth = 50; this.gvMx2guid.Name = "gvMx2guid"; this.gvMx2guid.OptionsColumn.ReadOnly = true; this.gvMx2guid.Tag = "query_a.guid"; this.gvMx2guid.Width = 94; // @@ -121,6 +122,7 @@ this.gridColumn12.MaxWidth = 50; this.gridColumn12.MinWidth = 50; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.OptionsColumn.ReadOnly = true; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 0; this.gridColumn12.Width = 50; @@ -132,6 +134,7 @@ this.gvMx2itemBarcode.FieldName = "itemBarcode"; this.gvMx2itemBarcode.MinWidth = 50; this.gvMx2itemBarcode.Name = "gvMx2itemBarcode"; this.gvMx2itemBarcode.OptionsColumn.ReadOnly = true; this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE"; this.gvMx2itemBarcode.Visible = true; this.gvMx2itemBarcode.VisibleIndex = 1; @@ -144,6 +147,7 @@ this.gvMx2quantity.FieldName = "daa001"; this.gvMx2quantity.MinWidth = 50; this.gvMx2quantity.Name = "gvMx2quantity"; this.gvMx2quantity.OptionsColumn.ReadOnly = true; this.gvMx2quantity.Tag = "query_a.QUANTITY"; this.gvMx2quantity.Visible = true; this.gvMx2quantity.VisibleIndex = 2; @@ -155,6 +159,7 @@ this.gridColumn16.FieldName = "itemNo"; this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.OptionsColumn.ReadOnly = true; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 3; this.gridColumn16.Width = 94; @@ -166,6 +171,7 @@ this.gvMx2itemSname.FieldName = "itemName"; this.gvMx2itemSname.MinWidth = 50; this.gvMx2itemSname.Name = "gvMx2itemSname"; this.gvMx2itemSname.OptionsColumn.ReadOnly = true; this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME"; this.gvMx2itemSname.Visible = true; this.gvMx2itemSname.VisibleIndex = 4; @@ -177,6 +183,7 @@ this.gridColumn34.FieldName = "dwName"; this.gridColumn34.MinWidth = 25; this.gridColumn34.Name = "gridColumn34"; this.gridColumn34.OptionsColumn.ReadOnly = true; this.gridColumn34.Visible = true; this.gridColumn34.VisibleIndex = 5; this.gridColumn34.Width = 94; @@ -187,6 +194,7 @@ this.gridColumn35.FieldName = "quantity"; this.gridColumn35.MinWidth = 25; this.gridColumn35.Name = "gridColumn35"; this.gridColumn35.OptionsColumn.ReadOnly = true; this.gridColumn35.Visible = true; this.gridColumn35.VisibleIndex = 6; this.gridColumn35.Width = 94; @@ -197,6 +205,7 @@ this.gridColumn36.FieldName = "wrkQty"; this.gridColumn36.MinWidth = 25; this.gridColumn36.Name = "gridColumn36"; this.gridColumn36.OptionsColumn.ReadOnly = true; this.gridColumn36.Visible = true; this.gridColumn36.VisibleIndex = 7; this.gridColumn36.Width = 94; @@ -207,16 +216,18 @@ this.gridColumn11.FieldName = "rkQty"; this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.OptionsColumn.ReadOnly = true; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 8; this.gridColumn11.Width = 94; // // gridColumn31 // this.gridColumn31.Caption = "箱号"; this.gridColumn31.FieldName = "tbNo"; this.gridColumn31.Caption = "托板码"; this.gridColumn31.FieldName = "tbBarcode"; this.gridColumn31.MinWidth = 25; this.gridColumn31.Name = "gridColumn31"; this.gridColumn31.OptionsColumn.ReadOnly = true; this.gridColumn31.Visible = true; this.gridColumn31.VisibleIndex = 9; this.gridColumn31.Width = 94; @@ -254,11 +265,11 @@ // // txtChouJian // this.txtChouJian.Location = new System.Drawing.Point(121, 4); this.txtChouJian.Location = new System.Drawing.Point(136, 4); this.txtChouJian.Name = "txtChouJian"; this.txtChouJian.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F); this.txtChouJian.Properties.Appearance.Options.UseFont = true; this.txtChouJian.Size = new System.Drawing.Size(285, 36); this.txtChouJian.Size = new System.Drawing.Size(270, 36); this.txtChouJian.StyleController = this.layoutMxMsg2; this.txtChouJian.TabIndex = 4; // @@ -294,8 +305,8 @@ this.layoutControlItem30.Location = new System.Drawing.Point(0, 0); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.Size = new System.Drawing.Size(406, 43); this.layoutControlItem30.Text = "请扫抽检的条码"; this.layoutControlItem30.TextSize = new System.Drawing.Size(105, 18); this.layoutControlItem30.Text = "请录入抽检的条码"; this.layoutControlItem30.TextSize = new System.Drawing.Size(120, 18); // // UcChouJianList // DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
@@ -22,7 +22,65 @@ { InitializeComponent(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx14); txtChouJian.KeyDown += TxtChouJian_KeyDown; } private void TxtChouJian_KeyDown(object sender, KeyEventArgs e) { string _strCmd = txtChouJian.Text.Trim(); if (e.KeyCode == Keys.Enter) { if (string.IsNullOrEmpty(_strCmd)) { ToolBox.MsgHelper.Warning("提示:请先录入条码!"); return; } if (string.IsNullOrEmpty(pGuid)) { ToolBox.MsgHelper.Warning("提示:请先完善检验单!"); return; } if (e.KeyCode == Keys.Enter) { var _obj = new { pGuid = pGuid, //这是检验单guid itemBarCode = _strCmd,//或者0k-19,或者ng-19 }; try { var strJson = UtilityHelper.HttpPost("", _webServiceName + "EdtModel14", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) { array.Add(a); } DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); gcMx14.BindingContext = new BindingContext(); gcMx14.DataSource = dt; gcMx14.ForceInitialize(); gvMx14.BestFitColumns(); } else { Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg); } txtChouJian.Text = ""; } catch (Exception ex) { MsgHelper.Warning("提示:" + ex.Message); } } } } private string _val; public string pGuid { DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs
@@ -8,13 +8,32 @@ /// </summary> public class UpdateParentEventArgs : EventArgs { /// <summary> /// 单个string数据 /// </summary> public string Data { get; set; } /// <summary> /// 过滤实体 /// </summary> public List<FilterEntity> FilterList { get; set; } /// <summary> /// 字符串列表 /// </summary> public List<string> StringList { get; set; } /// <summary> /// 动态对象列表 /// </summary> public List<dynamic> DynamicList { get; set; } /// <summary> /// 单个字符串 /// </summary> public string StringSingle { get; set; } } }