From faca8e5d589896b87535612b6d87565b73f74fe4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 11 六月 2025 16:21:16 +0800
Subject: [PATCH] 修改bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs | 6 +
DevApp/Gs.DevApp/Resources/usergroup_16x161.png | 0
DevApp/Gs.DevApp/Resources/usergroup_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs | 7 +
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 1
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 174 +++++++++++++++++++++++++++----------------
7 files changed, 121 insertions(+), 71 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
index 0fea338..1ffb78a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -355,6 +355,12 @@
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ _msl = row["remark"].ToString();
+ if (string.IsNullOrEmpty(_msl))
+ {
+ MsgHelper.ShowError("鐢宠澶囨敞涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
index 8148aeb..0f1c7d0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -28,7 +28,7 @@
//缂栬緫浜嬩欢
gvMx1.CellValueChanged += GvMx1_CellValueChanged;
//鍙栨秷涓嶇鍚堟潯浠剁殑缂栬緫
- // gvMx1.ShowingEditor += GvMx1_ShowingEditor;
+ gvMx1.ShowingEditor += GvMx1_ShowingEditor;
//绂佺敤鏍锋湰鏁颁箣澶栫殑鍗曞厓鏍间笖鏀瑰彉棰滆壊
gvMx1.CustomDrawCell += GvMx1_CustomDrawCell;
getModel();
@@ -71,7 +71,8 @@
bool _bl = ckCol(e.Column.FieldName, _maxYbs);
if (_bl)
{
- e.Appearance.BackColor = Color.Azure;
+ e.Appearance.BackColor = Color.LightBlue;
+ e.Appearance.ForeColor = Color.Blue;
e.Column.MinWidth = 50;
}
else
@@ -84,8 +85,8 @@
object value = gvMx1.GetRowCellValue(e.RowHandle, e.Column + "jg");
if (value != null && value.ToString() == strBhg)
{
- e.Appearance.ForeColor = Color.White;
e.Appearance.BackColor = Color.Red;
+ e.Appearance.ForeColor = Color.White;
};
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 36a3b6d..435ff98 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -246,7 +246,6 @@
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.panMx98 = new System.Windows.Forms.Panel();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
@@ -272,7 +271,6 @@
this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.panMx100 = new System.Windows.Forms.Panel();
this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
@@ -290,6 +288,8 @@
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -399,7 +399,6 @@
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
- this.panMx98.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
this.layoutMx98.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
@@ -417,7 +416,6 @@
this.xtraTabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
- this.panMx100.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layMx100)).BeginInit();
this.layMx100.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).BeginInit();
@@ -432,6 +430,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
this.xtraTabPage5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
+ this.splitMx98.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
+ this.splitMx98.Panel2.SuspendLayout();
+ this.splitMx98.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).BeginInit();
+ this.splitMx100.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).BeginInit();
+ this.splitMx100.Panel2.SuspendLayout();
+ this.splitMx100.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
@@ -2502,8 +2512,7 @@
//
// xtraTabPage3
//
- this.xtraTabPage3.Controls.Add(this.gcMx3);
- this.xtraTabPage3.Controls.Add(this.panMx98);
+ this.xtraTabPage3.Controls.Add(this.splitMx98);
this.xtraTabPage3.Name = "xtraTabPage3";
this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
@@ -2511,10 +2520,10 @@
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.Location = new System.Drawing.Point(0, 54);
+ this.gcMx3.Location = new System.Drawing.Point(0, 0);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(1648, 427);
+ this.gcMx3.Size = new System.Drawing.Size(1648, 417);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2633,15 +2642,6 @@
this.gridColumn35.VisibleIndex = 6;
this.gridColumn35.Width = 94;
//
- // panMx98
- //
- this.panMx98.Controls.Add(this.layoutMx98);
- this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
- this.panMx98.Location = new System.Drawing.Point(0, 0);
- this.panMx98.Name = "panMx98";
- this.panMx98.Size = new System.Drawing.Size(1648, 54);
- this.panMx98.TabIndex = 0;
- //
// layoutMx98
//
this.layoutMx98.Controls.Add(this.ucBtnPrint98);
@@ -2655,7 +2655,7 @@
this.layoutMx98.Name = "layoutMx98";
this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
- this.layoutMx98.Size = new System.Drawing.Size(1648, 54);
+ this.layoutMx98.Size = new System.Drawing.Size(1648, 52);
this.layoutMx98.TabIndex = 0;
this.layoutMx98.Text = "layoutControl1";
//
@@ -2666,7 +2666,7 @@
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(271, 34);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(271, 32);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
@@ -2748,7 +2748,7 @@
rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
- this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 54);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem34
@@ -2758,7 +2758,7 @@
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(273, 34);
+ this.layoutControlItem34.Size = new System.Drawing.Size(273, 32);
this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
@@ -2769,7 +2769,7 @@
this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem33.Size = new System.Drawing.Size(271, 34);
+ this.layoutControlItem33.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2779,7 +2779,7 @@
this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(271, 34);
+ this.layoutControlItem32.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2789,7 +2789,7 @@
this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(271, 34);
+ this.layoutControlItem31.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2799,7 +2799,7 @@
this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(271, 34);
+ this.layoutControlItem30.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2808,14 +2808,13 @@
this.layoutControlItem37.Control = this.txt_zQty98;
this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
- this.layoutControlItem37.Size = new System.Drawing.Size(271, 34);
+ this.layoutControlItem37.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
//
// xtraTabPage4
//
- this.xtraTabPage4.Controls.Add(this.gcMx4);
- this.xtraTabPage4.Controls.Add(this.panMx100);
+ this.xtraTabPage4.Controls.Add(this.splitMx100);
this.xtraTabPage4.Name = "xtraTabPage4";
this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
@@ -2823,10 +2822,10 @@
// gcMx4
//
this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx4.Location = new System.Drawing.Point(0, 56);
+ this.gcMx4.Location = new System.Drawing.Point(0, 0);
this.gcMx4.MainView = this.gvMx4;
this.gcMx4.Name = "gcMx4";
- this.gcMx4.Size = new System.Drawing.Size(1648, 425);
+ this.gcMx4.Size = new System.Drawing.Size(1648, 417);
this.gcMx4.TabIndex = 2;
this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx4});
@@ -2945,15 +2944,6 @@
this.gridColumn48.VisibleIndex = 6;
this.gridColumn48.Width = 94;
//
- // panMx100
- //
- this.panMx100.Controls.Add(this.layMx100);
- this.panMx100.Dock = System.Windows.Forms.DockStyle.Top;
- this.panMx100.Location = new System.Drawing.Point(0, 0);
- this.panMx100.Name = "panMx100";
- this.panMx100.Size = new System.Drawing.Size(1648, 56);
- this.panMx100.TabIndex = 0;
- //
// layMx100
//
this.layMx100.Controls.Add(this.ucBtnPrint100);
@@ -2967,24 +2957,24 @@
this.layMx100.Name = "layMx100";
this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(359, 336, 812, 500);
this.layMx100.Root = this.layoutControlGroup4;
- this.layMx100.Size = new System.Drawing.Size(1648, 56);
+ this.layMx100.Size = new System.Drawing.Size(1648, 52);
this.layMx100.TabIndex = 2;
this.layMx100.Text = "dataLayoutControl1";
//
// ucBtnPrint100
//
this.ucBtnPrint100.guidKey = null;
- this.ucBtnPrint100.Location = new System.Drawing.Point(1154, 12);
+ this.ucBtnPrint100.Location = new System.Drawing.Point(1136, 12);
this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint100.Name = "ucBtnPrint100";
this.ucBtnPrint100.rptParameter = null;
- this.ucBtnPrint100.Size = new System.Drawing.Size(282, 32);
+ this.ucBtnPrint100.Size = new System.Drawing.Size(279, 31);
this.ucBtnPrint100.TabIndex = 0;
//
// btnIn
//
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
- this.btnIn.Location = new System.Drawing.Point(1440, 12);
+ this.btnIn.Location = new System.Drawing.Point(1419, 12);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(196, 27);
this.btnIn.StyleController = this.layMx100;
@@ -2996,33 +2986,33 @@
this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
this.txt_zQty100.Name = "txt_zQty100";
this.txt_zQty100.Properties.ReadOnly = true;
- this.txt_zQty100.Size = new System.Drawing.Size(178, 24);
+ this.txt_zQty100.Size = new System.Drawing.Size(175, 24);
this.txt_zQty100.StyleController = this.layMx100;
this.txt_zQty100.TabIndex = 4;
//
// txt_yQty100
//
- this.txt_yQty100.Location = new System.Drawing.Point(398, 12);
+ this.txt_yQty100.Location = new System.Drawing.Point(395, 12);
this.txt_yQty100.Name = "txt_yQty100";
this.txt_yQty100.Properties.ReadOnly = true;
- this.txt_yQty100.Size = new System.Drawing.Size(180, 24);
+ this.txt_yQty100.Size = new System.Drawing.Size(175, 24);
this.txt_yQty100.StyleController = this.layMx100;
this.txt_yQty100.TabIndex = 5;
//
// txt_kQty100
//
- this.txt_kQty100.Location = new System.Drawing.Point(684, 12);
+ this.txt_kQty100.Location = new System.Drawing.Point(676, 12);
this.txt_kQty100.Name = "txt_kQty100";
this.txt_kQty100.Properties.ReadOnly = true;
- this.txt_kQty100.Size = new System.Drawing.Size(180, 24);
+ this.txt_kQty100.Size = new System.Drawing.Size(175, 24);
this.txt_kQty100.StyleController = this.layMx100;
this.txt_kQty100.TabIndex = 6;
//
// txt_iCount_100
//
- this.txt_iCount_100.Location = new System.Drawing.Point(970, 12);
+ this.txt_iCount_100.Location = new System.Drawing.Point(957, 12);
this.txt_iCount_100.Name = "txt_iCount_100";
- this.txt_iCount_100.Size = new System.Drawing.Size(180, 24);
+ this.txt_iCount_100.Size = new System.Drawing.Size(175, 24);
this.txt_iCount_100.StyleController = this.layMx100;
this.txt_iCount_100.TabIndex = 7;
//
@@ -3062,7 +3052,7 @@
rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition11});
- this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 56);
+ this.layoutControlGroup4.Size = new System.Drawing.Size(1627, 55);
this.layoutControlGroup4.TextVisible = false;
//
// layoutControlItem42
@@ -3070,17 +3060,17 @@
this.layoutControlItem42.Control = this.txt_zQty100;
this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem42.Name = "layoutControlItem42";
- this.layoutControlItem42.Size = new System.Drawing.Size(284, 36);
+ this.layoutControlItem42.Size = new System.Drawing.Size(281, 35);
this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem43
//
this.layoutControlItem43.Control = this.txt_yQty100;
- this.layoutControlItem43.Location = new System.Drawing.Point(284, 0);
+ this.layoutControlItem43.Location = new System.Drawing.Point(281, 0);
this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem43.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem43.Size = new System.Drawing.Size(281, 35);
this.layoutControlItem43.Text = "宸叉墦鍗版暟";
this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3088,20 +3078,20 @@
//
this.layoutControlItem44.Control = this.txt_kQty100;
this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
- this.layoutControlItem44.Location = new System.Drawing.Point(570, 0);
+ this.layoutControlItem44.Location = new System.Drawing.Point(562, 0);
this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem44.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem44.Size = new System.Drawing.Size(281, 35);
this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.btnIn;
- this.layoutControlItem2.Location = new System.Drawing.Point(1428, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(1407, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem2.Size = new System.Drawing.Size(200, 36);
+ this.layoutControlItem2.Size = new System.Drawing.Size(200, 35);
this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
@@ -3109,10 +3099,10 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.ucBtnPrint100;
- this.layoutControlItem10.Location = new System.Drawing.Point(1142, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1124, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem10.Size = new System.Drawing.Size(283, 35);
this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -3120,10 +3110,10 @@
// layoutControlItem45
//
this.layoutControlItem45.Control = this.txt_iCount_100;
- this.layoutControlItem45.Location = new System.Drawing.Point(856, 0);
+ this.layoutControlItem45.Location = new System.Drawing.Point(843, 0);
this.layoutControlItem45.Name = "layoutControlItem45";
this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem45.Size = new System.Drawing.Size(286, 36);
+ this.layoutControlItem45.Size = new System.Drawing.Size(281, 35);
this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3143,6 +3133,48 @@
this.ucBtnPrint101.rptParameter = null;
this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint101.TabIndex = 0;
+ //
+ // splitMx98
+ //
+ this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx98.Horizontal = false;
+ this.splitMx98.Location = new System.Drawing.Point(0, 0);
+ this.splitMx98.Name = "splitMx98";
+ //
+ // splitMx98.splitMx98_Panel1
+ //
+ this.splitMx98.Panel1.Controls.Add(this.layoutMx98);
+ this.splitMx98.Panel1.Text = "Panel1";
+ //
+ // splitMx98.splitMx98_Panel2
+ //
+ this.splitMx98.Panel2.Controls.Add(this.gcMx3);
+ this.splitMx98.Panel2.Text = "Panel2";
+ this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx98.Size = new System.Drawing.Size(1648, 481);
+ this.splitMx98.SplitterPosition = 52;
+ this.splitMx98.TabIndex = 2;
+ //
+ // splitMx100
+ //
+ this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx100.Horizontal = false;
+ this.splitMx100.Location = new System.Drawing.Point(0, 0);
+ this.splitMx100.Name = "splitMx100";
+ //
+ // splitMx100.splitMx100_Panel1
+ //
+ this.splitMx100.Panel1.Controls.Add(this.layMx100);
+ this.splitMx100.Panel1.Text = "Panel1";
+ //
+ // splitMx100.splitMx100_Panel2
+ //
+ this.splitMx100.Panel2.Controls.Add(this.gcMx4);
+ this.splitMx100.Panel2.Text = "Panel2";
+ this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx100.Size = new System.Drawing.Size(1648, 481);
+ this.splitMx100.SplitterPosition = 52;
+ this.splitMx100.TabIndex = 3;
//
// Frm_Womdaa
//
@@ -3262,7 +3294,6 @@
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
- this.panMx98.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
this.layoutMx98.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
@@ -3280,7 +3311,6 @@
this.xtraTabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
- this.panMx100.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layMx100)).EndInit();
this.layMx100.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).EndInit();
@@ -3295,6 +3325,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
this.xtraTabPage5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
+ this.splitMx98.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
+ this.splitMx98.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
+ this.splitMx98.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).EndInit();
+ this.splitMx100.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).EndInit();
+ this.splitMx100.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).EndInit();
+ this.splitMx100.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -3437,7 +3479,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
- private System.Windows.Forms.Panel panMx98;
private DevExpress.XtraLayout.LayoutControl layoutMx98;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private UserControl.UcBtnPrint ucBtnPrint98;
@@ -3455,7 +3496,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
- private System.Windows.Forms.Panel panMx100;
private DevExpress.XtraGrid.GridControl gcMx4;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
@@ -3520,5 +3560,7 @@
private UserControl.UcBtnPrint ucBtnPrint101;
private DevExpress.XtraEditors.CheckEdit txt_isQiTao;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx98;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx100;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index 1eeb1d6..e462429 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -410,7 +410,8 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24,
this.layoutControlItem2,
- this.layoutControlItem16});
+ this.layoutControlItem16,
+ this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500);
@@ -704,7 +705,6 @@
this.layoutControlItem23,
this.layoutControlItem22,
this.layoutControlItem8,
- this.layoutControlItem9,
this.layoutControlItem4,
this.layoutControlItem12,
this.layoutControlItem15,
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index d90434b..98e34cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -267,6 +267,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
txt_fBegDate.Focus(); return;
}
+ txt_fEndDate.DateTime= new DateTime(2099, 1, 1);
if (txt_fEndDate.Text.Length > 0 && txt_fBegDate.DateTime > txt_fEndDate.DateTime)
{
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
diff --git a/DevApp/Gs.DevApp/Resources/usergroup_16x16.png b/DevApp/Gs.DevApp/Resources/usergroup_16x16.png
new file mode 100644
index 0000000..a89d208
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/usergroup_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/usergroup_16x161.png b/DevApp/Gs.DevApp/Resources/usergroup_16x161.png
new file mode 100644
index 0000000..a89d208
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/usergroup_16x161.png
Binary files differ
--
Gitblit v1.9.3