From 2caa1d97437e4089a7d6547c2efb87c7990b3b16 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 08:51:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs | 44 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx | 18
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.resx | 123 ++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 399 +++++----
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.cs | 639 +++++++++++++++
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs | 117 +-
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs | 1054 +++++++++++++++++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs | 64 +
10 files changed, 2,215 insertions(+), 254 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index c7ccb53..a59030d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -117,6 +117,7 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -186,9 +187,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1160, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1450, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_items{}";
@@ -196,10 +198,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1160, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1450, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -208,8 +211,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1158, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1448, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -218,6 +222,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -230,17 +235,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1158, 570);
+ this.split1.Size = new System.Drawing.Size(1448, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1158, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1448, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -252,7 +259,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Appearance.Row.Options.UseTextOptions = true;
this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gridColumn4,
@@ -279,10 +286,12 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn5,
- this.gridColumn9});
+ this.gridColumn9,
+ this.gridColumn10});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.RowAutoHeight = true;
@@ -293,46 +302,46 @@
//
this.colChkInt.Caption = ".";
this.colChkInt.FieldName = "chkInt";
- this.colChkInt.MinWidth = 25;
+ this.colChkInt.MinWidth = 31;
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 94;
+ this.colChkInt.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "浣跨敤缁勭粐";
this.gridColumn4.FieldName = "fSubsidiary";
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.MinWidth = 62;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "org.FNumber";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 250;
+ this.gridColumn4.Width = 312;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡ID";
this.gridColumn2.FieldName = "id";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gv_itemNo
//
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 = 62;
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 = 120;
+ this.gv_itemNo.Width = 150;
//
// gv_itemName
//
@@ -341,202 +350,201 @@
this.gv_itemName.AppearanceCell.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
this.gv_itemName.FieldName = "itemName";
- this.gv_itemName.MinWidth = 10;
+ this.gv_itemName.MinWidth = 12;
this.gv_itemName.Name = "gv_itemName";
this.gv_itemName.OptionsColumn.AllowEdit = false;
this.gv_itemName.Tag = "query_a.item_name";
this.gv_itemName.Visible = true;
this.gv_itemName.VisibleIndex = 4;
- this.gv_itemName.Width = 250;
+ this.gv_itemName.Width = 312;
//
// gv_itemModel
//
this.gv_itemModel.AppearanceCell.Options.UseFont = true;
this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
this.gv_itemModel.FieldName = "itemModel";
- this.gv_itemModel.MinWidth = 10;
+ this.gv_itemModel.MinWidth = 12;
this.gv_itemModel.Name = "gv_itemModel";
this.gv_itemModel.OptionsColumn.AllowEdit = false;
this.gv_itemModel.Tag = "query_a.item_model";
this.gv_itemModel.Visible = true;
this.gv_itemModel.VisibleIndex = 5;
- this.gv_itemModel.Width = 360;
+ this.gv_itemModel.Width = 450;
//
// gv_lowLimt
//
this.gv_lowLimt.AppearanceCell.Options.UseFont = true;
this.gv_lowLimt.Caption = "瀹夊叏搴撳瓨";
this.gv_lowLimt.FieldName = "lowlimit";
- this.gv_lowLimt.MaxWidth = 50;
- this.gv_lowLimt.MinWidth = 50;
+ this.gv_lowLimt.MaxWidth = 62;
+ this.gv_lowLimt.MinWidth = 62;
this.gv_lowLimt.Name = "gv_lowLimt";
this.gv_lowLimt.OptionsColumn.AllowEdit = false;
this.gv_lowLimt.Tag = "query_a.lowlimit";
this.gv_lowLimt.Visible = true;
this.gv_lowLimt.VisibleIndex = 6;
- this.gv_lowLimt.Width = 50;
+ this.gv_lowLimt.Width = 62;
//
// gv_highLimt
//
this.gv_highLimt.AppearanceCell.Options.UseFont = true;
this.gv_highLimt.Caption = "鏈�澶у簱瀛�";
this.gv_highLimt.FieldName = "highlimit";
- this.gv_highLimt.MaxWidth = 50;
- this.gv_highLimt.MinWidth = 50;
+ this.gv_highLimt.MaxWidth = 62;
+ this.gv_highLimt.MinWidth = 62;
this.gv_highLimt.Name = "gv_highLimt";
this.gv_highLimt.OptionsColumn.AllowEdit = false;
this.gv_highLimt.Tag = "query_a.highLimt";
this.gv_highLimt.Visible = true;
this.gv_highLimt.VisibleIndex = 7;
- this.gv_highLimt.Width = 50;
+ this.gv_highLimt.Width = 62;
//
// gv_prdPack
//
this.gv_prdPack.AppearanceCell.Options.UseFont = true;
this.gv_prdPack.Caption = "鏈�灏忓寘瑁呮暟";
this.gv_prdPack.FieldName = "prdPack";
- this.gv_prdPack.MaxWidth = 50;
- this.gv_prdPack.MinWidth = 50;
+ this.gv_prdPack.MaxWidth = 62;
+ this.gv_prdPack.MinWidth = 62;
this.gv_prdPack.Name = "gv_prdPack";
this.gv_prdPack.OptionsColumn.AllowEdit = false;
this.gv_prdPack.Tag = "query_a.prd_pack";
this.gv_prdPack.Visible = true;
this.gv_prdPack.VisibleIndex = 8;
- this.gv_prdPack.Width = 50;
+ this.gv_prdPack.Width = 62;
//
// gv_bomNo
//
this.gv_bomNo.AppearanceCell.Options.UseFont = true;
this.gv_bomNo.Caption = "鐗╂枡鍒嗙被缂栧彿";
this.gv_bomNo.FieldName = "ppbom00019124";
- this.gv_bomNo.MaxWidth = 60;
- this.gv_bomNo.MinWidth = 60;
+ this.gv_bomNo.MaxWidth = 75;
+ this.gv_bomNo.MinWidth = 75;
this.gv_bomNo.Name = "gv_bomNo";
this.gv_bomNo.OptionsColumn.AllowEdit = false;
this.gv_bomNo.Tag = "query_a.bomNo";
- this.gv_bomNo.Width = 60;
//
// gv_materialGroup
//
this.gv_materialGroup.AppearanceCell.Options.UseFont = true;
this.gv_materialGroup.Caption = "鐗╂枡鍒嗙粍";
this.gv_materialGroup.FieldName = "remarks";
- this.gv_materialGroup.MinWidth = 50;
+ this.gv_materialGroup.MinWidth = 62;
this.gv_materialGroup.Name = "gv_materialGroup";
this.gv_materialGroup.OptionsColumn.AllowEdit = false;
this.gv_materialGroup.Tag = "query_a.materialGroup";
this.gv_materialGroup.Visible = true;
this.gv_materialGroup.VisibleIndex = 9;
- this.gv_materialGroup.Width = 130;
+ this.gv_materialGroup.Width = 162;
//
// gv_itemUnitNo
//
this.gv_itemUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_itemUnitNo.Caption = "鍩烘湰鍗曚綅";
this.gv_itemUnitNo.FieldName = "itemUnit";
- this.gv_itemUnitNo.MaxWidth = 50;
- this.gv_itemUnitNo.MinWidth = 50;
+ this.gv_itemUnitNo.MaxWidth = 62;
+ this.gv_itemUnitNo.MinWidth = 62;
this.gv_itemUnitNo.Name = "gv_itemUnitNo";
this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
this.gv_itemUnitNo.Tag = "query_c.fname";
this.gv_itemUnitNo.Visible = true;
this.gv_itemUnitNo.VisibleIndex = 10;
- this.gv_itemUnitNo.Width = 50;
+ this.gv_itemUnitNo.Width = 62;
//
// gv_purchaseUnitNo
//
this.gv_purchaseUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnitNo.Caption = "閲囪喘鍗曚綅";
this.gv_purchaseUnitNo.FieldName = "fpurchaseunitid";
- this.gv_purchaseUnitNo.MaxWidth = 50;
- this.gv_purchaseUnitNo.MinWidth = 50;
+ this.gv_purchaseUnitNo.MaxWidth = 62;
+ this.gv_purchaseUnitNo.MinWidth = 62;
this.gv_purchaseUnitNo.Name = "gv_purchaseUnitNo";
this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnitNo.Tag = "query_d.fname";
this.gv_purchaseUnitNo.Visible = true;
this.gv_purchaseUnitNo.VisibleIndex = 11;
- this.gv_purchaseUnitNo.Width = 50;
+ this.gv_purchaseUnitNo.Width = 62;
//
// gv_saleUnitNo
//
this.gv_saleUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_saleUnitNo.Caption = "閿�鍞崟浣�";
this.gv_saleUnitNo.FieldName = "saleunit";
- this.gv_saleUnitNo.MaxWidth = 50;
- this.gv_saleUnitNo.MinWidth = 50;
+ this.gv_saleUnitNo.MaxWidth = 62;
+ this.gv_saleUnitNo.MinWidth = 62;
this.gv_saleUnitNo.Name = "gv_saleUnitNo";
this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
this.gv_saleUnitNo.Tag = "query_e.fname";
this.gv_saleUnitNo.Visible = true;
this.gv_saleUnitNo.VisibleIndex = 12;
- this.gv_saleUnitNo.Width = 50;
+ this.gv_saleUnitNo.Width = 62;
//
// gv_storeUnitNo
//
this.gv_storeUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_storeUnitNo.Caption = "搴撳瓨鍗曚綅";
this.gv_storeUnitNo.FieldName = "storeunit";
- this.gv_storeUnitNo.MaxWidth = 50;
- this.gv_storeUnitNo.MinWidth = 50;
+ this.gv_storeUnitNo.MaxWidth = 62;
+ this.gv_storeUnitNo.MinWidth = 62;
this.gv_storeUnitNo.Name = "gv_storeUnitNo";
this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
this.gv_storeUnitNo.Tag = "query_f.fname";
this.gv_storeUnitNo.Visible = true;
this.gv_storeUnitNo.VisibleIndex = 13;
- this.gv_storeUnitNo.Width = 50;
+ this.gv_storeUnitNo.Width = 62;
//
// gv_subconUnitNo
//
this.gv_subconUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_subconUnitNo.Caption = "濮斿鍗曚綅";
this.gv_subconUnitNo.FieldName = "subconUnit";
- this.gv_subconUnitNo.MaxWidth = 50;
- this.gv_subconUnitNo.MinWidth = 50;
+ this.gv_subconUnitNo.MaxWidth = 62;
+ this.gv_subconUnitNo.MinWidth = 62;
this.gv_subconUnitNo.Name = "gv_subconUnitNo";
this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
this.gv_subconUnitNo.Tag = "query_g.fname";
this.gv_subconUnitNo.Visible = true;
this.gv_subconUnitNo.VisibleIndex = 14;
- this.gv_subconUnitNo.Width = 50;
+ this.gv_subconUnitNo.Width = 62;
//
// gv_produceUnitNo
//
this.gv_produceUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_produceUnitNo.Caption = "鐢熶骇鍗曚綅";
this.gv_produceUnitNo.FieldName = "produceUnit";
- this.gv_produceUnitNo.MaxWidth = 50;
- this.gv_produceUnitNo.MinWidth = 50;
+ this.gv_produceUnitNo.MaxWidth = 62;
+ this.gv_produceUnitNo.MinWidth = 62;
this.gv_produceUnitNo.Name = "gv_produceUnitNo";
this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
this.gv_produceUnitNo.Tag = "query_h.fname";
this.gv_produceUnitNo.Visible = true;
this.gv_produceUnitNo.VisibleIndex = 15;
- this.gv_produceUnitNo.Width = 50;
+ this.gv_produceUnitNo.Width = 62;
//
// gv_depotNo
//
this.gv_depotNo.AppearanceCell.Options.UseFont = true;
this.gv_depotNo.Caption = "榛樿浠撳簱";
this.gv_depotNo.FieldName = "depotCode";
- this.gv_depotNo.MinWidth = 80;
+ this.gv_depotNo.MinWidth = 100;
this.gv_depotNo.Name = "gv_depotNo";
this.gv_depotNo.OptionsColumn.AllowEdit = false;
this.gv_depotNo.Tag = "query_m.depot_name";
- this.gv_depotNo.Width = 94;
+ this.gv_depotNo.Width = 117;
//
// gv_isStatus
//
this.gv_isStatus.AppearanceCell.Options.UseFont = true;
this.gv_isStatus.Caption = "绂佺敤鐘舵��";
this.gv_isStatus.FieldName = "fforbidstatus";
- this.gv_isStatus.MaxWidth = 50;
- this.gv_isStatus.MinWidth = 50;
+ this.gv_isStatus.MaxWidth = 62;
+ this.gv_isStatus.MinWidth = 62;
this.gv_isStatus.Name = "gv_isStatus";
this.gv_isStatus.OptionsColumn.AllowEdit = false;
this.gv_isStatus.Tag = "query_a.fforbidstatus";
this.gv_isStatus.Visible = true;
this.gv_isStatus.VisibleIndex = 16;
- this.gv_isStatus.Width = 50;
+ this.gv_isStatus.Width = 62;
//
// gridColumn1
//
@@ -544,89 +552,90 @@
this.gridColumn1.DisplayFormat.FormatString = "d";
this.gridColumn1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.gridColumn1.FieldName = "lastupdateDate";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 62;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.Date;
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 21;
- this.gridColumn1.Width = 180;
+ this.gridColumn1.Width = 225;
//
// gridColumn3
//
this.gridColumn3.Caption = "涓婚敭Guid";
this.gridColumn3.FieldName = "guid";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍏ュ簱瓒呮敹姣斾緥(%)";
this.gridColumn6.FieldName = "ffinishreceiptoverrate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 17;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍙戞枡鏂瑰紡";
this.gridColumn7.FieldName = "fissuetype";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 18;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "鍚敤鎵瑰彿";
this.gridColumn8.FieldName = "fisbatchmanage";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 19;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "鎻愬墠鍒拌揣澶╂暟";
this.gridColumn5.FieldName = "bz10";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 22;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "鍗曟嵁鐘舵��";
this.gridColumn9.FieldName = "dataType";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 20;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1158, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1448, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1158, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1448, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -634,6 +643,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -645,8 +655,8 @@
//
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1158, 570);
- this.splitMx1.SplitterPosition = 202;
+ this.splitMx1.Size = new System.Drawing.Size(1448, 698);
+ this.splitMx1.SplitterPosition = 247;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -675,208 +685,229 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1158, 202);
+ this.layoutMx1.Size = new System.Drawing.Size(1448, 247);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_cgName
//
- this.txt_cgName.Location = new System.Drawing.Point(951, 156);
+ this.txt_cgName.Location = new System.Drawing.Point(1187, 192);
+ this.txt_cgName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_cgName.Name = "txt_cgName";
this.txt_cgName.Properties.Appearance.Options.UseFont = true;
- this.txt_cgName.Size = new System.Drawing.Size(195, 24);
+ this.txt_cgName.Size = new System.Drawing.Size(247, 28);
this.txt_cgName.StyleController = this.layoutMx1;
this.txt_cgName.TabIndex = 407;
this.txt_cgName.Tag = "isStatus";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(580, 177);
+ this.lbGuid.Location = new System.Drawing.Point(725, 216);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(280, 30);
+ this.lbGuid.Size = new System.Drawing.Size(350, 37);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_scName
//
- this.txt_scName.Location = new System.Drawing.Point(667, 156);
+ this.txt_scName.Location = new System.Drawing.Point(831, 192);
+ this.txt_scName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_scName.Name = "txt_scName";
this.txt_scName.Properties.Appearance.Options.UseFont = true;
- this.txt_scName.Size = new System.Drawing.Size(193, 24);
+ this.txt_scName.Size = new System.Drawing.Size(247, 28);
this.txt_scName.StyleController = this.layoutMx1;
this.txt_scName.TabIndex = 408;
this.txt_scName.Tag = "isStatus";
//
// txt_fforbidstatusTxt
//
- this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(383, 120);
+ this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(475, 147);
+ this.txt_fforbidstatusTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fforbidstatusTxt.Name = "txt_fforbidstatusTxt";
this.txt_fforbidstatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(193, 24);
+ this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(247, 28);
this.txt_fforbidstatusTxt.StyleController = this.layoutMx1;
this.txt_fforbidstatusTxt.TabIndex = 343;
this.txt_fforbidstatusTxt.Tag = "isStatus";
//
// txt_xxName
//
- this.txt_xxName.Location = new System.Drawing.Point(951, 120);
+ this.txt_xxName.Location = new System.Drawing.Point(1187, 147);
+ this.txt_xxName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_xxName.Name = "txt_xxName";
this.txt_xxName.Properties.Appearance.Options.UseFont = true;
- this.txt_xxName.Size = new System.Drawing.Size(195, 24);
+ this.txt_xxName.Size = new System.Drawing.Size(247, 28);
this.txt_xxName.StyleController = this.layoutMx1;
this.txt_xxName.TabIndex = 409;
this.txt_xxName.Tag = "isStatus";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(99, 84);
+ this.txt_dptName.Location = new System.Drawing.Point(119, 102);
+ this.txt_dptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(193, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(247, 28);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 406;
this.txt_dptName.Tag = "isStatus";
//
// txt_wlName
//
- this.txt_wlName.Location = new System.Drawing.Point(951, 84);
+ this.txt_wlName.Location = new System.Drawing.Point(1187, 102);
+ this.txt_wlName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_wlName.Name = "txt_wlName";
this.txt_wlName.Properties.Appearance.Options.UseFont = true;
- this.txt_wlName.Size = new System.Drawing.Size(195, 24);
+ this.txt_wlName.Size = new System.Drawing.Size(247, 28);
this.txt_wlName.StyleController = this.layoutMx1;
this.txt_wlName.TabIndex = 410;
this.txt_wlName.Tag = "isStatus";
//
// txt_wwName
//
- this.txt_wwName.Location = new System.Drawing.Point(951, 48);
+ this.txt_wwName.Location = new System.Drawing.Point(1187, 57);
+ this.txt_wwName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_wwName.Name = "txt_wwName";
this.txt_wwName.Properties.Appearance.Options.UseFont = true;
- this.txt_wwName.Size = new System.Drawing.Size(195, 24);
+ this.txt_wwName.Size = new System.Drawing.Size(247, 28);
this.txt_wwName.StyleController = this.layoutMx1;
this.txt_wwName.TabIndex = 411;
this.txt_wwName.Tag = "isStatus";
//
// txt_kfName
//
- this.txt_kfName.Location = new System.Drawing.Point(951, 12);
+ this.txt_kfName.Location = new System.Drawing.Point(1187, 14);
+ this.txt_kfName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_kfName.Name = "txt_kfName";
this.txt_kfName.Properties.Appearance.Options.UseFont = true;
- this.txt_kfName.Size = new System.Drawing.Size(195, 24);
+ this.txt_kfName.Size = new System.Drawing.Size(247, 28);
this.txt_kfName.StyleController = this.layoutMx1;
this.txt_kfName.TabIndex = 412;
this.txt_kfName.Tag = "isStatus";
//
// txt_fissueType
//
- this.txt_fissueType.Location = new System.Drawing.Point(383, 84);
+ this.txt_fissueType.Location = new System.Drawing.Point(475, 102);
+ this.txt_fissueType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fissueType.Name = "txt_fissueType";
this.txt_fissueType.Properties.Appearance.Options.UseFont = true;
- this.txt_fissueType.Size = new System.Drawing.Size(193, 24);
+ this.txt_fissueType.Size = new System.Drawing.Size(247, 28);
this.txt_fissueType.StyleController = this.layoutMx1;
this.txt_fissueType.TabIndex = 378;
this.txt_fissueType.Tag = "fissueType";
//
// txt_ffinishreceiptoverrate
//
- this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(667, 120);
+ this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(831, 147);
+ this.txt_ffinishreceiptoverrate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_ffinishreceiptoverrate.Name = "txt_ffinishreceiptoverrate";
this.txt_ffinishreceiptoverrate.Properties.Appearance.Options.UseFont = true;
- this.txt_ffinishreceiptoverrate.Size = new System.Drawing.Size(193, 24);
+ this.txt_ffinishreceiptoverrate.Size = new System.Drawing.Size(247, 28);
this.txt_ffinishreceiptoverrate.StyleController = this.layoutMx1;
this.txt_ffinishreceiptoverrate.TabIndex = 370;
this.txt_ffinishreceiptoverrate.Tag = "finishRate";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(99, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(119, 14);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(193, 32);
+ this.txt_itemName.Size = new System.Drawing.Size(247, 39);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "itemName";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(99, 156);
+ this.txt_itemModel.Location = new System.Drawing.Point(119, 192);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(477, 34);
+ this.txt_itemModel.Size = new System.Drawing.Size(603, 41);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "itemModel";
//
// txt_itemDescription
//
- this.txt_itemDescription.Location = new System.Drawing.Point(99, 48);
+ this.txt_itemDescription.Location = new System.Drawing.Point(119, 57);
+ this.txt_itemDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemDescription.Name = "txt_itemDescription";
this.txt_itemDescription.Properties.Appearance.Options.UseFont = true;
- this.txt_itemDescription.Size = new System.Drawing.Size(193, 24);
+ this.txt_itemDescription.Size = new System.Drawing.Size(247, 28);
this.txt_itemDescription.StyleController = this.layoutMx1;
this.txt_itemDescription.TabIndex = 222;
this.txt_itemDescription.Tag = "itemDescription";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(383, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(475, 14);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(193, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(247, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "itemNo";
//
// txt_materialProperti
//
- this.txt_materialProperti.Location = new System.Drawing.Point(383, 48);
+ this.txt_materialProperti.Location = new System.Drawing.Point(475, 57);
+ this.txt_materialProperti.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_materialProperti.Name = "txt_materialProperti";
this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
- this.txt_materialProperti.Size = new System.Drawing.Size(193, 24);
+ this.txt_materialProperti.Size = new System.Drawing.Size(247, 28);
this.txt_materialProperti.StyleController = this.layoutMx1;
this.txt_materialProperti.TabIndex = 360;
this.txt_materialProperti.Tag = "materialProperties";
//
// txt_productionWorkshop
//
- this.txt_productionWorkshop.Location = new System.Drawing.Point(667, 12);
+ this.txt_productionWorkshop.Location = new System.Drawing.Point(831, 14);
+ this.txt_productionWorkshop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_productionWorkshop.Name = "txt_productionWorkshop";
this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
- this.txt_productionWorkshop.Size = new System.Drawing.Size(193, 24);
+ this.txt_productionWorkshop.Size = new System.Drawing.Size(247, 28);
this.txt_productionWorkshop.StyleController = this.layoutMx1;
this.txt_productionWorkshop.TabIndex = 336;
this.txt_productionWorkshop.Tag = "produceWorkNo";
//
// txt_highlimit
//
- this.txt_highlimit.Location = new System.Drawing.Point(667, 48);
+ this.txt_highlimit.Location = new System.Drawing.Point(831, 57);
+ this.txt_highlimit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_highlimit.Name = "txt_highlimit";
this.txt_highlimit.Properties.Appearance.Options.UseFont = true;
- this.txt_highlimit.Size = new System.Drawing.Size(193, 24);
+ this.txt_highlimit.Size = new System.Drawing.Size(247, 28);
this.txt_highlimit.StyleController = this.layoutMx1;
this.txt_highlimit.TabIndex = 262;
this.txt_highlimit.Tag = "highLimt";
//
// txt_lowlimit
//
- this.txt_lowlimit.Location = new System.Drawing.Point(667, 84);
+ this.txt_lowlimit.Location = new System.Drawing.Point(831, 102);
+ this.txt_lowlimit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lowlimit.Name = "txt_lowlimit";
this.txt_lowlimit.Properties.Appearance.Options.UseFont = true;
- this.txt_lowlimit.Size = new System.Drawing.Size(193, 24);
+ this.txt_lowlimit.Size = new System.Drawing.Size(247, 28);
this.txt_lowlimit.StyleController = this.layoutMx1;
this.txt_lowlimit.TabIndex = 258;
this.txt_lowlimit.Tag = "lowLimt";
//
// txt_prdPack
//
- this.txt_prdPack.Location = new System.Drawing.Point(99, 120);
+ this.txt_prdPack.Location = new System.Drawing.Point(119, 147);
+ this.txt_prdPack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_prdPack.Name = "txt_prdPack";
this.txt_prdPack.Properties.Appearance.Options.UseFont = true;
- this.txt_prdPack.Size = new System.Drawing.Size(193, 24);
+ this.txt_prdPack.Size = new System.Drawing.Size(247, 28);
this.txt_prdPack.StyleController = this.layoutMx1;
this.txt_prdPack.TabIndex = 267;
this.txt_prdPack.Tag = "prdPack";
@@ -948,7 +979,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1158, 202);
+ this.Root.Size = new System.Drawing.Size(1448, 247);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -956,210 +987,221 @@
this.layoutControlItem1.Control = this.txt_itemName;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem1.Size = new System.Drawing.Size(356, 43);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(284, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(356, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem5.Size = new System.Drawing.Size(356, 43);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_kfName;
- this.layoutControlItem13.Location = new System.Drawing.Point(852, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(1068, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem13.Size = new System.Drawing.Size(356, 43);
this.layoutControlItem13.Text = "搴撴埧鍗曚綅";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_wwName;
- this.layoutControlItem14.Location = new System.Drawing.Point(852, 36);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1068, 43);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem14.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem14.Text = "濮斿鍗曚綅";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_wlName;
- this.layoutControlItem15.Location = new System.Drawing.Point(852, 72);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1068, 88);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem15.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem15.Text = "鐗╂枡鍗曚綅";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_xxName;
- this.layoutControlItem16.Location = new System.Drawing.Point(852, 108);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1068, 133);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem16.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem16.Text = "閿�鍞崟浣�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_prdPack;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 108);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 133);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem17.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem17.Text = "鏈�灏忓寘瑁呮暟";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fissueType;
- this.layoutControlItem18.Location = new System.Drawing.Point(284, 72);
+ this.layoutControlItem18.Location = new System.Drawing.Point(356, 88);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem18.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem18.Text = "鍙戞枡鏂瑰紡";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_fforbidstatusTxt;
- this.layoutControlItem23.Location = new System.Drawing.Point(284, 108);
+ this.layoutControlItem23.Location = new System.Drawing.Point(356, 133);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem23.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem23.Text = "绂佺敤鐘舵��";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_materialProperti;
- this.layoutControlItem9.Location = new System.Drawing.Point(284, 36);
+ this.layoutControlItem9.Location = new System.Drawing.Point(356, 43);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem9.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem9.Text = "鐗╂枡灞炴��";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_productionWorkshop;
- this.layoutControlItem10.Location = new System.Drawing.Point(568, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(712, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem10.Size = new System.Drawing.Size(356, 43);
this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_highlimit;
- this.layoutControlItem11.Location = new System.Drawing.Point(568, 36);
+ this.layoutControlItem11.Location = new System.Drawing.Point(712, 43);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem11.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem11.Text = "鏈�澶у簱瀛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_lowlimit;
- this.layoutControlItem12.Location = new System.Drawing.Point(568, 72);
+ this.layoutControlItem12.Location = new System.Drawing.Point(712, 88);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem12.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem12.Text = "瀹夊叏搴撳瓨";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_ffinishreceiptoverrate;
this.layoutControlItem19.CustomizationFormText = "鍏ュ簱瓒呮敹姣斾緥(%)";
- this.layoutControlItem19.Location = new System.Drawing.Point(568, 108);
+ this.layoutControlItem19.Location = new System.Drawing.Point(712, 133);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem19.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem19.Text = "瓒呮敹姣斾緥";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_scName;
- this.layoutControlItem21.Location = new System.Drawing.Point(568, 144);
+ this.layoutControlItem21.Location = new System.Drawing.Point(712, 178);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(284, 38);
+ this.layoutControlItem21.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem21.Text = "鐢熶骇鍗曚綅";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_cgName;
- this.layoutControlItem22.Location = new System.Drawing.Point(852, 144);
+ this.layoutControlItem22.Location = new System.Drawing.Point(1068, 178);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem22.Size = new System.Drawing.Size(286, 38);
+ this.layoutControlItem22.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem22.Text = "閲囪喘鍗曚綅";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemModel;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 144);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 178);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem2.Size = new System.Drawing.Size(568, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(712, 45);
this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemDescription;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 36);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 43);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem4.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem4.Text = "鐗╂枡鎻忚堪";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 88);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem20.Size = new System.Drawing.Size(356, 45);
this.layoutControlItem20.Text = "榛樿浠撳簱";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "瓒呴噰鐜�";
+ this.gridColumn10.FieldName = "lossPercent";
+ this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 23;
+ this.gridColumn10.Width = 94;
//
// Frm_MesItems
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1160, 682);
+ this.ClientSize = new System.Drawing.Size(1450, 834);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MesItems";
this.Text = "鐗╂枡淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1302,5 +1344,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
index 9158828..1138a93 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
@@ -30,25 +30,39 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemsShow));
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_day = new System.Windows.Forms.NumericUpDown();
this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
this.btnSave = new DevExpress.XtraEditors.SimpleButton();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_day = new System.Windows.Forms.NumericUpDown();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_lossPercent = new DevExpress.XtraEditors.TextEdit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_day)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lossPercent.Properties)).BeginInit();
this.SuspendLayout();
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_lossPercent);
+ this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_day);
this.panel1.Controls.Add(this.btnCancel);
this.panel1.Controls.Add(this.btnSave);
this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Location = new System.Drawing.Point(29, 51);
+ this.panel1.Location = new System.Drawing.Point(36, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(360, 215);
+ this.panel1.Size = new System.Drawing.Size(450, 263);
this.panel1.TabIndex = 3;
+ //
+ // txt_day
+ //
+ this.txt_day.Location = new System.Drawing.Point(215, 73);
+ this.txt_day.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_day.Name = "txt_day";
+ this.txt_day.Size = new System.Drawing.Size(150, 29);
+ this.txt_day.TabIndex = 245;
//
// btnCancel
//
@@ -56,10 +70,10 @@
this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
- this.btnCancel.Location = new System.Drawing.Point(205, 143);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnCancel.Location = new System.Drawing.Point(256, 175);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(87, 37);
+ this.btnCancel.Size = new System.Drawing.Size(109, 45);
this.btnCancel.TabIndex = 244;
this.btnCancel.Text = "鍙栨秷 (&C)";
//
@@ -69,35 +83,46 @@
this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
- this.btnSave.Location = new System.Drawing.Point(39, 143);
- this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnSave.Location = new System.Drawing.Point(49, 175);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(87, 37);
+ this.btnSave.Size = new System.Drawing.Size(109, 45);
this.btnSave.TabIndex = 243;
this.btnSave.Text = "纭畾 (&L)";
//
// labelControl1
//
- this.labelControl1.Location = new System.Drawing.Point(39, 62);
+ this.labelControl1.Location = new System.Drawing.Point(49, 76);
+ this.labelControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(105, 18);
+ this.labelControl1.Size = new System.Drawing.Size(126, 22);
this.labelControl1.TabIndex = 242;
this.labelControl1.Text = "鎻愬墠鍒拌揣澶╂暟锛�";
//
- // txt_day
+ // labelControl2
//
- this.txt_day.Location = new System.Drawing.Point(172, 60);
- this.txt_day.Name = "txt_day";
- this.txt_day.Size = new System.Drawing.Size(120, 26);
- this.txt_day.TabIndex = 245;
+ this.labelControl2.Location = new System.Drawing.Point(49, 125);
+ this.labelControl2.Margin = new System.Windows.Forms.Padding(4);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(90, 22);
+ this.labelControl2.TabIndex = 246;
+ this.labelControl2.Text = "瓒呴噰姣斾緥锛�";
+ //
+ // txt_lossPercent
+ //
+ this.txt_lossPercent.Location = new System.Drawing.Point(215, 125);
+ this.txt_lossPercent.Name = "txt_lossPercent";
+ this.txt_lossPercent.Size = new System.Drawing.Size(150, 28);
+ this.txt_lossPercent.TabIndex = 247;
//
// Frm_MesItemsShow
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(420, 343);
+ this.ClientSize = new System.Drawing.Size(525, 419);
this.Controls.Add(this.panel1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "Frm_MesItemsShow";
@@ -106,6 +131,7 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_day)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lossPercent.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -117,5 +143,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraEditors.SimpleButton btnSave;
private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.TextEdit txt_lossPercent;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
index 3fb5d72..5c8091b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
@@ -1,7 +1,9 @@
-锘縰sing Gs.DevApp.ToolBox;
+锘縰sing DevExpress.XtraRichEdit.Fields;
+using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Windows.Forms;
+using System.Text.RegularExpressions;
namespace Gs.DevApp.DevFrm.BasicData
{
@@ -17,12 +19,52 @@
this.btnSave.Click += BtnSave_Click;
}
+ /// <summary>
+ /// 楠岃瘉瓒呴噰鐜囪緭鍏ュ��
+ /// </summary>
+ private bool ValidateLossPercent()
+ {
+ if (txt_lossPercent.EditValue == null || string.IsNullOrWhiteSpace(txt_lossPercent.Text))
+ {
+ txt_lossPercent.EditValue = 0.0;
+ return true;
+ }
+
+ if (double.TryParse(txt_lossPercent.EditValue.ToString(), out double value))
+ {
+ if (value < 0.0 || value > 1.0)
+ {
+ MsgHelper.Warning("瓒呴噰鐜囧繀椤诲湪0鍒�1涔嬮棿锛�");
+ txt_lossPercent.Focus();
+ return false;
+ }
+
+ // 鏍煎紡鍖栨樉绀猴紝淇濈暀閫傚綋鐨勫皬鏁颁綅鏁�
+ txt_lossPercent.EditValue = Math.Round(value, 4);
+ return true;
+ }
+ else
+ {
+ MsgHelper.Warning("璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�");
+ txt_lossPercent.EditValue = 0.0;
+ txt_lossPercent.Focus();
+ return false;
+ }
+ }
+
private void BtnSave_Click(object sender, EventArgs e)
{
+ // 淇濆瓨鍓嶉獙璇佽秴閲囩巼
+ if (!ValidateLossPercent())
+ {
+ return;
+ }
+
var _obj = new
{
guidList = this.guidList,
bz10 = txt_day.Value,
+ percent = txt_lossPercent.EditValue
};
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
index c0dfd5d..07a1044 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
@@ -121,20 +121,20 @@
<data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
- bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE
- tP1LHGl1WoZVg2+DYrqYZrYys6/cPvVibk38teBUkkUFNcbYuGyFCXYuyxYcMYSyPlSi4fY9m+KMsECW
- aEF5D2m4gzUeZ6MC8SXZYflU4K8taZ2nc1GBH+4i3eStJFdwwABpWNf268xwQVggW4zgd1aJnnbvsrBA
- 9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg==
+ bGUAQ2xvc2U7RXhpdDsFGf+FAAAAqElEQVQ4T7WSMQoCQRRDtxNk1RsIaydi4R1ykxxSrC1sLVPqJQQR
+ HfnLCJ913BlcLTJFII+EP1UIoRqi9hERvtFfAbcS7xNAIpYiDs7biViJOOUAVxGNCPNmEWLhcfTWIu59
+ ANNWxCgGpi5ci9jnGqQgyXAO4Gv7OUUAH564Jm+QFOAiYu7CVtvP2Yh49AFMRxGLzmaD2GnPuQYv2Tm7
+ XvFHKtbvAEP0BKkDdTUPi1CNAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
- bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq
- PRWJJaktgFLUOjsQ0egURKEgaj/NOEfuyJl5E4/iy8y5c7+Tyc6LruI0O+cKUbEVnUkhxhd4ycOcDUdL
- cgVjULKcK1AxyCbwJBPLuYKiH/iCm+VkgZf0VJlcKJNUgRZ9sshkRpkEBRr8AmiCJ/Ay75z9XED64GQM
- bPZGnSDYAsUjqFgmZXAAPWZ1goDHBngAfnsDqqAGtjbjW12duGBui9+YqhMXnKPlFCd14oJ9tJxip05c
- 0AFrcLdlhbMVaKsTFPyPy16LX4vunIH/egAAAABJRU5ErkJggg==
+ bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA10lEQVQ4T52RPQoCMRCF9wIeQhELK9HO
+ 2l4rhTnS1B5AS7G2ezcQsbGzUCy2WLH2p4kMJDBmx0QsPrJvkvcRskW1GRcKp7NzLosuDqK1dtgiCEIp
+ ILkghnAjxpwYDZ9rAl38yL4gq7D4JsjdIAjuKYH5BqosXFMC8y9EgpUp0CEcIEafGC9Vlm+Z/SwQpsQo
+ PTO9lxNI8UKMlio1iXEmxiQn6BHj6a+9J0abGB1iHPxM9ropwTp6OItlSlAZhZgyJTgZhZhjSjAixo4Y
+ D6Mosy0xhl8F//AGi1+L7i5kYh4AAAAASUVORK5CYII=
</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
new file mode 100644
index 0000000..5511038
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
@@ -0,0 +1,1054 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+ partial class Frm_MesJjgzSchedule
+ {
+ /// <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.components = new System.ComponentModel.Container();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_BeginTime = new DevExpress.XtraEditors.DateEdit();
+ this.txt_EndTime = new DevExpress.XtraEditors.DateEdit();
+ this.txt_ScheNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_OnWorkTime1 = new DevExpress.XtraEditors.TimeEdit();
+ this.txt_OffWorkTime1 = new DevExpress.XtraEditors.TimeEdit();
+ this.txt_OnWorkTime2 = new DevExpress.XtraEditors.TimeEdit();
+ this.txt_OffWorkTime2 = new DevExpress.XtraEditors.TimeEdit();
+ this.txt_OnWorkTime3 = new DevExpress.XtraEditors.TimeEdit();
+ this.txt_OffWorkTime3 = new DevExpress.XtraEditors.TimeEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ScheNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OnWorkTime1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OffWorkTime1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OnWorkTime2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OffWorkTime2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OnWorkTime3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OffWorkTime3.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1408, 624);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 61;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_createBy,
+ this.gv_createDate,
+ this.gridColumn6,
+ this.gridColumn13,
+ this.gridColumn12,
+ this.gridColumn11,
+ this.gridColumn9,
+ this.gridColumn8,
+ this.gridColumn7,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn10});
+ this.gridView1.DetailHeight = 428;
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 62;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "寤虹珛鑰�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 62;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.OptionsColumn.ReadOnly = true;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 1;
+ this.gv_createBy.Width = 100;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "寤虹珛鏃堕棿";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 225;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.OptionsColumn.ReadOnly = true;
+ this.gv_createDate.Tag = "query_a.create_date";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.VisibleIndex = 2;
+ this.gv_createDate.Width = 286;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "瀹℃牳";
+ this.gridColumn6.FieldName = "checkStatus";
+ this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Tag = "checkStatus";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.Width = 117;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐢熸晥鏃ユ湡";
+ this.gridColumn3.FieldName = "beginTime";
+ this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Tag = "beginTime";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "澶辨晥鏃ユ湡";
+ this.gridColumn4.FieldName = "endTime";
+ this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Tag = "endTime";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 11;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "璇存槑";
+ this.gridColumn5.FieldName = "remark";
+ this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.AllowEdit = false;
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Tag = "remark";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鐗╂枡Id";
+ this.gridColumn10.FieldName = "itemId";
+ this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.OptionsColumn.ReadOnly = true;
+ this.gridColumn10.Tag = "itemId";
+ this.gridColumn10.Width = 112;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 624);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1408, 59);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 195;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_createDate);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkStatus);
+ this.layoutMx1.Controls.Add(this.txt_Guid);
+ this.layoutMx1.Controls.Add(this.txt_BeginTime);
+ this.layoutMx1.Controls.Add(this.txt_EndTime);
+ this.layoutMx1.Controls.Add(this.txt_ScheNo);
+ this.layoutMx1.Controls.Add(this.txt_Remark);
+ this.layoutMx1.Controls.Add(this.txt_OnWorkTime1);
+ this.layoutMx1.Controls.Add(this.txt_OffWorkTime1);
+ this.layoutMx1.Controls.Add(this.txt_OnWorkTime2);
+ this.layoutMx1.Controls.Add(this.txt_OffWorkTime2);
+ this.layoutMx1.Controls.Add(this.txt_OnWorkTime3);
+ this.layoutMx1.Controls.Add(this.txt_OffWorkTime3);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem9});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 195);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(692, 131);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(334, 34);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_createDate
+ //
+ this.txt_createDate.Location = new System.Drawing.Point(826, 99);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate.Size = new System.Drawing.Size(223, 28);
+ this.txt_createDate.StyleController = this.layoutMx1;
+ this.txt_createDate.TabIndex = 231;
+ this.txt_createDate.Tag = "readonly";
+ //
+ // txt_createBy
+ //
+ this.txt_createBy.Location = new System.Drawing.Point(1173, 99);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(223, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
+ //
+ // txt_checkStatus
+ //
+ this.txt_checkStatus.Location = new System.Drawing.Point(359, 99);
+ this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkStatus.Name = "txt_checkStatus";
+ this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
+ this.txt_checkStatus.StyleController = this.layoutMx1;
+ this.txt_checkStatus.TabIndex = 249;
+ this.txt_checkStatus.Tag = "readonly";
+ //
+ // txt_Guid
+ //
+ this.txt_Guid.Location = new System.Drawing.Point(1173, 143);
+ this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_Guid.Name = "txt_Guid";
+ this.txt_Guid.Size = new System.Drawing.Size(223, 28);
+ this.txt_Guid.StyleController = this.layoutMx1;
+ this.txt_Guid.TabIndex = 250;
+ this.txt_Guid.Tag = "";
+ //
+ // txt_BeginTime
+ //
+ this.txt_BeginTime.EditValue = null;
+ this.txt_BeginTime.Location = new System.Drawing.Point(1173, 55);
+ this.txt_BeginTime.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_BeginTime.Name = "txt_BeginTime";
+ this.txt_BeginTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_BeginTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_BeginTime.Properties.DisplayFormat.FormatString = "";
+ this.txt_BeginTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_BeginTime.Properties.EditFormat.FormatString = "";
+ this.txt_BeginTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_BeginTime.Properties.Mask.EditMask = "";
+ this.txt_BeginTime.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
+ this.txt_BeginTime.Size = new System.Drawing.Size(223, 28);
+ this.txt_BeginTime.StyleController = this.layoutMx1;
+ this.txt_BeginTime.TabIndex = 250;
+ this.txt_BeginTime.Tag = "";
+ //
+ // txt_EndTime
+ //
+ this.txt_EndTime.EditValue = null;
+ this.txt_EndTime.Location = new System.Drawing.Point(132, 99);
+ this.txt_EndTime.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_EndTime.Name = "txt_EndTime";
+ this.txt_EndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_EndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_EndTime.Properties.DisplayFormat.FormatString = "";
+ this.txt_EndTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_EndTime.Properties.EditFormat.FormatString = "";
+ this.txt_EndTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_EndTime.Properties.Mask.EditMask = "";
+ this.txt_EndTime.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
+ this.txt_EndTime.Size = new System.Drawing.Size(223, 28);
+ this.txt_EndTime.StyleController = this.layoutMx1;
+ this.txt_EndTime.TabIndex = 250;
+ this.txt_EndTime.Tag = "";
+ //
+ // txt_ScheNo
+ //
+ this.txt_ScheNo.Location = new System.Drawing.Point(132, 12);
+ this.txt_ScheNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_ScheNo.Name = "txt_ScheNo";
+ this.txt_ScheNo.Size = new System.Drawing.Size(223, 28);
+ this.txt_ScheNo.StyleController = this.layoutMx1;
+ this.txt_ScheNo.TabIndex = 392;
+ this.txt_ScheNo.Tag = "readOnly";
+ //
+ // txt_Remark
+ //
+ this.txt_Remark.Location = new System.Drawing.Point(132, 143);
+ this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_Remark.Name = "txt_Remark";
+ this.txt_Remark.Size = new System.Drawing.Size(223, 28);
+ this.txt_Remark.StyleController = this.layoutMx1;
+ this.txt_Remark.TabIndex = 392;
+ this.txt_Remark.Tag = "";
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.lbGuid;
+ this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "lbGuid";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem13,
+ this.layoutControlItem6,
+ this.layoutControlItem5,
+ this.layoutControlItem10,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
+ this.layoutControlItem11,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem2,
+ this.layoutControlItem12,
+ this.layoutControlItem14,
+ this.layoutControlItem1,
+ this.layoutControlItem15});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1408, 195);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_Guid;
+ this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem13.CustomizationFormText = "Guid";
+ this.layoutControlItem13.Location = new System.Drawing.Point(1041, 131);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem13.Text = "Guid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_createDate;
+ this.layoutControlItem6.Location = new System.Drawing.Point(694, 87);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_createBy;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1041, 87);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem5.Text = "寤虹珛鑰�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_checkStatus;
+ this.layoutControlItem10.Location = new System.Drawing.Point(347, 87);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_OnWorkTime1;
+ this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem7.CustomizationFormText = "涓婂崍涓婄彮鏃堕棿";
+ this.layoutControlItem7.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 43);
+ this.layoutControlItem7.Text = "涓婂崍涓婄彮鏃堕棿";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_OffWorkTime1;
+ this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem8.CustomizationFormText = "涓婂崍涓嬬彮鏃堕棿";
+ this.layoutControlItem8.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 43);
+ this.layoutControlItem8.Text = "涓婂崍涓嬬彮鏃堕棿";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_OnWorkTime2;
+ this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem11.CustomizationFormText = "涓嬪崍涓婄彮鏃堕棿";
+ this.layoutControlItem11.Location = new System.Drawing.Point(1041, 0);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 43);
+ this.layoutControlItem11.Text = "涓嬪崍涓婄彮鏃堕棿";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_OffWorkTime2;
+ this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem3.CustomizationFormText = "涓嬪崍涓嬬彮鏃堕棿";
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 43);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem3.Text = "涓嬪崍涓嬬彮鏃堕棿";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_EndTime;
+ this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem4.CustomizationFormText = "澶辨晥鏃ユ湡";
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 87);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem4.Text = "澶辨晥鏃ユ湡";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_BeginTime;
+ this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem2.CustomizationFormText = "鐢熸晥鏃ユ湡";
+ this.layoutControlItem2.Location = new System.Drawing.Point(1041, 43);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem2.Text = "鐢熸晥鏃ユ湡";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_OnWorkTime3;
+ this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem12.CustomizationFormText = "鐝";
+ this.layoutControlItem12.Location = new System.Drawing.Point(347, 43);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem12.Text = "鍔犵彮涓婄彮鏃堕棿";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_OffWorkTime3;
+ this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem14.CustomizationFormText = "鐝";
+ this.layoutControlItem14.Location = new System.Drawing.Point(694, 43);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem14.Text = "鍔犵彮涓嬬彮鏃堕棿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_ScheNo;
+ this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem1.CustomizationFormText = "鐝";
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 43);
+ this.layoutControlItem1.Text = "鐝";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_Remark;
+ this.layoutControlItem15.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem15.CustomizationFormText = "澶囨敞";
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 131);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(347, 44);
+ this.layoutControlItem15.Text = "澶囨敞";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏅氫笂涓嬬彮鏃堕棿";
+ this.gridColumn2.FieldName = "offWorkTime3";
+ this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.Width = 112;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鏅氫笂涓婄彮鏃堕棿";
+ this.gridColumn7.FieldName = "onWorkTime3";
+ this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 8;
+ this.gridColumn7.Width = 112;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "涓嬪崍涓嬬彮鏃堕棿";
+ this.gridColumn8.FieldName = "offWorkTime2";
+ this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 112;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "涓嬪崍涓婄彮鏃堕棿";
+ this.gridColumn9.FieldName = "onWorkTime2";
+ this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.Width = 112;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "涓婂崍涓嬬彮鏃堕棿";
+ this.gridColumn11.FieldName = "offWorkTime1";
+ this.gridColumn11.MinWidth = 30;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 5;
+ this.gridColumn11.Width = 112;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "涓婂崍涓婄彮鏃堕棿";
+ this.gridColumn12.FieldName = "onWorkTime1";
+ this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.Width = 112;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鐝";
+ this.gridColumn13.FieldName = "scheNo";
+ this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.Width = 112;
+ //
+ // txt_OnWorkTime1
+ //
+ this.txt_OnWorkTime1.EditValue = null;
+ this.txt_OnWorkTime1.Location = new System.Drawing.Point(479, 12);
+ this.txt_OnWorkTime1.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OnWorkTime1.Name = "txt_OnWorkTime1";
+ this.txt_OnWorkTime1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_OnWorkTime1.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Default;
+ this.txt_OnWorkTime1.Properties.MaskSettings.Set("mask", "T");
+ this.txt_OnWorkTime1.Size = new System.Drawing.Size(223, 28);
+ this.txt_OnWorkTime1.StyleController = this.layoutMx1;
+ this.txt_OnWorkTime1.TabIndex = 392;
+ this.txt_OnWorkTime1.Tag = "";
+ //
+ // txt_OffWorkTime1
+ //
+ this.txt_OffWorkTime1.EditValue = null;
+ this.txt_OffWorkTime1.Location = new System.Drawing.Point(826, 12);
+ this.txt_OffWorkTime1.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OffWorkTime1.Name = "txt_OffWorkTime1";
+ this.txt_OffWorkTime1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_OffWorkTime1.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Default;
+ this.txt_OffWorkTime1.Properties.MaskSettings.Set("mask", "T");
+ this.txt_OffWorkTime1.Size = new System.Drawing.Size(223, 28);
+ this.txt_OffWorkTime1.StyleController = this.layoutMx1;
+ this.txt_OffWorkTime1.TabIndex = 392;
+ this.txt_OffWorkTime1.Tag = "";
+ //
+ // txt_OnWorkTime2
+ //
+ this.txt_OnWorkTime2.EditValue = null;
+ this.txt_OnWorkTime2.Location = new System.Drawing.Point(1173, 12);
+ this.txt_OnWorkTime2.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OnWorkTime2.Name = "txt_OnWorkTime2";
+ this.txt_OnWorkTime2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_OnWorkTime2.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Default;
+ this.txt_OnWorkTime2.Properties.MaskSettings.Set("mask", "T");
+ this.txt_OnWorkTime2.Size = new System.Drawing.Size(223, 28);
+ this.txt_OnWorkTime2.StyleController = this.layoutMx1;
+ this.txt_OnWorkTime2.TabIndex = 392;
+ this.txt_OnWorkTime2.Tag = "";
+ //
+ // txt_OffWorkTime2
+ //
+ this.txt_OffWorkTime2.EditValue = null;
+ this.txt_OffWorkTime2.Location = new System.Drawing.Point(132, 55);
+ this.txt_OffWorkTime2.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OffWorkTime2.Name = "txt_OffWorkTime2";
+ this.txt_OffWorkTime2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_OffWorkTime2.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Default;
+ this.txt_OffWorkTime2.Properties.MaskSettings.Set("mask", "T");
+ this.txt_OffWorkTime2.Size = new System.Drawing.Size(223, 28);
+ this.txt_OffWorkTime2.StyleController = this.layoutMx1;
+ this.txt_OffWorkTime2.TabIndex = 392;
+ this.txt_OffWorkTime2.Tag = "";
+ //
+ // txt_OnWorkTime3
+ //
+ this.txt_OnWorkTime3.EditValue = null;
+ this.txt_OnWorkTime3.Location = new System.Drawing.Point(479, 55);
+ this.txt_OnWorkTime3.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OnWorkTime3.Name = "txt_OnWorkTime3";
+ this.txt_OnWorkTime3.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_OnWorkTime3.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Default;
+ this.txt_OnWorkTime3.Properties.MaskSettings.Set("mask", "T");
+ this.txt_OnWorkTime3.Size = new System.Drawing.Size(223, 28);
+ this.txt_OnWorkTime3.StyleController = this.layoutMx1;
+ this.txt_OnWorkTime3.TabIndex = 392;
+ this.txt_OnWorkTime3.Tag = "";
+ //
+ // txt_OffWorkTime3
+ //
+ this.txt_OffWorkTime3.EditValue = null;
+ this.txt_OffWorkTime3.Location = new System.Drawing.Point(826, 55);
+ this.txt_OffWorkTime3.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OffWorkTime3.Name = "txt_OffWorkTime3";
+ this.txt_OffWorkTime3.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_OffWorkTime3.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Default;
+ this.txt_OffWorkTime3.Properties.MaskSettings.Set("mask", "T");
+ this.txt_OffWorkTime3.Size = new System.Drawing.Size(223, 28);
+ this.txt_OffWorkTime3.StyleController = this.layoutMx1;
+ this.txt_OffWorkTime3.TabIndex = 392;
+ this.txt_OffWorkTime3.Tag = "";
+ //
+ // Frm_MesJjgzSchedule
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.Controls.Add(this.picCheckBox);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4);
+ this.Name = "Frm_MesJjgzSchedule";
+ this.Text = "璁′欢鍗曚环";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ScheNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OnWorkTime1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OffWorkTime1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OnWorkTime2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OffWorkTime2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OnWorkTime3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OffWorkTime3.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+ private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraEditors.TextEdit txt_Guid;
+ private DevExpress.XtraEditors.DateEdit txt_BeginTime;
+ private DevExpress.XtraEditors.DateEdit txt_EndTime;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraEditors.TextEdit txt_ScheNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraEditors.TextEdit txt_Remark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.TimeEdit txt_OnWorkTime1;
+ private DevExpress.XtraEditors.TimeEdit txt_OffWorkTime1;
+ private DevExpress.XtraEditors.TimeEdit txt_OnWorkTime2;
+ private DevExpress.XtraEditors.TimeEdit txt_OffWorkTime2;
+ private DevExpress.XtraEditors.TimeEdit txt_OnWorkTime3;
+ private DevExpress.XtraEditors.TimeEdit txt_OffWorkTime3;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.cs
new file mode 100644
index 0000000..e629323
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.cs
@@ -0,0 +1,639 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+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.DevFrm.JJGZ
+{
+ public partial class Frm_MesJjgzSchedule : DevExpress.XtraEditors.XtraForm
+ {
+ string _webServiceName = "MesJjgzSchedule/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+
+ public Frm_MesJjgzSchedule()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ this.toolBarMenu1.getXmlConfig();
+
+ // 閰嶇疆鏃堕棿鎺т欢
+ ConfigureTimeControls();
+
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ }
+
+ /// <summary>
+ /// 閰嶇疆鏃堕棿鎺т欢鏍煎紡鍜岄粯璁ゅ��
+ /// </summary>
+ private void ConfigureTimeControls()
+ {
+ var timeControls = new[] {
+ txt_OnWorkTime1, txt_OffWorkTime1,
+ txt_OnWorkTime2, txt_OffWorkTime2,
+ txt_OnWorkTime3, txt_OffWorkTime3
+ };
+
+ foreach (var control in timeControls)
+ {
+ // 璁剧疆鏃堕棿鏍煎紡
+ control.Properties.Mask.EditMask = "HH:mm";
+ control.Properties.Mask.UseMaskAsDisplayFormat = true;
+ control.Properties.DisplayFormat.FormatString = "HH:mm";
+ control.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+
+ // 璁剧疆榛樿鍊�
+ if (control.EditValue == null)
+ {
+ control.EditValue = TimeSpan.Zero;
+ }
+ }
+
+ // 璁剧疆榛樿鐨勫伐浣滄椂闂�
+ txt_OnWorkTime1.EditValue = TimeSpan.Parse("08:00:00"); // 涓婂崍8鐐逛笂鐝�
+ txt_OffWorkTime1.EditValue = TimeSpan.Parse("12:00:00"); // 涓婂崍12鐐逛笅鐝�
+ txt_OnWorkTime2.EditValue = TimeSpan.Parse("13:00:00"); // 涓嬪崍1鐐逛笂鐝�
+ txt_OffWorkTime2.EditValue = TimeSpan.Parse("17:00:00"); // 涓嬪崍5鐐逛笅鐝�
+ }
+
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ _toolCk(1);
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(0);
+ }
+
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "scheNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(rowGuid);
+ var _obj = new
+ {
+ guid = rowGuid,
+ mxGuid = Guid.Empty.ToString(),
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+
+ /// <summary>
+ /// 鏂板浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+ }
+
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_Guid, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ getModel(rowGuid);
+ }
+
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+
+ // 鍩烘湰蹇呭～椤归獙璇�
+ if (string.IsNullOrWhiteSpace(txt_BeginTime.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢熸晥鏃ユ湡锛�");
+ txt_BeginTime.Focus();
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(txt_EndTime.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶辨晥鏃ユ湡锛�");
+ txt_EndTime.Focus();
+ return;
+ }
+
+ // 鏃ユ湡閫昏緫楠岃瘉
+ if (!ValidateDateRange())
+ {
+ return;
+ }
+
+ if (string.IsNullOrWhiteSpace(txt_OnWorkTime1.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ヤ笂鍗堜笂鐝椂闂达紒");
+ txt_OnWorkTime1.Focus();
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(txt_OffWorkTime1.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ヤ笂鍗堜笅鐝椂闂达紒");
+ txt_OffWorkTime1.Focus();
+ return;
+ }
+
+ // 鏃堕棿閫昏緫楠岃瘉
+ if (!ValidateTimeLogic())
+ {
+ return;
+ }
+
+ try
+ {
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ scheNo = txt_ScheNo.Text.Trim(), //鐝鍙凤紙鍚庡彴鑷姩鐢熸垚锛�
+ onWorkTime1 = txt_OnWorkTime1.Text.Trim(), //涓婂崍涓婄彮鏃堕棿
+ offWorkTime1 = txt_OffWorkTime1.Text.Trim(), //涓婂崍涓嬬彮鏃堕棿
+ onWorkTime2 = txt_OnWorkTime2.Text.Trim(), //涓嬪崍涓婄彮鏃堕棿
+ offWorkTime2 = txt_OffWorkTime2.Text.Trim(), //涓嬪崍涓嬬彮鏃堕棿
+ onWorkTime3 = txt_OnWorkTime3.Text.Trim(), //鍔犵彮涓婄彮鏃堕棿
+ offWorkTime3 = txt_OffWorkTime3.Text.Trim(), //鍔犵彮涓嬬彮鏃堕棿
+ beginTime = txt_BeginTime.Text.Trim(), //鐢熸晥鏃ユ湡
+ endTime = txt_EndTime.Text.Trim(), //澶辨晥鏃ユ湡
+ remark = txt_Remark.Text.Trim() //澶囨敞
+ };
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 楠岃瘉鏃ユ湡鑼冨洿
+ /// </summary>
+ /// <returns></returns>
+ private bool ValidateDateRange()
+ {
+ try
+ {
+ DateTime beginTime = DateTime.Parse(txt_BeginTime.Text);
+ DateTime endTime = DateTime.Parse(txt_EndTime.Text);
+
+ if (endTime <= beginTime)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("澶辨晥鏃ユ湡蹇呴』澶т簬鐢熸晥鏃ユ湡锛�");
+ txt_EndTime.Focus();
+ return false;
+ }
+
+
+ return true;
+ }
+ catch (Exception)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ユ纭殑鏃ユ湡鏍煎紡锛�");
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 楠岃瘉鏃堕棿閫昏緫
+ /// </summary>
+ /// <returns></returns>
+ private bool ValidateTimeLogic()
+ {
+ // 楠岃瘉涓婂崍鏃堕棿娈�
+ if (!ValidateTimeSegment(txt_OnWorkTime1.Text, txt_OffWorkTime1.Text, "涓婂崍"))
+ {
+ return false;
+ }
+
+ // 濡傛灉濉啓浜嗕笅鍗堟椂闂达紝楠岃瘉涓嬪崍鏃堕棿娈�
+ if (!string.IsNullOrWhiteSpace(txt_OnWorkTime2.Text) || !string.IsNullOrWhiteSpace(txt_OffWorkTime2.Text))
+ {
+ if (string.IsNullOrWhiteSpace(txt_OnWorkTime2.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ヤ笅鍗堜笂鐝椂闂达紒");
+ txt_OnWorkTime2.Focus();
+ return false;
+ }
+ if (string.IsNullOrWhiteSpace(txt_OffWorkTime2.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ヤ笅鍗堜笅鐝椂闂达紒");
+ txt_OffWorkTime2.Focus();
+ return false;
+ }
+ if (!ValidateTimeSegment(txt_OnWorkTime2.Text, txt_OffWorkTime2.Text, "涓嬪崍"))
+ {
+ return false;
+ }
+
+ // 楠岃瘉涓婂崍涓嬬彮鏃堕棿搴旀棭浜庝笅鍗堜笂鐝椂闂�
+ if (!ValidateTimeSequence(txt_OffWorkTime1.Text, txt_OnWorkTime2.Text, "涓婂崍涓嬬彮鏃堕棿", "涓嬪崍涓婄彮鏃堕棿"))
+ {
+ return false;
+ }
+ }
+
+ // 濡傛灉濉啓浜嗗姞鐝椂闂达紝楠岃瘉鍔犵彮鏃堕棿娈�
+ if (!string.IsNullOrWhiteSpace(txt_OnWorkTime3.Text) || !string.IsNullOrWhiteSpace(txt_OffWorkTime3.Text))
+ {
+ if (string.IsNullOrWhiteSpace(txt_OnWorkTime3.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ュ姞鐝笂鐝椂闂达紒");
+ txt_OnWorkTime3.Focus();
+ return false;
+ }
+ if (string.IsNullOrWhiteSpace(txt_OffWorkTime3.Text))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ュ姞鐝笅鐝椂闂达紒");
+ txt_OffWorkTime3.Focus();
+ return false;
+ }
+ if (!ValidateTimeSegment(txt_OnWorkTime3.Text, txt_OffWorkTime3.Text, "鍔犵彮"))
+ {
+ return false;
+ }
+
+ // 濡傛灉鏈変笅鍗堟椂闂达紝楠岃瘉涓嬪崍涓嬬彮鏃堕棿搴旀棭浜庡姞鐝笂鐝椂闂�
+ if (!string.IsNullOrWhiteSpace(txt_OffWorkTime2.Text))
+ {
+ if (!ValidateTimeSequence(txt_OffWorkTime2.Text, txt_OnWorkTime3.Text, "涓嬪崍涓嬬彮鏃堕棿", "鍔犵彮涓婄彮鏃堕棿"))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ // 濡傛灉娌℃湁涓嬪崍鏃堕棿锛岄獙璇佷笂鍗堜笅鐝椂闂村簲鏃╀簬鍔犵彮涓婄彮鏃堕棿
+ if (!ValidateTimeSequence(txt_OffWorkTime1.Text, txt_OnWorkTime3.Text, "涓婂崍涓嬬彮鏃堕棿", "鍔犵彮涓婄彮鏃堕棿"))
+ {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 楠岃瘉鍗曚釜鏃堕棿娈�
+ /// </summary>
+ /// <param name="startTime">寮�濮嬫椂闂�</param>
+ /// <param name="endTime">缁撴潫鏃堕棿</param>
+ /// <param name="periodName">鏃堕棿娈靛悕绉�</param>
+ /// <returns></returns>
+ private bool ValidateTimeSegment(string startTime, string endTime, string periodName)
+ {
+ try
+ {
+ TimeSpan start = TimeSpan.Parse(startTime);
+ TimeSpan end = TimeSpan.Parse(endTime);
+
+ if (end <= start)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning($"{periodName}涓嬬彮鏃堕棿蹇呴』鏅氫簬涓婄彮鏃堕棿锛�");
+ return false;
+ }
+
+ return true;
+ }
+ catch (Exception)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning($"璇疯緭鍏ユ纭殑{periodName}鏃堕棿鏍煎紡锛�");
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 楠岃瘉鏃堕棿椤哄簭
+ /// </summary>
+ /// <param name="time1">绗竴涓椂闂�</param>
+ /// <param name="time2">绗簩涓椂闂�</param>
+ /// <param name="time1Name">绗竴涓椂闂村悕绉�</param>
+ /// <param name="time2Name">绗簩涓椂闂村悕绉�</param>
+ /// <returns></returns>
+ private bool ValidateTimeSequence(string time1, string time2, string time1Name, string time2Name)
+ {
+ try
+ {
+ TimeSpan t1 = TimeSpan.Parse(time1);
+ TimeSpan t2 = TimeSpan.Parse(time2);
+
+ if (t1 >= t2)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning($"{time1Name}蹇呴』鏃╀簬{time2Name}锛�");
+ return false;
+ }
+
+ return true;
+ }
+ catch (Exception)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏃堕棿鏍煎紡閿欒锛岃妫�鏌ヨ緭鍏ワ紒");
+ return false;
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null;
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="strGuid">涓婚敭</param>
+ /// <param name="isEdit">鏄惁鍙紪杈�</param>
+ /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ }
+ ;
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "scheNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_JJGZ_SCHEDULES,check_Date,check_Status,check_user"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+ }
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.resx
@@ -0,0 +1,123 @@
+锘�<?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>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
index 7700281..f3ced97 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
@@ -60,6 +60,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptBtnView = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
@@ -90,6 +91,7 @@
this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl1.Horizontal = false;
this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Margin = new System.Windows.Forms.Padding(4);
this.splitContainerControl1.Name = "splitContainerControl1";
//
// splitContainerControl1.Panel1
@@ -102,8 +104,8 @@
this.splitContainerControl1.Panel2.Controls.Add(this.gcMain1);
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitContainerControl1.Size = new System.Drawing.Size(1397, 590);
- this.splitContainerControl1.SplitterPosition = 43;
+ this.splitContainerControl1.Size = new System.Drawing.Size(1746, 721);
+ this.splitContainerControl1.SplitterPosition = 53;
this.splitContainerControl1.TabIndex = 0;
//
// layoutControl1
@@ -114,52 +116,57 @@
this.layoutControl1.Controls.Add(this.btnQuery);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControl1.Margin = new System.Windows.Forms.Padding(4);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1397, 43);
+ this.layoutControl1.Size = new System.Drawing.Size(1746, 53);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
//
// ucLookOrg1
//
this.ucLookOrg1.IsReadly = false;
- this.ucLookOrg1.Location = new System.Drawing.Point(84, 12);
+ this.ucLookOrg1.Location = new System.Drawing.Point(96, 12);
+ this.ucLookOrg1.Margin = new System.Windows.Forms.Padding(5);
this.ucLookOrg1.Name = "ucLookOrg1";
- this.ucLookOrg1.Size = new System.Drawing.Size(224, 24);
+ this.ucLookOrg1.Size = new System.Drawing.Size(287, 28);
this.ucLookOrg1.TabIndex = 7;
//
// dateEdit1
//
this.dateEdit1.EditValue = null;
- this.dateEdit1.Location = new System.Drawing.Point(384, 12);
+ this.dateEdit1.Location = new System.Drawing.Point(471, 12);
+ this.dateEdit1.Margin = new System.Windows.Forms.Padding(4);
this.dateEdit1.Name = "dateEdit1";
this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit1.Size = new System.Drawing.Size(124, 24);
+ this.dateEdit1.Size = new System.Drawing.Size(162, 28);
this.dateEdit1.StyleController = this.layoutControl1;
this.dateEdit1.TabIndex = 4;
//
// dateEdit2
//
this.dateEdit2.EditValue = null;
- this.dateEdit2.Location = new System.Drawing.Point(584, 12);
+ this.dateEdit2.Location = new System.Drawing.Point(721, 12);
+ this.dateEdit2.Margin = new System.Windows.Forms.Padding(4);
this.dateEdit2.Name = "dateEdit2";
this.dateEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.dateEdit2.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit2.Size = new System.Drawing.Size(124, 24);
+ this.dateEdit2.Size = new System.Drawing.Size(162, 28);
this.dateEdit2.StyleController = this.layoutControl1;
this.dateEdit2.TabIndex = 5;
//
// btnQuery
//
this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
- this.btnQuery.Location = new System.Drawing.Point(712, 12);
+ this.btnQuery.Location = new System.Drawing.Point(887, 12);
+ this.btnQuery.Margin = new System.Windows.Forms.Padding(4);
this.btnQuery.Name = "btnQuery";
- this.btnQuery.Size = new System.Drawing.Size(146, 27);
+ this.btnQuery.Size = new System.Drawing.Size(183, 32);
this.btnQuery.StyleController = this.layoutControl1;
this.btnQuery.TabIndex = 6;
this.btnQuery.Text = "纭畾鏌ヨ";
@@ -176,15 +183,15 @@
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition1.Width = 300D;
+ columnDefinition1.Width = 375D;
columnDefinition2.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition2.Width = 200D;
+ columnDefinition2.Width = 250D;
columnDefinition3.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition3.Width = 200D;
+ columnDefinition3.Width = 250D;
columnDefinition4.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition4.Width = 150D;
+ columnDefinition4.Width = 187D;
columnDefinition5.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition5.Width = 506D;
+ columnDefinition5.Width = 638D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1,
columnDefinition2,
@@ -195,7 +202,7 @@
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
- this.Root.Size = new System.Drawing.Size(1376, 51);
+ this.Root.Size = new System.Drawing.Size(1720, 56);
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -203,37 +210,37 @@
this.layoutControlItem4.Control = this.ucLookOrg1;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(300, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(375, 36);
this.layoutControlItem4.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.dateEdit2;
- this.layoutControlItem2.Location = new System.Drawing.Point(500, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(625, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(200, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(250, 36);
this.layoutControlItem2.Text = "缁撴潫鏃堕棿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.dateEdit1;
- this.layoutControlItem1.Location = new System.Drawing.Point(300, 0);
+ this.layoutControlItem1.Location = new System.Drawing.Point(375, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(200, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(250, 36);
this.layoutControlItem1.Text = "寮�濮嬫椂闂�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.btnQuery;
- this.layoutControlItem3.Location = new System.Drawing.Point(700, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(875, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(150, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(187, 36);
this.layoutControlItem3.Text = "纭畾鏌ヨ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
@@ -241,12 +248,14 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptBtnView});
- this.gcMain1.Size = new System.Drawing.Size(1397, 535);
+ this.gcMain1.Size = new System.Drawing.Size(1746, 653);
this.gcMain1.TabIndex = 0;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -261,7 +270,9 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7,
+ this.gridColumn9,
this.gridColumn8});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
//
@@ -269,81 +280,91 @@
//
this.gridColumn1.Caption = "鐗╂枡闀夸唬鐮�";
this.gridColumn1.FieldName = "itemNo";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "itemName";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn3.FieldName = "itemModel";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "鍗曚綅";
this.gridColumn4.FieldName = "dwName";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "璁″垝璁㈠崟閲�";
this.gridColumn5.FieldName = "jhddQty";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "寤鸿鍒拌揣鎴栧畬宸ユ棩鏈�";
this.gridColumn6.FieldName = "dhDate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "渚涘簲鍟�";
this.gridColumn7.FieldName = "gysName";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 6;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "瓒呴噰姣斾緥";
+ this.gridColumn9.FieldName = "lossPercent";
+ this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 7;
+ this.gridColumn9.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "鏌ョ湅璇︾粏";
this.gridColumn8.ColumnEdit = this.rptBtnView;
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 7;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.VisibleIndex = 8;
+ this.gridColumn8.Width = 117;
//
// rptBtnView
//
@@ -358,10 +379,11 @@
//
// WomShjh
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1397, 590);
+ this.ClientSize = new System.Drawing.Size(1746, 721);
this.Controls.Add(this.splitContainerControl1);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "WomShjh";
this.Text = "閫佽揣璁″垝";
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
@@ -413,5 +435,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index 9363aa2..bc23e11 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -92,7 +92,7 @@
gcMain1.DataSource = null;
var _obj = new
{
- orgId = "",//涓诲缓
+ orgId = ucLookOrg1.GetId(),//涓诲缓
beginDate = DateTime.Now.AddMonths(-1).ToString(),
endDate = DateTime.Now.ToString()
};
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 090cd6e..ffd9501 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -434,6 +434,12 @@
<Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs">
<DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.Designer.cs">
+ <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs">
<SubType>Form</SubType>
</Compile>
@@ -1639,6 +1645,9 @@
<EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
<DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.resx">
+ <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx">
<DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3