From b2b6ed9eb6247df52fd9f5bf78f2fe4b263576ed Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 30 十月 2024 08:10:43 +0800
Subject: [PATCH] 日志
---
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 81 +++++++
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 7
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 31 ++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 135 ++++-------
DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs | 167 +++++++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 12
DevApp/Gs.DevApp/UserControl/ShowLogcs.resx | 120 ++++++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 28 +-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 16 +
11 files changed, 502 insertions(+), 106 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index a38eb29..bc4cdde 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -191,12 +191,12 @@
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞� ";
this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 150;
+ this.gvMx1fcheckLevel.MinWidth = 200;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.FCHECK_LEVEL";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 7;
- this.gvMx1fcheckLevel.Width = 150;
+ this.gvMx1fcheckLevel.Width = 200;
//
// rptJYSP
//
@@ -687,13 +687,13 @@
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡浜у搧缂栫爜 ";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.MinWidth = 150;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.ITEM_NO";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 3;
- this.gv_itemNo.Width = 94;
+ this.gv_itemNo.Width = 150;
//
// lb_memo
//
@@ -797,12 +797,12 @@
//
this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
this.gridColumn3.FieldName = "itemName";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 250;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 4;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 250;
//
// gridColumn2
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index d50118c..35db28d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -549,7 +549,7 @@
,"4.鐗规畩妫�楠屾按骞�(S1)"
,"5.鐗规畩妫�楠屾按骞�(S2)"
,"6.鐗规畩妫�楠屾按骞�(S3)"
- ,"7.鐗规畩妫�楠屾按骞�(S4),"
+ ,"7.鐗规畩妫�楠屾按骞�(S4)"
});
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index 2c3e602..a46cfff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ 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();
this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -85,8 +85,6 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_status = new DevExpress.XtraEditors.LabelControl();
- this.txt_status = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -117,7 +115,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -138,168 +135,168 @@
//
this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1states.AppearanceCell.Options.UseFont = true;
- this.gvMx1states.Caption = "鎺ㄩ�佺姸鎬� ";
+ this.gvMx1states.Caption = "鎺ㄩ�佺姸鎬�";
this.gvMx1states.FieldName = "states";
this.gvMx1states.MinWidth = 100;
this.gvMx1states.Name = "gvMx1states";
this.gvMx1states.OptionsColumn.ReadOnly = true;
this.gvMx1states.Tag = "query_a.states";
this.gvMx1states.Visible = true;
- this.gvMx1states.VisibleIndex = 24;
+ this.gvMx1states.VisibleIndex = 22;
this.gvMx1states.Width = 100;
//
// gvMx1returnFlag
//
this.gvMx1returnFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1returnFlag.Caption = "閫�璐ф爣璇� ";
+ this.gvMx1returnFlag.Caption = "閫�璐ф爣璇�";
this.gvMx1returnFlag.FieldName = "returnFlag";
this.gvMx1returnFlag.MinWidth = 100;
this.gvMx1returnFlag.Name = "gvMx1returnFlag";
this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
this.gvMx1returnFlag.Tag = "query_a.return_flag";
this.gvMx1returnFlag.Visible = true;
- this.gvMx1returnFlag.VisibleIndex = 23;
+ this.gvMx1returnFlag.VisibleIndex = 21;
this.gvMx1returnFlag.Width = 100;
//
// gvMx1cgRkqty
//
this.gvMx1cgRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1cgRkqty.AppearanceCell.Options.UseFont = true;
- this.gvMx1cgRkqty.Caption = "閲囪喘鍏ュ簱鏁伴噺 ";
+ this.gvMx1cgRkqty.Caption = "閲囪喘鍏ュ簱鏁伴噺";
this.gvMx1cgRkqty.FieldName = "cgRkqty";
this.gvMx1cgRkqty.MinWidth = 100;
this.gvMx1cgRkqty.Name = "gvMx1cgRkqty";
this.gvMx1cgRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1cgRkqty.Tag = "query_a.cg_rkqty";
this.gvMx1cgRkqty.Visible = true;
- this.gvMx1cgRkqty.VisibleIndex = 22;
+ this.gvMx1cgRkqty.VisibleIndex = 20;
this.gvMx1cgRkqty.Width = 100;
//
// gvMx1okRkqty
//
this.gvMx1okRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
- this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲� ";
+ this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
this.gvMx1okRkqty.FieldName = "okRkqty";
this.gvMx1okRkqty.MinWidth = 100;
this.gvMx1okRkqty.Name = "gvMx1okRkqty";
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 12;
+ this.gvMx1okRkqty.VisibleIndex = 10;
this.gvMx1okRkqty.Width = 100;
//
// gvMx1dha001
//
this.gvMx1dha001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1dha001.AppearanceCell.Options.UseFont = true;
- this.gvMx1dha001.Caption = "鍒拌揣鍗曞彿 ";
+ this.gvMx1dha001.Caption = "鍒拌揣鍗曞彿";
this.gvMx1dha001.FieldName = "dha001";
this.gvMx1dha001.MinWidth = 100;
this.gvMx1dha001.Name = "gvMx1dha001";
this.gvMx1dha001.OptionsColumn.ReadOnly = true;
this.gvMx1dha001.Tag = "query_a.dha001";
this.gvMx1dha001.Visible = true;
- this.gvMx1dha001.VisibleIndex = 21;
+ this.gvMx1dha001.VisibleIndex = 19;
this.gvMx1dha001.Width = 100;
//
// gvMx1isdepsIn
//
this.gvMx1isdepsIn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
- this.gvMx1isdepsIn.Caption = "鏄惁鍏ュ簱 ";
+ this.gvMx1isdepsIn.Caption = "鏄惁鍏ュ簱";
this.gvMx1isdepsIn.FieldName = "isdepsIn";
this.gvMx1isdepsIn.MinWidth = 100;
this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
this.gvMx1isdepsIn.Visible = true;
- this.gvMx1isdepsIn.VisibleIndex = 20;
+ this.gvMx1isdepsIn.VisibleIndex = 18;
this.gvMx1isdepsIn.Width = 100;
//
// gvMx1fType
//
this.gvMx1fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fType.AppearanceCell.Options.UseFont = true;
- this.gvMx1fType.Caption = "0銆侀噰璐崟锛�1銆佸澶栧崟 ";
+ this.gvMx1fType.Caption = "0銆侀噰璐崟锛�1銆佸澶栧崟";
this.gvMx1fType.FieldName = "fType";
this.gvMx1fType.MinWidth = 100;
this.gvMx1fType.Name = "gvMx1fType";
this.gvMx1fType.OptionsColumn.ReadOnly = true;
this.gvMx1fType.Tag = "query_a.f_type";
this.gvMx1fType.Visible = true;
- this.gvMx1fType.VisibleIndex = 19;
+ this.gvMx1fType.VisibleIndex = 17;
this.gvMx1fType.Width = 100;
//
// gvMx1workLine
//
this.gvMx1workLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1workLine.AppearanceCell.Options.UseFont = true;
- this.gvMx1workLine.Caption = "浠诲姟鍗曡鍙� ";
+ this.gvMx1workLine.Caption = "浠诲姟鍗曡鍙�";
this.gvMx1workLine.FieldName = "workLine";
this.gvMx1workLine.MinWidth = 100;
this.gvMx1workLine.Name = "gvMx1workLine";
this.gvMx1workLine.OptionsColumn.ReadOnly = true;
this.gvMx1workLine.Tag = "query_a.work_line";
this.gvMx1workLine.Visible = true;
- this.gvMx1workLine.VisibleIndex = 18;
+ this.gvMx1workLine.VisibleIndex = 16;
this.gvMx1workLine.Width = 100;
//
// gvMx1boardStyle
//
this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
- this.gvMx1boardStyle.Caption = "浜у搧鍨嬪彿 ";
+ this.gvMx1boardStyle.Caption = "浜у搧鍨嬪彿";
this.gvMx1boardStyle.FieldName = "boardStyle";
this.gvMx1boardStyle.MinWidth = 100;
this.gvMx1boardStyle.Name = "gvMx1boardStyle";
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
- this.gvMx1boardStyle.VisibleIndex = 7;
+ this.gvMx1boardStyle.VisibleIndex = 5;
this.gvMx1boardStyle.Width = 100;
//
// gvMx1okQty
//
this.gvMx1okQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1okQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1okQty.Caption = "宸叉敹鏁伴噺 ";
+ this.gvMx1okQty.Caption = "宸叉敹鏁伴噺";
this.gvMx1okQty.FieldName = "okQty";
this.gvMx1okQty.MinWidth = 100;
this.gvMx1okQty.Name = "gvMx1okQty";
this.gvMx1okQty.OptionsColumn.ReadOnly = true;
this.gvMx1okQty.Tag = "query_a.ok_qty";
this.gvMx1okQty.Visible = true;
- this.gvMx1okQty.VisibleIndex = 11;
+ this.gvMx1okQty.VisibleIndex = 9;
this.gvMx1okQty.Width = 100;
//
// gvMx1ischeck
//
this.gvMx1ischeck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1ischeck.AppearanceCell.Options.UseFont = true;
- this.gvMx1ischeck.Caption = "鏄惁妫�楠� ";
+ this.gvMx1ischeck.Caption = "鏄惁妫�楠�";
this.gvMx1ischeck.FieldName = "ischeck";
this.gvMx1ischeck.MinWidth = 100;
this.gvMx1ischeck.Name = "gvMx1ischeck";
this.gvMx1ischeck.OptionsColumn.ReadOnly = true;
this.gvMx1ischeck.Tag = "query_a.ischeck";
this.gvMx1ischeck.Visible = true;
- this.gvMx1ischeck.VisibleIndex = 14;
+ this.gvMx1ischeck.VisibleIndex = 12;
this.gvMx1ischeck.Width = 100;
//
// gvMx1checkDate
//
this.gvMx1checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkDate.Caption = "妫�楠屾棩鏈� ";
+ this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�";
this.gvMx1checkDate.FieldName = "checkDate";
this.gvMx1checkDate.MinWidth = 100;
this.gvMx1checkDate.Name = "gvMx1checkDate";
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 17;
+ this.gvMx1checkDate.VisibleIndex = 15;
this.gvMx1checkDate.Width = 100;
//
// gvMx1checkStates
@@ -313,41 +310,41 @@
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
- this.gvMx1checkStates.VisibleIndex = 16;
+ this.gvMx1checkStates.VisibleIndex = 14;
this.gvMx1checkStates.Width = 100;
//
// gvMx1checkRes
//
this.gvMx1checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1checkRes.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkRes.Caption = "妫�楠岀粨鏋� ";
+ this.gvMx1checkRes.Caption = "妫�楠岀粨鏋�";
this.gvMx1checkRes.FieldName = "checkRes";
this.gvMx1checkRes.MinWidth = 100;
this.gvMx1checkRes.Name = "gvMx1checkRes";
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
- this.gvMx1checkRes.VisibleIndex = 15;
+ this.gvMx1checkRes.VisibleIndex = 13;
this.gvMx1checkRes.Width = 100;
//
// gvMx1memo
//
this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
- this.gvMx1memo.Caption = "澶囨敞 ";
+ this.gvMx1memo.Caption = "澶囨敞";
this.gvMx1memo.FieldName = "memo";
this.gvMx1memo.MinWidth = 100;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "query_a.memo";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 13;
+ this.gvMx1memo.VisibleIndex = 11;
this.gvMx1memo.Width = 100;
//
// gvMx1urgentFlag
//
this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑 ";
+ this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gvMx1urgentFlag.FieldName = "urgentFlag";
this.gvMx1urgentFlag.MinWidth = 100;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
@@ -359,14 +356,14 @@
//
this.gvMx1subQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺 ";
+ this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺";
this.gvMx1subQty.FieldName = "subQty";
this.gvMx1subQty.MinWidth = 100;
this.gvMx1subQty.Name = "gvMx1subQty";
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
- this.gvMx1subQty.VisibleIndex = 10;
+ this.gvMx1subQty.VisibleIndex = 8;
this.gvMx1subQty.Width = 100;
//
// gvMx1quantity
@@ -377,69 +374,69 @@
this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true;
this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺 ";
+ this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
this.gvMx1quantity.MinWidth = 100;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.quantity";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 9;
+ this.gvMx1quantity.VisibleIndex = 7;
this.gvMx1quantity.Width = 100;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜 ";
+ this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx1itemNo.FieldName = "itemNo";
this.gvMx1itemNo.MinWidth = 100;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.OptionsColumn.ReadOnly = true;
this.gvMx1itemNo.Tag = "query_a.item_no";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 6;
+ this.gvMx1itemNo.VisibleIndex = 4;
this.gvMx1itemNo.Width = 100;
//
// gvMx1ebelnQty
//
this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺 ";
+ this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺";
this.gvMx1ebelnQty.FieldName = "ebelnQty";
this.gvMx1ebelnQty.MinWidth = 100;
this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
- this.gvMx1ebelnQty.VisibleIndex = 8;
+ this.gvMx1ebelnQty.VisibleIndex = 6;
this.gvMx1ebelnQty.Width = 100;
//
// gvMx1ebelnLine
//
this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebelnLine.Caption = "閲囪喘璁㈠崟琛屽彿 ";
+ this.gvMx1ebelnLine.Caption = "閲囪喘璁㈠崟琛屽彿";
this.gvMx1ebelnLine.FieldName = "ebelnLine";
this.gvMx1ebelnLine.MinWidth = 100;
this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
this.gvMx1ebelnLine.Visible = true;
- this.gvMx1ebelnLine.VisibleIndex = 5;
+ this.gvMx1ebelnLine.VisibleIndex = 3;
this.gvMx1ebelnLine.Width = 100;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿 ";
+ this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
this.gvMx1ebeln.MinWidth = 120;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 4;
+ this.gvMx1ebeln.VisibleIndex = 2;
this.gvMx1ebeln.Width = 120;
//
// gvMx1guid
@@ -531,10 +528,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -544,8 +541,9 @@
this.gridColumn3.Caption = "閲囪喘鏃堕棿";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 1;
this.gridColumn3.Width = 94;
//
// gv_thstatus
@@ -824,25 +822,6 @@
this.gv_createBy.VisibleIndex = 4;
this.gv_createBy.Width = 71;
//
- // lb_status
- //
- this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(375, 91);
- this.lb_status.Name = "lb_status";
- this.lb_status.Size = new System.Drawing.Size(34, 21);
- this.lb_status.TabIndex = 216;
- this.lb_status.Text = "鐘舵��";
- //
- // txt_status
- //
- this.txt_status.Location = new System.Drawing.Point(421, 87);
- this.txt_status.Name = "txt_status";
- this.txt_status.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_status.Properties.Appearance.Options.UseFont = true;
- this.txt_status.Size = new System.Drawing.Size(150, 28);
- this.txt_status.TabIndex = 216;
- //
// lb_billNo
//
this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -869,13 +848,13 @@
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 110;
+ this.gv_billNo.MinWidth = 130;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 110;
+ this.gv_billNo.Width = 130;
//
// toolBarMenu1
//
@@ -1010,8 +989,6 @@
this.panel1.Controls.Add(this.txt_paperBillNo);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.lb_status);
- this.panel1.Controls.Add(this.txt_status);
this.panel1.Controls.Add(this.lb_billNo);
this.panel1.Controls.Add(this.txt_billNo);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -1152,7 +1129,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1236,9 +1212,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-
- private DevExpress.XtraEditors.LabelControl lb_status;
- private DevExpress.XtraEditors.TextEdit txt_status;
private DevExpress.XtraEditors.LabelControl lb_billNo;
private DevExpress.XtraEditors.TextEdit txt_billNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 7d516ed..d10b626 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -7,6 +7,7 @@
using DevExpress.DataAccess.DataFederation;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -38,6 +39,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -87,6 +89,16 @@
frm.ShowDialog();
};
}
+
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+
/// <summary>
/// 鍙嶆楠�
/// </summary>
@@ -269,13 +281,6 @@
toolBarMenu1.isSetBtn = false;
var _ckCode = txt_depotsCode.GetCode(); //浠撳簱缂栧彿 depots_code
var _gysCode = txt_suppNo.GetCode(); //渚涘簲鍟嗙紪鍙�
- if (string.IsNullOrEmpty(_ckCode))
- {
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_depotsCode.Focus();
- return;
- }
-
if (string.IsNullOrEmpty(_gysCode))
{
MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
@@ -283,17 +288,16 @@
return;
}
- if (string.IsNullOrEmpty(txt_paperBillNo.Text.Trim()))
+ if (string.IsNullOrEmpty(_ckCode))
{
- MsgHelper.Warning("璇烽�夋嫨閫佽揣鍗曞彿锛�");
- txt_paperBillNo.Focus();
+ MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ txt_depotsCode.Focus();
return;
}
-
var _obj = new MesInvItemArn();
_obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //鍒拌揣鍗曚富閿�
_obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //閫佽揣鍗曞彿;
- _obj.Remark = ""; //澶囨敞
+ _obj.Remark = txt_remark.Text.Trim(); //澶囨敞
_obj.SuppNo = _gysCode; //渚涘簲鍟嗙紪鍙�
_obj.DepotsCode = _ckCode; //浠撳簱缂栧彿 depots_code
_obj.FType = txt_fType.Checked; //0=閲囪喘锛�1=濮斿
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 185da0a..b26e3be 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -404,6 +404,12 @@
<Compile Include="UserControl\SelectCheckDt.Designer.cs">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\ShowLogcs.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\ShowLogcs.Designer.cs">
+ <DependentUpon>ShowLogcs.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\ShowRptWizard.cs">
<SubType>Form</SubType>
</Compile>
@@ -582,6 +588,9 @@
<EmbeddedResource Include="UserControl\SelectCheckDt.resx">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\ShowLogcs.resx">
+ <DependentUpon>ShowLogcs.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowRptWizard.resx">
<DependentUpon>ShowRptWizard.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 299df99..712ce51 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -463,6 +463,14 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾涔夌墿鏂�
+ if (colType is UcLookItems)
+ {
+ var txt = colType as UcLookItems;
+ txt.SetIdOrCode(strVal);
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
@@ -570,6 +578,14 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾涔夌墿鏂�
+ if (ctrl is UcLookItems)
+ {
+ var txt = ctrl as UcLookItems;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
new file mode 100644
index 0000000..8e4c3d7
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
@@ -0,0 +1,167 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class ShowLogcs
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(933, 560);
+ this.gcMain.TabIndex = 2;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_userName,
+ this.gv_msg});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
+ this.gv_operationTime.FieldName = "operationTime";
+ this.gv_operationTime.MinWidth = 130;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.ToolTip = "query_a.OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 130;
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "鐩稿叧琛�";
+ this.gv_operationTable.FieldName = "operationTable";
+ this.gv_operationTable.MinWidth = 60;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_a.OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 80;
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鎿嶄綔浜哄憳";
+ this.gv_userName.FieldName = "userName";
+ this.gv_userName.MinWidth = 60;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_a.USER_NAME";
+ this.gv_userName.Visible = true;
+ this.gv_userName.VisibleIndex = 2;
+ this.gv_userName.Width = 80;
+ //
+ // gv_msg
+ //
+ this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_msg.AppearanceCell.Options.UseFont = true;
+ this.gv_msg.Caption = "鎿嶄綔璇︽儏";
+ this.gv_msg.FieldName = "msg";
+ this.gv_msg.MinWidth = 150;
+ this.gv_msg.Name = "gv_msg";
+ this.gv_msg.OptionsColumn.AllowEdit = false;
+ this.gv_msg.Tag = "query_a.MSG";
+ this.gv_msg.Visible = true;
+ this.gv_msg.VisibleIndex = 3;
+ this.gv_msg.Width = 150;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 513);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 50;
+ this.pageBar1.Size = new System.Drawing.Size(933, 47);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // ShowLogcs
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(933, 560);
+ this.Controls.Add(this.pageBar1);
+ this.Controls.Add(this.gcMain);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "ShowLogcs";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "鍏宠仈鏃ュ織";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
+ private UserControls.Data.UcPageBar pageBar1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
new file mode 100644
index 0000000..8c20122
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -0,0 +1,81 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class ShowLogcs : DevExpress.XtraEditors.XtraForm
+ {
+ public ShowLogcs()
+ {
+ InitializeComponent();
+ getPageList(1, UtilityHelper.GetPageSize());
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ var _sbSqlWhere = new StringBuilder();
+ var pgq = new PageQueryModel(curPage, pageSize, "OPERATION_TIME",
+ "desc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
+ var 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);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.resx b/DevApp/Gs.DevApp/UserControl/ShowLogcs.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 8bc9d49..4bb2bf3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -99,8 +99,11 @@
public string GetModel()
{
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
- string id = row["itemModel"].ToString();
- return id;
+ if (row != null) {
+ string id = row["itemModel"].ToString();
+ return id;
+ }
+ return "";
}
public void SetIdOrCode(string Code)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b8907e3..3e93bde 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -38,6 +38,7 @@
btnJianYan.ItemClick += BtnJianYan_ItemClick;
btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnLog.ItemClick += BtnLog_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -46,10 +47,6 @@
actions = lst;
}
- private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnPiZhunClick != null) btnPiZhunClick(this, e);
- }
/// <summary>
@@ -107,6 +104,26 @@
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
return;
_ckService(1.ToString());
+ }
+
+
+ private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLogClick != null) btnLogClick(this, e);
+ else
+ return;
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UserControl.ShowLogcs frm = new ShowLogcs();
+ frm.ShowDialog();
+ }
+
+ private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPiZhunClick != null) btnPiZhunClick(this, e);
}
private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -643,6 +660,12 @@
/// </summary>
public event EventHandler btnPiZhunClick;
+
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ public event EventHandler btnLogClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3