From db99fcbc8ce2de42ed4c9f06a3df6b23fc07e9b4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 27 十一月 2024 19:16:25 +0800
Subject: [PATCH] 工单
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 78 +++++-------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 146 +++++++++++++++++++-----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 112 +++++++++---------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 5
5 files changed, 207 insertions(+), 136 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 2f41e36..2423bcf 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -112,7 +112,6 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -471,7 +470,7 @@
this.gv_closeType.OptionsColumn.AllowEdit = false;
this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
this.gv_closeType.Visible = true;
- this.gv_closeType.VisibleIndex = 27;
+ this.gv_closeType.VisibleIndex = 26;
this.gv_closeType.Width = 94;
//
// gv_forceCloserid
@@ -485,7 +484,7 @@
this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
this.gv_forceCloserid.Visible = true;
- this.gv_forceCloserid.VisibleIndex = 26;
+ this.gv_forceCloserid.VisibleIndex = 25;
this.gv_forceCloserid.Width = 94;
//
// gv_saleOrderEntryseq
@@ -499,7 +498,7 @@
this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
this.gv_saleOrderEntryseq.Visible = true;
- this.gv_saleOrderEntryseq.VisibleIndex = 25;
+ this.gv_saleOrderEntryseq.VisibleIndex = 24;
this.gv_saleOrderEntryseq.Width = 94;
//
// lb_saleOrderNo
@@ -532,7 +531,7 @@
this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
this.gv_saleOrderNo.Visible = true;
- this.gv_saleOrderNo.VisibleIndex = 24;
+ this.gv_saleOrderNo.VisibleIndex = 23;
this.gv_saleOrderNo.Width = 100;
//
// gv_srcBillentryseq
@@ -546,7 +545,7 @@
this.gv_srcBillentryseq.OptionsColumn.AllowEdit = false;
this.gv_srcBillentryseq.Tag = "query_a.SRC_BILLENTRYSEQ";
this.gv_srcBillentryseq.Visible = true;
- this.gv_srcBillentryseq.VisibleIndex = 23;
+ this.gv_srcBillentryseq.VisibleIndex = 22;
this.gv_srcBillentryseq.Width = 94;
//
// gv_srcBillNo
@@ -560,7 +559,7 @@
this.gv_srcBillNo.OptionsColumn.AllowEdit = false;
this.gv_srcBillNo.Tag = "query_a.SRC_BILL_NO";
this.gv_srcBillNo.Visible = true;
- this.gv_srcBillNo.VisibleIndex = 22;
+ this.gv_srcBillNo.VisibleIndex = 21;
this.gv_srcBillNo.Width = 100;
//
// gv_srcBillType
@@ -574,7 +573,7 @@
this.gv_srcBillType.OptionsColumn.AllowEdit = false;
this.gv_srcBillType.Tag = "query_a.SRC_BILL_TYPE";
this.gv_srcBillType.Visible = true;
- this.gv_srcBillType.VisibleIndex = 21;
+ this.gv_srcBillType.VisibleIndex = 20;
this.gv_srcBillType.Width = 94;
//
// gv_createType
@@ -588,7 +587,7 @@
this.gv_createType.OptionsColumn.AllowEdit = false;
this.gv_createType.Tag = "query_a.CREATE_TYPE";
this.gv_createType.Visible = true;
- this.gv_createType.VisibleIndex = 20;
+ this.gv_createType.VisibleIndex = 19;
this.gv_createType.Width = 100;
//
// lb_stockInlimitl
@@ -621,7 +620,7 @@
this.gv_stockInlimitl.OptionsColumn.AllowEdit = false;
this.gv_stockInlimitl.Tag = "query_a.STOCK_INLIMITL";
this.gv_stockInlimitl.Visible = true;
- this.gv_stockInlimitl.VisibleIndex = 29;
+ this.gv_stockInlimitl.VisibleIndex = 28;
this.gv_stockInlimitl.Width = 100;
//
// lb_stockInlimith
@@ -654,7 +653,7 @@
this.gv_stockInlimith.OptionsColumn.AllowEdit = false;
this.gv_stockInlimith.Tag = "query_a.STOCK_INLIMITH";
this.gv_stockInlimith.Visible = true;
- this.gv_stockInlimith.VisibleIndex = 28;
+ this.gv_stockInlimith.VisibleIndex = 27;
this.gv_stockInlimith.Width = 100;
//
// lb_depotCode
@@ -687,7 +686,7 @@
this.gv_depotCode.OptionsColumn.AllowEdit = false;
this.gv_depotCode.Tag = "query_a.DEPOT_CODE";
this.gv_depotCode.Visible = true;
- this.gv_depotCode.VisibleIndex = 6;
+ this.gv_depotCode.VisibleIndex = 5;
this.gv_depotCode.Width = 120;
//
// gv_caa024
@@ -701,7 +700,7 @@
this.gv_caa024.OptionsColumn.AllowEdit = false;
this.gv_caa024.Tag = "query_a.CAA024";
this.gv_caa024.Visible = true;
- this.gv_caa024.VisibleIndex = 15;
+ this.gv_caa024.VisibleIndex = 14;
this.gv_caa024.Width = 94;
//
// gv_checkUser
@@ -715,7 +714,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 16;
+ this.gv_checkUser.VisibleIndex = 15;
this.gv_checkUser.Width = 94;
//
// gv_fstatus
@@ -753,7 +752,7 @@
this.gv_caa021.OptionsColumn.AllowEdit = false;
this.gv_caa021.Tag = "query_a.CAA021";
this.gv_caa021.Visible = true;
- this.gv_caa021.VisibleIndex = 5;
+ this.gv_caa021.VisibleIndex = 4;
this.gv_caa021.Width = 120;
//
// lb_caa020
@@ -786,7 +785,7 @@
this.gv_caa020.OptionsColumn.AllowEdit = false;
this.gv_caa020.Tag = "query_a.CAA020";
this.gv_caa020.Visible = true;
- this.gv_caa020.VisibleIndex = 3;
+ this.gv_caa020.VisibleIndex = 2;
this.gv_caa020.Width = 100;
//
// gv_caa019
@@ -800,7 +799,7 @@
this.gv_caa019.OptionsColumn.AllowEdit = false;
this.gv_caa019.Tag = "query_a.CAA019";
this.gv_caa019.Visible = true;
- this.gv_caa019.VisibleIndex = 7;
+ this.gv_caa019.VisibleIndex = 6;
this.gv_caa019.Width = 94;
//
// gv_caa018
@@ -814,7 +813,7 @@
this.gv_caa018.OptionsColumn.AllowEdit = false;
this.gv_caa018.Tag = "query_a.CAA018";
this.gv_caa018.Visible = true;
- this.gv_caa018.VisibleIndex = 30;
+ this.gv_caa018.VisibleIndex = 29;
this.gv_caa018.Width = 94;
//
// lb_caa016
@@ -847,7 +846,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 19;
+ this.gv_caa016.VisibleIndex = 18;
this.gv_caa016.Width = 100;
//
// gv_caa015
@@ -861,7 +860,7 @@
this.gv_caa015.OptionsColumn.AllowEdit = false;
this.gv_caa015.Tag = "query_a.CAA015";
this.gv_caa015.Visible = true;
- this.gv_caa015.VisibleIndex = 18;
+ this.gv_caa015.VisibleIndex = 17;
this.gv_caa015.Width = 100;
//
// lb_caa012
@@ -894,7 +893,7 @@
this.gv_caa012.OptionsColumn.AllowEdit = false;
this.gv_caa012.Tag = "query_a.CAA012";
this.gv_caa012.Visible = true;
- this.gv_caa012.VisibleIndex = 11;
+ this.gv_caa012.VisibleIndex = 10;
this.gv_caa012.Width = 94;
//
// lb_caa011
@@ -927,7 +926,7 @@
this.gv_caa011.OptionsColumn.AllowEdit = false;
this.gv_caa011.Tag = "query_a.CAA011";
this.gv_caa011.Visible = true;
- this.gv_caa011.VisibleIndex = 14;
+ this.gv_caa011.VisibleIndex = 13;
this.gv_caa011.Width = 180;
//
// lb_caa010
@@ -960,7 +959,7 @@
this.gv_caa010.OptionsColumn.AllowEdit = false;
this.gv_caa010.Tag = "query_a.CAA010";
this.gv_caa010.Visible = true;
- this.gv_caa010.VisibleIndex = 13;
+ this.gv_caa010.VisibleIndex = 12;
this.gv_caa010.Width = 180;
//
// lb_caa009
@@ -993,7 +992,7 @@
this.gv_caa009.OptionsColumn.AllowEdit = false;
this.gv_caa009.Tag = "query_a.CAA009";
this.gv_caa009.Visible = true;
- this.gv_caa009.VisibleIndex = 12;
+ this.gv_caa009.VisibleIndex = 11;
this.gv_caa009.Width = 94;
//
// lb_caa006
@@ -1026,7 +1025,7 @@
this.gv_caa006.OptionsColumn.AllowEdit = false;
this.gv_caa006.Tag = "query_a.CAA006";
this.gv_caa006.Visible = true;
- this.gv_caa006.VisibleIndex = 9;
+ this.gv_caa006.VisibleIndex = 8;
this.gv_caa006.Width = 94;
//
// lb_caa005
@@ -1059,7 +1058,7 @@
this.gv_caa005.OptionsColumn.AllowEdit = false;
this.gv_caa005.Tag = "query_a.CAA005";
this.gv_caa005.Visible = true;
- this.gv_caa005.VisibleIndex = 17;
+ this.gv_caa005.VisibleIndex = 16;
this.gv_caa005.Width = 180;
//
// lb_caa001
@@ -1092,7 +1091,7 @@
this.gv_caa001.OptionsColumn.AllowEdit = false;
this.gv_caa001.Tag = "query_a.CAA001";
this.gv_caa001.Visible = true;
- this.gv_caa001.VisibleIndex = 4;
+ this.gv_caa001.VisibleIndex = 3;
this.gv_caa001.Width = 100;
//
// lb_erpid
@@ -1149,7 +1148,6 @@
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
- this.gridColumn13,
this.gridColumn1,
this.gv_caa020,
this.gv_caa001,
@@ -1189,17 +1187,6 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gridColumn13
- //
- this.gridColumn13.Caption = "鎺掍骇鏍囪瘑";
- this.gridColumn13.FieldName = "pcFlag";
- this.gridColumn13.MinWidth = 50;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.AllowEdit = false;
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 1;
- this.gridColumn13.Width = 94;
- //
// gridColumn1
//
this.gridColumn1.Caption = "宸ュ崟鐘舵��";
@@ -1208,7 +1195,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 2;
+ this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -1219,7 +1206,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 110;
//
// gridColumn3
@@ -1230,7 +1217,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.VisibleIndex = 9;
this.gridColumn3.Width = 120;
//
// gridColumn6
@@ -1240,7 +1227,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.AllowEdit = false;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 31;
+ this.gridColumn6.VisibleIndex = 30;
this.gridColumn6.Width = 94;
//
// gridColumn5
@@ -1250,7 +1237,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 32;
+ this.gridColumn5.VisibleIndex = 31;
this.gridColumn5.Width = 100;
//
// gridColumn4
@@ -1260,7 +1247,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 33;
+ this.gridColumn4.VisibleIndex = 32;
this.gridColumn4.Width = 94;
//
// xtraTabControl1
@@ -1531,7 +1518,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index d8abc2c..93b68f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -1827,6 +1827,7 @@
// gvMx1Guid
//
this.gvMx1Guid.Caption = "gvMx1Guid";
+ this.gvMx1Guid.FieldName = "guid";
this.gvMx1Guid.MinWidth = 25;
this.gvMx1Guid.Name = "gvMx1Guid";
this.gvMx1Guid.Visible = true;
@@ -2401,13 +2402,13 @@
this.gv_daa001.AppearanceCell.Options.UseFont = true;
this.gv_daa001.Caption = "宸ュ崟鍗曞彿";
this.gv_daa001.FieldName = "daa001";
- this.gv_daa001.MinWidth = 100;
+ this.gv_daa001.MinWidth = 120;
this.gv_daa001.Name = "gv_daa001";
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
this.gv_daa001.VisibleIndex = 9;
- this.gv_daa001.Width = 100;
+ this.gv_daa001.Width = 120;
//
// gv_pid
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index b75361d..36f0dbb 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,7 +1,9 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using DevExpress.XtraPivotGrid.Data;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -26,6 +28,8 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.btnZanTingClick += ToolBarMenu1_btnZanTingClick;
+ this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -44,6 +48,9 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
+
+
+
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -86,6 +93,15 @@
_filterList = e.FilterList;
getPageList(1, pageBar1.RowsCount);
}
+ private async void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
+ {
+ _toolCk(1);
+ }
+
+ private async void ToolBarMenu1_btnZanTingClick(object sender, EventArgs e)
+ {
+
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -113,9 +129,9 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(rowGuid);
+ var _obj = lst;
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
@@ -140,10 +156,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
/// 淇敼浜嬩欢
@@ -168,12 +184,12 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.JumpToTab(xtraTabControl1, 1);
+ lbGuid.Text = "";
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -191,7 +207,7 @@
}
var _obj = new
{
- guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //涓诲缓
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
};
try
{
@@ -230,22 +246,22 @@
string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ int dddd = dd.rtnData.pages;//鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
@@ -266,7 +282,7 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName +"GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -301,5 +317,73 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private async void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "閫氱煡澶囨枡";
+ break;
+ case 2:
+ strMsg = "寮�宸�";
+ break;
+ case 3:
+ strMsg = "寰呭紑宸�";
+ break;
+ case 4:
+ strMsg = "宸ュ崟鏆傚仠";
+ break;
+ case 5:
+ strMsg = "澶囧崟棰嗘枡";
+ break;
+ case 6:
+ strMsg = "鎵嬪伐瀹屽伐";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1, "daa001");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ UcLoading _loading = new UcLoading();
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = await UtilityHelper.HttpPostAsync("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ _loading.Stop();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index eff897b..6441c19 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -73,7 +73,7 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.aboutGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
@@ -181,7 +181,7 @@
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "query_a.reporttime";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 34;
+ this.gvMx1reporttime.VisibleIndex = 32;
this.gvMx1reporttime.Width = 94;
//
// gvMx1isReportcheck
@@ -199,7 +199,7 @@
this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
this.gvMx1isReportcheck.Visible = true;
- this.gvMx1isReportcheck.VisibleIndex = 33;
+ this.gvMx1isReportcheck.VisibleIndex = 31;
this.gvMx1isReportcheck.Width = 94;
//
// gvMx1daa026
@@ -216,7 +216,7 @@
this.gvMx1daa026.Name = "gvMx1daa026";
this.gvMx1daa026.Tag = "query_a.daa026";
this.gvMx1daa026.Visible = true;
- this.gvMx1daa026.VisibleIndex = 32;
+ this.gvMx1daa026.VisibleIndex = 30;
this.gvMx1daa026.Width = 94;
//
// gvMx1daa025
@@ -230,7 +230,7 @@
this.gvMx1daa025.OptionsColumn.ReadOnly = true;
this.gvMx1daa025.Tag = "query_a.daa025";
this.gvMx1daa025.Visible = true;
- this.gvMx1daa025.VisibleIndex = 31;
+ this.gvMx1daa025.VisibleIndex = 29;
this.gvMx1daa025.Width = 94;
//
// gvMx1daa024
@@ -244,7 +244,7 @@
this.gvMx1daa024.OptionsColumn.ReadOnly = true;
this.gvMx1daa024.Tag = "query_a.daa024";
this.gvMx1daa024.Visible = true;
- this.gvMx1daa024.VisibleIndex = 30;
+ this.gvMx1daa024.VisibleIndex = 28;
this.gvMx1daa024.Width = 94;
//
// gvMx1daa023
@@ -258,7 +258,7 @@
this.gvMx1daa023.OptionsColumn.ReadOnly = true;
this.gvMx1daa023.Tag = "query_a.daa023";
this.gvMx1daa023.Visible = true;
- this.gvMx1daa023.VisibleIndex = 29;
+ this.gvMx1daa023.VisibleIndex = 27;
this.gvMx1daa023.Width = 94;
//
// gvMx1daa022
@@ -272,7 +272,7 @@
this.gvMx1daa022.OptionsColumn.ReadOnly = true;
this.gvMx1daa022.Tag = "query_a.daa022";
this.gvMx1daa022.Visible = true;
- this.gvMx1daa022.VisibleIndex = 28;
+ this.gvMx1daa022.VisibleIndex = 26;
this.gvMx1daa022.Width = 94;
//
// gvMx1daa021
@@ -286,7 +286,7 @@
this.gvMx1daa021.OptionsColumn.ReadOnly = true;
this.gvMx1daa021.Tag = "query_a.daa021";
this.gvMx1daa021.Visible = true;
- this.gvMx1daa021.VisibleIndex = 27;
+ this.gvMx1daa021.VisibleIndex = 25;
this.gvMx1daa021.Width = 94;
//
// gvMx1daa020
@@ -300,7 +300,7 @@
this.gvMx1daa020.OptionsColumn.ReadOnly = true;
this.gvMx1daa020.Tag = "query_a.daa020";
this.gvMx1daa020.Visible = true;
- this.gvMx1daa020.VisibleIndex = 26;
+ this.gvMx1daa020.VisibleIndex = 24;
this.gvMx1daa020.Width = 94;
//
// gvMx1checkUser
@@ -314,7 +314,7 @@
this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
this.gvMx1checkUser.Tag = "query_a.check_user";
this.gvMx1checkUser.Visible = true;
- this.gvMx1checkUser.VisibleIndex = 25;
+ this.gvMx1checkUser.VisibleIndex = 23;
this.gvMx1checkUser.Width = 94;
//
// gvMx1checkDate
@@ -328,7 +328,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 24;
+ this.gvMx1checkDate.VisibleIndex = 22;
this.gvMx1checkDate.Width = 94;
//
// gvMx1fstatus
@@ -342,7 +342,7 @@
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
- this.gvMx1fstatus.VisibleIndex = 23;
+ this.gvMx1fstatus.VisibleIndex = 21;
this.gvMx1fstatus.Width = 94;
//
// gvMx1daa019
@@ -356,7 +356,7 @@
this.gvMx1daa019.OptionsColumn.ReadOnly = true;
this.gvMx1daa019.Tag = "query_a.daa019";
this.gvMx1daa019.Visible = true;
- this.gvMx1daa019.VisibleIndex = 22;
+ this.gvMx1daa019.VisibleIndex = 20;
this.gvMx1daa019.Width = 94;
//
// gvMx1daa018
@@ -369,7 +369,7 @@
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "query_a.daa018";
this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 21;
+ this.gvMx1daa018.VisibleIndex = 19;
this.gvMx1daa018.Width = 94;
//
// gvMx1daa017
@@ -386,7 +386,7 @@
this.gvMx1daa017.Name = "gvMx1daa017";
this.gvMx1daa017.Tag = "query_a.daa017";
this.gvMx1daa017.Visible = true;
- this.gvMx1daa017.VisibleIndex = 20;
+ this.gvMx1daa017.VisibleIndex = 18;
this.gvMx1daa017.Width = 94;
//
// gvMx1daa016
@@ -427,7 +427,7 @@
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
- this.gvMx1daa014.VisibleIndex = 18;
+ this.gvMx1daa014.VisibleIndex = 16;
this.gvMx1daa014.Width = 94;
//
// gvMx1daa013
@@ -441,7 +441,7 @@
this.gvMx1daa013.OptionsColumn.ReadOnly = true;
this.gvMx1daa013.Tag = "query_a.daa013";
this.gvMx1daa013.Visible = true;
- this.gvMx1daa013.VisibleIndex = 17;
+ this.gvMx1daa013.VisibleIndex = 15;
this.gvMx1daa013.Width = 94;
//
// gvMx1daa012
@@ -458,7 +458,7 @@
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "query_a.daa012";
this.gvMx1daa012.Visible = true;
- this.gvMx1daa012.VisibleIndex = 16;
+ this.gvMx1daa012.VisibleIndex = 14;
this.gvMx1daa012.Width = 94;
//
// gvMx1daa011
@@ -475,7 +475,7 @@
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "query_a.daa011";
this.gvMx1daa011.Visible = true;
- this.gvMx1daa011.VisibleIndex = 15;
+ this.gvMx1daa011.VisibleIndex = 13;
this.gvMx1daa011.Width = 94;
//
// gvMx1daa010
@@ -484,13 +484,13 @@
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
this.gvMx1daa010.FieldName = "daa021";
- this.gvMx1daa010.MinWidth = 100;
+ this.gvMx1daa010.MinWidth = 110;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
- this.gvMx1daa010.VisibleIndex = 7;
- this.gvMx1daa010.Width = 100;
+ this.gvMx1daa010.VisibleIndex = 5;
+ this.gvMx1daa010.Width = 110;
//
// gvMx1daa009
//
@@ -503,7 +503,7 @@
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
- this.gvMx1daa009.VisibleIndex = 14;
+ this.gvMx1daa009.VisibleIndex = 12;
this.gvMx1daa009.Width = 94;
//
// gvMx1daa008
@@ -517,7 +517,7 @@
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
- this.gvMx1daa008.VisibleIndex = 11;
+ this.gvMx1daa008.VisibleIndex = 9;
this.gvMx1daa008.Width = 94;
//
// gvMx1daa007
@@ -531,7 +531,7 @@
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
- this.gvMx1daa007.VisibleIndex = 13;
+ this.gvMx1daa007.VisibleIndex = 11;
this.gvMx1daa007.Width = 94;
//
// gvMx1daa006
@@ -545,7 +545,7 @@
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
- this.gvMx1daa006.VisibleIndex = 12;
+ this.gvMx1daa006.VisibleIndex = 10;
this.gvMx1daa006.Width = 94;
//
// gvMx1daa005
@@ -559,7 +559,7 @@
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
- this.gvMx1daa005.VisibleIndex = 10;
+ this.gvMx1daa005.VisibleIndex = 8;
this.gvMx1daa005.Width = 94;
//
// gvMx1daa004
@@ -573,7 +573,7 @@
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
- this.gvMx1daa004.VisibleIndex = 9;
+ this.gvMx1daa004.VisibleIndex = 7;
this.gvMx1daa004.Width = 150;
//
// gvMx1daa003
@@ -587,7 +587,7 @@
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 8;
+ this.gvMx1daa003.VisibleIndex = 6;
this.gvMx1daa003.Width = 150;
//
// gvMx1daa002
@@ -596,13 +596,13 @@
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
this.gvMx1daa002.FieldName = "daa001";
- this.gvMx1daa002.MinWidth = 100;
+ this.gvMx1daa002.MinWidth = 110;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
- this.gvMx1daa002.VisibleIndex = 6;
- this.gvMx1daa002.Width = 100;
+ this.gvMx1daa002.VisibleIndex = 4;
+ this.gvMx1daa002.Width = 110;
//
// gvMx1daa001
//
@@ -615,7 +615,7 @@
this.gvMx1daa001.OptionsColumn.ReadOnly = true;
this.gvMx1daa001.Tag = "query_a.daa001";
this.gvMx1daa001.Visible = true;
- this.gvMx1daa001.VisibleIndex = 5;
+ this.gvMx1daa001.VisibleIndex = 3;
this.gvMx1daa001.Width = 94;
//
// gvMx1pid
@@ -629,7 +629,7 @@
this.gvMx1pid.OptionsColumn.ReadOnly = true;
this.gvMx1pid.Tag = "query_a.pid";
this.gvMx1pid.Visible = true;
- this.gvMx1pid.VisibleIndex = 4;
+ this.gvMx1pid.VisibleIndex = 2;
this.gvMx1pid.Width = 94;
//
// gvMx1id
@@ -643,7 +643,7 @@
this.gvMx1id.OptionsColumn.ReadOnly = true;
this.gvMx1id.Tag = "query_a.id";
this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 3;
+ this.gvMx1id.VisibleIndex = 1;
this.gvMx1id.Width = 94;
//
// gvMx1guid
@@ -689,7 +689,7 @@
this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
- this.aboutGuid,
+ this.caaGuid,
this.gvMxDel,
this.gvMx1id,
this.gvMx1pid,
@@ -730,16 +730,16 @@
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
- // aboutGuid
+ // caaGuid
//
- this.aboutGuid.Caption = "aboutGuid";
- this.aboutGuid.FieldName = "aboutGuid";
- this.aboutGuid.MinWidth = 25;
- this.aboutGuid.Name = "aboutGuid";
- this.aboutGuid.OptionsColumn.ReadOnly = true;
- this.aboutGuid.Visible = true;
- this.aboutGuid.VisibleIndex = 2;
- this.aboutGuid.Width = 94;
+ this.caaGuid.Caption = "caaGuid";
+ this.caaGuid.FieldName = "caaGuid";
+ this.caaGuid.MinWidth = 25;
+ this.caaGuid.Name = "caaGuid";
+ this.caaGuid.OptionsColumn.ReadOnly = true;
+ this.caaGuid.Visible = true;
+ this.caaGuid.VisibleIndex = 0;
+ this.caaGuid.Width = 94;
//
// gvMxDel
//
@@ -748,16 +748,16 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 0;
+ this.gvMxDel.VisibleIndex = 2;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1306,7 +1306,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraEditors.SimpleButton btnSelect;
- private DevExpress.XtraGrid.Columns.GridColumn aboutGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn caaGuid;
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
private DevExpress.XtraEditors.TextEdit txt_hNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index b853d73..f0436b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -363,7 +363,7 @@
_obj.list.Add(new
{
Guid = _guid,
- AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
+ AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
LineId = int.Parse(row["daa015"].ToString()),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
Jhrs = row["daa015"].ToString(),//璁″垝浜烘暟
--
Gitblit v1.9.3