| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -375,7 +375,7 @@ // this.gv_depotCode.AppearanceCell.Options.UseFont = true; this.gv_depotCode.Caption = "退料仓库"; this.gv_depotCode.FieldName = "depotCode"; this.gv_depotCode.FieldName = "ckCode"; this.gv_depotCode.Name = "gv_depotCode"; this.gv_depotCode.OptionsColumn.AllowEdit = false; this.gv_depotCode.Tag = "query_a.depot_code"; @@ -1314,8 +1314,6 @@ this.gvMx1ebelnK3id.FieldName = "ebelnK3id"; this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id"; this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID"; this.gvMx1ebelnK3id.Visible = true; this.gvMx1ebelnK3id.VisibleIndex = 8; this.gvMx1ebelnK3id.Width = 94; // // gvMx1lineK3id @@ -1325,8 +1323,6 @@ this.gvMx1lineK3id.FieldName = "lineK3id"; this.gvMx1lineK3id.Name = "gvMx1lineK3id"; this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID"; this.gvMx1lineK3id.Visible = true; this.gvMx1lineK3id.VisibleIndex = 9; this.gvMx1lineK3id.Width = 94; // // gridColumn16 @@ -1336,7 +1332,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 10; this.gridColumn16.VisibleIndex = 8; this.gridColumn16.Width = 94; // // gridColumn17 @@ -1346,7 +1342,7 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; this.gridColumn17.VisibleIndex = 11; this.gridColumn17.VisibleIndex = 9; this.gridColumn17.Width = 94; // // picCheckBox DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -55,6 +55,7 @@ this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -115,7 +116,6 @@ this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -276,7 +276,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "org.fnamber"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 2; this.gridColumn13.VisibleIndex = 6; this.gridColumn13.Width = 250; // // gv_status @@ -316,7 +316,7 @@ this.gv_itemOutNo.OptionsColumn.AllowEdit = false; this.gv_itemOutNo.Tag = "query_a.item_out_no"; this.gv_itemOutNo.Visible = true; this.gv_itemOutNo.VisibleIndex = 4; this.gv_itemOutNo.VisibleIndex = 2; this.gv_itemOutNo.Width = 100; // // gv_suppNo @@ -328,7 +328,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; this.gv_suppNo.VisibleIndex = 5; this.gv_suppNo.VisibleIndex = 4; this.gv_suppNo.Width = 94; // // gridColumn1 @@ -337,7 +337,7 @@ this.gridColumn1.FieldName = "suppName"; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 6; this.gridColumn1.VisibleIndex = 5; this.gridColumn1.Width = 94; // // gridColumn3 @@ -413,6 +413,16 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Width = 94; // // gridColumn7 // this.gridColumn7.Caption = "到货单号"; this.gridColumn7.FieldName = "taskNo"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 3; this.gridColumn7.Width = 94; // // pageBar1 // @@ -1096,16 +1106,6 @@ this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.Size = new System.Drawing.Size(138, 73); this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20); // // gridColumn7 // this.gridColumn7.Caption = "到货单号"; this.gridColumn7.FieldName = "taskNo"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 3; this.gridColumn7.Width = 94; // // Frm_MesYanTui // DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs
@@ -184,7 +184,7 @@ } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } private void getModel(string strGuid) @@ -194,7 +194,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); ToolBox.MsgHelper.ShowError("请先选择你要操作的行！"); return; } var _obj = new @@ -254,11 +254,11 @@ } } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } @@ -297,9 +297,10 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -308,6 +309,8 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } else MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -505,7 +505,7 @@ } //当不合格时的检查 string _txt_fngHandle = txt_fngHandle.Text.Trim(); string _txt_fmrmode = txt_fmrmode.SelectedText.Trim(); string _txt_fmrmode = txt_fmrmode.Text.Trim(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_zrType = txt_zrType.Text.Trim(); @@ -944,7 +944,7 @@ return; } string _txt_fngHandle = txt_fngHandle.Text.Trim(); string _txt_fmrmode = txt_fmrmode.SelectedText.Trim(); string _txt_fmrmode = txt_fmrmode.Text.Trim(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_msg = txt_msg.TextTxt; DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -310,7 +310,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 15; this.gridColumn1.VisibleIndex = 14; this.gridColumn1.Width = 94; // // gridColumn2 @@ -425,8 +425,6 @@ this.gridColumn3.FieldName = "itemId"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 14; this.gridColumn3.Width = 94; // // gridColumn17 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -173,7 +173,7 @@ } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } /// <summary> @@ -187,7 +187,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.ShowError("请先选择你要操作的行！"); return; } var _obj = new @@ -227,11 +227,11 @@ } } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } @@ -245,27 +245,6 @@ /// <param name="inFieldValue"></param> private void _toolCk(int _inFieldValue) { //toolBarMenu1.guidKey = ""; //string rowGuid, rowName; //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, // lbGuid, txt_fBillNo, gridView1, "fBillNo"); //toolBarMenu1.guidKey = rowGuid; //if (string.IsNullOrEmpty(rowGuid)) //{ // MsgHelper.Warning("请先选择你要操作的行！"); // return; //} //if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定操作吗？")) // return; //var frm = new MesQcExceptionalShow(rowGuid); //frm.UpdateParent += (s, e) => //{ // int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); // gridView1.FocusedRowHandle = rowHandle; // UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); //}; //frm.ShowDialog(); //return; string strMsg = ""; switch (_inFieldValue) { @@ -297,9 +276,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -308,10 +287,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } else MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } }
