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/Warehouse/Frm_MesShouTui.Designer.cs
@@ -119,6 +119,7 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -214,6 +215,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"; @@ -226,7 +228,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; @@ -458,7 +461,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 // @@ -469,6 +472,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 = 143; this.splitMx1.TabIndex = 0; @@ -918,7 +922,8 @@ this.gvMx1remark, this.gridColumn6, this.gridColumn8, this.gvMxDel}); this.gvMxDel, this.gridColumn9}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1024,7 +1029,7 @@ this.gvMx1sqNum.AppearanceCell.Options.UseForeColor = true; this.gvMx1sqNum.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1sqNum.AppearanceHeader.Options.UseForeColor = true; this.gvMx1sqNum.Caption = "ç³è¯·æ°é"; this.gvMx1sqNum.Caption = "æ¬æ¬¡ç³è¯·æ°é"; this.gvMx1sqNum.FieldName = "fQty"; this.gvMx1sqNum.MinWidth = 50; this.gvMx1sqNum.Name = "gvMx1sqNum"; @@ -1036,7 +1041,7 @@ // gvMx1ysNum // this.gvMx1ysNum.AppearanceCell.Options.UseFont = true; this.gvMx1ysNum.Caption = "å·²æ«æ°é"; this.gvMx1ysNum.Caption = "æ¬æ¬¡å·²æ«æ°é"; this.gvMx1ysNum.FieldName = "sQty"; this.gvMx1ysNum.MinWidth = 50; this.gvMx1ysNum.Name = "gvMx1ysNum"; @@ -1115,7 +1120,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 11; this.gvMxDel.VisibleIndex = 12; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1128,6 +1133,16 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // gridColumn9 // this.gridColumn9.Caption = "å ¥åºæ»é"; this.gridColumn9.FieldName = "rkQty"; this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 11; this.gridColumn9.Width = 94; // // picCheckBox // @@ -1285,5 +1300,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; } } DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
@@ -31,7 +31,6 @@ this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -43,6 +42,7 @@ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); @@ -69,8 +69,8 @@ this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.colChkInt, this.gv_guid, this.gv_chk, this.gridColumn4, this.gv_supplierItemCode, this.gv_supplierItemName, @@ -100,19 +100,6 @@ this.gv_guid.OptionsColumn.ReadOnly = true; this.gv_guid.Tag = "query_a.guid"; this.gv_guid.Width = 94; // // gv_chk // this.gv_chk.Caption = "éæ©"; this.gv_chk.FieldName = "gvChk"; this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left; this.gv_chk.MaxWidth = 50; this.gv_chk.MinWidth = 50; this.gv_chk.Name = "gv_chk"; this.gv_chk.Tag = "edit"; this.gv_chk.Visible = true; this.gv_chk.VisibleIndex = 0; this.gv_chk.Width = 50; // // gridColumn4 // @@ -245,6 +232,16 @@ this.gridColumn1.OptionsColumn.ReadOnly = true; this.gridColumn1.Width = 94; // // colChkInt // this.colChkInt.Caption = "."; this.colChkInt.FieldName = "chkInt"; this.colChkInt.MinWidth = 25; this.colChkInt.Name = "colChkInt"; this.colChkInt.Visible = true; this.colChkInt.VisibleIndex = 0; this.colChkInt.Width = 94; // // panelControl1 // this.panelControl1.Controls.Add(this.btnIn); @@ -256,9 +253,11 @@ // // btnIn // this.btnIn.Dock = System.Windows.Forms.DockStyle.Left; this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; this.btnIn.Appearance.Options.UseBackColor = true; this.btnIn.Dock = System.Windows.Forms.DockStyle.Right; this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161; this.btnIn.Location = new System.Drawing.Point(2, 2); this.btnIn.Location = new System.Drawing.Point(960, 2); this.btnIn.Name = "btnIn"; this.btnIn.Size = new System.Drawing.Size(94, 39); this.btnIn.TabIndex = 4; @@ -276,7 +275,7 @@ this.MinimizeBox = false; this.Name = "SelectShuoTuiSq"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "éæ©éè´§æç»"; this.Text = "éæ©åæå ¥åºæç»ï¼åªæ¾ç¤ºå¯éæ°é大äº0çï¼"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); @@ -290,7 +289,6 @@ private DevExpress.XtraGrid.GridControl gcMain; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gv_guid; private DevExpress.XtraGrid.Columns.GridColumn gv_chk; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode; private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName; @@ -304,5 +302,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraEditors.PanelControl panelControl1; private DevExpress.XtraEditors.SimpleButton btnIn; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; } } DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
@@ -2,6 +2,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Data; using System.Windows.Forms; namespace Gs.DevApp.UserControl @@ -24,6 +25,14 @@ public SelectShuoTuiSq(string _cusId, string _inOrgId, string _ckId, string _isSource) { InitializeComponent(); this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); }; this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.colChkInt.OptionsFilter.AllowAutoFilter = false; this.colChkInt.OptionsFilter.AllowFilter = false; this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False; this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left; this.colChkInt.VisibleIndex = 0; this.cusId = _cusId; this.inOrgId = _inOrgId; this.ckId = _ckId; @@ -32,27 +41,33 @@ getPageList(1); btnIn.Click += (s, e) => { var list = new List<dynamic>(); for (var i = 0; i < gridView1.DataRowCount; i++) var list = new List<dynamic>(); gridView1.PostEditor(); gridView1.UpdateCurrentRow(); DataTable dt = this.gcMain.DataSource as DataTable; { var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk"); if (checkBox == "Checked") foreach (DataRow dr in dt.Rows) { list.Add(new string checkBox = dr["chkInt"].ToString(); string _guid = dr["rkmxGuid"].ToString(); if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox)) { rkmxGuid = gridView1.GetRowCellDisplayText(i, "rkmxGuid"), invBillNo = gridView1.GetRowCellDisplayText(i, "invBillNo"), itemNo = gridView1.GetRowCellDisplayText(i, "itemNo"), itemName = gridView1.GetRowCellDisplayText(i, "itemName"), itemModel = gridView1.GetRowCellDisplayText(i, "itemModel"), itemId = gridView1.GetRowCellDisplayText(i, "itemId"), rksl = gridView1.GetRowCellDisplayText(i, "rksl"), dwName = gridView1.GetRowCellDisplayText(i, "dwName"), yt = gridView1.GetRowCellDisplayText(i, "yt"), kt = gridView1.GetRowCellDisplayText(i, "kt"), khName = gridView1.GetRowCellDisplayText(i, "khName"), receivingOrg = gridView1.GetRowCellDisplayText(i, "receivingOrg"), }); list.Add(new { rkmxGuid = dr["rkmxGuid"].ToString(), invBillNo = dr["invBillNo"].ToString(), itemNo = dr["itemNo"].ToString(), itemName = dr["itemName"].ToString(), itemModel = dr["itemModel"].ToString(), itemId = dr["itemId"].ToString(), rksl = dr["rksl"].ToString(), dwName = dr["dwName"].ToString(), yt = dr["yt"].ToString(), kt = dr["kt"].ToString(), khName = dr["khName"].ToString(), receivingOrg = dr["receivingOrg"].ToString(), }); } } } UpdateParent?.Invoke(this, @@ -96,7 +111,6 @@ gcMain.DataSource = dt; gcMain.ForceInitialize(); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //æ»é¡µ } catch (Exception ex) { DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView> <PublishUrlHistory>publish\</PublishUrlHistory> <InstallUrlHistory /> <SupportUrlHistory />
