| DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcToolBarMenu.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/WOM/Frm_Womcaa.Designer.cs
@@ -127,6 +127,7 @@ this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -165,7 +166,7 @@ this.gvMx1scraprate.Name = "gvMx1scraprate"; this.gvMx1scraprate.Tag = "query_a.SCRAPRATE"; this.gvMx1scraprate.Visible = true; this.gvMx1scraprate.VisibleIndex = 5; this.gvMx1scraprate.VisibleIndex = 6; this.gvMx1scraprate.Width = 94; // // gvMx1scrapqty @@ -178,7 +179,7 @@ this.gvMx1scrapqty.Name = "gvMx1scrapqty"; this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY"; this.gvMx1scrapqty.Visible = true; this.gvMx1scrapqty.VisibleIndex = 6; this.gvMx1scrapqty.VisibleIndex = 7; this.gvMx1scrapqty.Width = 94; // // gvMx1denominator @@ -191,7 +192,7 @@ this.gvMx1denominator.Name = "gvMx1denominator"; this.gvMx1denominator.Tag = "query_a.DENOMINATOR"; this.gvMx1denominator.Visible = true; this.gvMx1denominator.VisibleIndex = 13; this.gvMx1denominator.VisibleIndex = 14; this.gvMx1denominator.Width = 94; // // gvMx1numerator @@ -204,7 +205,7 @@ this.gvMx1numerator.Name = "gvMx1numerator"; this.gvMx1numerator.Tag = "query_a.NUMERATOR"; this.gvMx1numerator.Visible = true; this.gvMx1numerator.VisibleIndex = 12; this.gvMx1numerator.VisibleIndex = 13; this.gvMx1numerator.Width = 94; // // gvMx1issueType @@ -217,7 +218,7 @@ this.gvMx1issueType.Name = "gvMx1issueType"; this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE"; this.gvMx1issueType.Visible = true; this.gvMx1issueType.VisibleIndex = 10; this.gvMx1issueType.VisibleIndex = 11; this.gvMx1issueType.Width = 94; // // gvMx1depotCode @@ -230,7 +231,7 @@ this.gvMx1depotCode.Name = "gvMx1depotCode"; this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE"; this.gvMx1depotCode.Visible = true; this.gvMx1depotCode.VisibleIndex = 3; this.gvMx1depotCode.VisibleIndex = 4; this.gvMx1depotCode.Width = 94; // // gvMx1lot @@ -243,7 +244,7 @@ this.gvMx1lot.Name = "gvMx1lot"; this.gvMx1lot.Tag = "query_a.LOT"; this.gvMx1lot.Visible = true; this.gvMx1lot.VisibleIndex = 18; this.gvMx1lot.VisibleIndex = 19; this.gvMx1lot.Width = 94; // // gvMx1mtono @@ -256,7 +257,7 @@ this.gvMx1mtono.Name = "gvMx1mtono"; this.gvMx1mtono.Tag = "query_a.MTONO"; this.gvMx1mtono.Visible = true; this.gvMx1mtono.VisibleIndex = 17; this.gvMx1mtono.VisibleIndex = 18; this.gvMx1mtono.Width = 94; // // gvMx1positionNo @@ -269,7 +270,7 @@ this.gvMx1positionNo.Name = "gvMx1positionNo"; this.gvMx1positionNo.Tag = "query_a.POSITION_NO"; this.gvMx1positionNo.Visible = true; this.gvMx1positionNo.VisibleIndex = 16; this.gvMx1positionNo.VisibleIndex = 17; this.gvMx1positionNo.Width = 94; // // gvMx1cab014 @@ -282,7 +283,7 @@ this.gvMx1cab014.Name = "gvMx1cab014"; this.gvMx1cab014.Tag = "query_a.CAB014"; this.gvMx1cab014.Visible = true; this.gvMx1cab014.VisibleIndex = 15; this.gvMx1cab014.VisibleIndex = 16; this.gvMx1cab014.Width = 94; // // gvMx1cab012 @@ -295,7 +296,7 @@ this.gvMx1cab012.Name = "gvMx1cab012"; this.gvMx1cab012.Tag = "query_a.CAB012"; this.gvMx1cab012.Visible = true; this.gvMx1cab012.VisibleIndex = 14; this.gvMx1cab012.VisibleIndex = 15; this.gvMx1cab012.Width = 94; // // gvMx1cab009 @@ -308,7 +309,7 @@ this.gvMx1cab009.Name = "gvMx1cab009"; this.gvMx1cab009.Tag = "query_a.CAB009"; this.gvMx1cab009.Visible = true; this.gvMx1cab009.VisibleIndex = 9; this.gvMx1cab009.VisibleIndex = 10; this.gvMx1cab009.Width = 94; // // gvMx1cab007 @@ -321,7 +322,7 @@ this.gvMx1cab007.Name = "gvMx1cab007"; this.gvMx1cab007.Tag = "query_a.CAB007"; this.gvMx1cab007.Visible = true; this.gvMx1cab007.VisibleIndex = 8; this.gvMx1cab007.VisibleIndex = 9; this.gvMx1cab007.Width = 94; // // gvMx1cab006 @@ -334,7 +335,7 @@ this.gvMx1cab006.Name = "gvMx1cab006"; this.gvMx1cab006.Tag = "query_a.CAB006"; this.gvMx1cab006.Visible = true; this.gvMx1cab006.VisibleIndex = 7; this.gvMx1cab006.VisibleIndex = 8; this.gvMx1cab006.Width = 94; // // gvMx1cab003 @@ -347,7 +348,7 @@ this.gvMx1cab003.Name = "gvMx1cab003"; this.gvMx1cab003.Tag = "query_a.CAB003"; this.gvMx1cab003.Visible = true; this.gvMx1cab003.VisibleIndex = 1; this.gvMx1cab003.VisibleIndex = 2; this.gvMx1cab003.Width = 94; // // gvMx1cab002 @@ -396,6 +397,7 @@ // this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, this.gridColumn6, this.gvMx1cab002, this.gvMx1cab003, this.gridColumn14, @@ -429,7 +431,7 @@ this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 2; this.gridColumn14.VisibleIndex = 3; this.gridColumn14.Width = 94; // // gridColumn15 @@ -438,7 +440,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 4; this.gridColumn15.VisibleIndex = 5; this.gridColumn15.Width = 94; // // gridColumn16 @@ -447,7 +449,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 11; this.gridColumn16.VisibleIndex = 12; this.gridColumn16.Width = 94; // // gridColumn17 @@ -456,7 +458,7 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; this.gridColumn17.VisibleIndex = 19; this.gridColumn17.VisibleIndex = 20; this.gridColumn17.Width = 94; // // gv_closeType @@ -1370,6 +1372,16 @@ this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // // gridColumn6 // this.gridColumn6.Caption = "gridColumn6"; this.gridColumn6.FieldName = "cab001"; this.gridColumn6.MinWidth = 80; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 1; this.gridColumn6.Width = 94; // // Frm_Womcaa // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1522,5 +1534,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -29,12 +29,11 @@ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; this.toolBarMenu1.btnZanTingClick += ToolBarMenu1_btnZanTingClick; this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick; this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick; this.toolBarMenu1.btnFtzblClick += ToolBarMenu1_btnFtzblClick; this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick; this.toolBarMenu1.btnBtnDkgClick += ToolBarMenu1_btnBtnDkgClick; this.toolBarMenu1.btnZanTingClick += ToolBarMenu1_btnZanTingClick; this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick; this.toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick; this.toolBarMenu1.btnBdllClick += ToolBarMenu1_btnBdllClick; @@ -123,7 +122,7 @@ { _toolCk(4); } private void ToolBarMenu1_btnZanTingClick(object sender, EventArgs e) private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e) { _toolCk(5); } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -382,12 +382,24 @@ if (row != null) { Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString()); //string _msl = row["quantity"].ToString(); //if (string.IsNullOrEmpty(_msl)) //{ // MsgHelper.ShowError("数量不能为空！"); // return; //} string _LineId = row["daa015"].ToString(); if (string.IsNullOrEmpty(_LineId)) { MsgHelper.ShowError("产线不能为空！"); return; } string _Pcsl = row["daa008"].ToString(); if (string.IsNullOrEmpty(_LineId)) { MsgHelper.ShowError("排产数量不能为空！"); return; } string _Yjkgsj = row["mesStartProd"].ToString(); if (string.IsNullOrEmpty(_LineId)) { MsgHelper.ShowError("预计开工时间不能为空！"); return; } _obj.list.Add(new { Guid = _guid, DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -61,8 +61,8 @@ this.btnFtzbl = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnKg = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnDkg = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnZanTing = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnBdll = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnSdwc = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem(); @@ -114,8 +114,8 @@ this.btnTzbl, this.btnKg, this.btnDkg, this.btnZanTing, this.btnBdll, this.btnZhongTai, this.btnSdwc, this.btnWg, this.btnFtzbl, this.btnHelp, @@ -158,8 +158,8 @@ new DevExpress.XtraBars.LinkPersistInfo(this.btnFtzbl), new DevExpress.XtraBars.LinkPersistInfo(this.btnKg), new DevExpress.XtraBars.LinkPersistInfo(this.btnDkg), new DevExpress.XtraBars.LinkPersistInfo(this.btnZanTing), new DevExpress.XtraBars.LinkPersistInfo(this.btnBdll), new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai), new DevExpress.XtraBars.LinkPersistInfo(this.btnSdwc), new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)}); @@ -448,23 +448,23 @@ this.btnDkg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnDkg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // // btnZanTing // btnZhongTai // this.btnZanTing.Caption = "工单暂停"; this.btnZanTing.Id = 44; this.btnZanTing.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32; this.btnZanTing.Name = "btnZanTing"; this.btnZanTing.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnZanTing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; this.btnZhongTai.Caption = "状态修改"; this.btnZhongTai.Id = 44; this.btnZhongTai.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32; this.btnZhongTai.Name = "btnZhongTai"; this.btnZhongTai.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnZhongTai.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // // btnBdll // btnSdwc // this.btnBdll.Caption = "备单领料"; this.btnBdll.Id = 45; this.btnBdll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32; this.btnBdll.Name = "btnBdll"; this.btnBdll.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnBdll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; this.btnSdwc.Caption = "手动完成"; this.btnSdwc.Id = 45; this.btnSdwc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32; this.btnSdwc.Name = "btnSdwc"; this.btnSdwc.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.btnSdwc.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // // btnJieAn // @@ -504,7 +504,7 @@ // this.barDockControlBottom.CausesValidation = false; this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; this.barDockControlBottom.Location = new System.Drawing.Point(0, 71); this.barDockControlBottom.Location = new System.Drawing.Point(0, 239); this.barDockControlBottom.Manager = this.barManager1; this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0); // @@ -514,7 +514,7 @@ this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; this.barDockControlLeft.Location = new System.Drawing.Point(0, 148); this.barDockControlLeft.Manager = this.barManager1; this.barDockControlLeft.Size = new System.Drawing.Size(0, 0); this.barDockControlLeft.Size = new System.Drawing.Size(0, 91); // // barDockControlRight // @@ -522,7 +522,7 @@ this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; this.barDockControlRight.Location = new System.Drawing.Point(1543, 148); this.barDockControlRight.Manager = this.barManager1; this.barDockControlRight.Size = new System.Drawing.Size(0, 0); this.barDockControlRight.Size = new System.Drawing.Size(0, 91); // // btnWg // @@ -547,7 +547,7 @@ this.Controls.Add(this.barDockControlBottom); this.Controls.Add(this.barDockControlTop); this.Name = "UcToolBarMenu"; this.Size = new System.Drawing.Size(1543, 71); this.Size = new System.Drawing.Size(1543, 239); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -590,8 +590,8 @@ private DevExpress.XtraBars.BarLargeButtonItem btnTzbl; private DevExpress.XtraBars.BarLargeButtonItem btnKg; private DevExpress.XtraBars.BarLargeButtonItem btnDkg; private DevExpress.XtraBars.BarLargeButtonItem btnZanTing; private DevExpress.XtraBars.BarLargeButtonItem btnBdll; private DevExpress.XtraBars.BarLargeButtonItem btnZhongTai; private DevExpress.XtraBars.BarLargeButtonItem btnSdwc; private DevExpress.XtraBars.BarLargeButtonItem btnWg; private DevExpress.XtraBars.BarLargeButtonItem btnFtzbl; private DevExpress.XtraBars.BarLargeButtonItem btnHelp; DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -48,8 +48,8 @@ btnTzbl.ItemClick += BtnTzbl_ItemClick; btnKg.ItemClick += BtnKg_ItemClick; btnDkg.ItemClick += BtnDkg_ItemClick; btnZanTing.ItemClick += BtnZanTing_ItemClick; btnBdll.ItemClick += BtnBdll_ItemClick; btnZhongTai.ItemClick += BtnbZhongTai_ItemClick; btnSdwc.ItemClick += BtnBdll_ItemClick; btnWg.ItemClick += BtnWg_ItemClick; btnFtzbl.ItemClick += BtnFtzbl_ItemClick; btnHelp.ItemClick += BtnHelp_ItemClick; @@ -527,9 +527,9 @@ if (btnBdllClick != null) btnBdllClick(this, e); } private void BtnZanTing_ItemClick(object sender, ItemClickEventArgs e) private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e) { if (btnZanTingClick != null) btnZanTingClick(this, e); if (btnZhongTaiClick != null) btnZhongTaiClick(this, e); } private void BtnDkg_ItemClick(object sender, ItemClickEventArgs e) @@ -891,9 +891,9 @@ public event EventHandler btnBtnDkgClick; /// <summary> /// 工单暂停 /// 状态 /// </summary> public event EventHandler btnZanTingClick; public event EventHandler btnZhongTaiClick; /// <summary> /// 备单领料
