From 0a3fb97b07ef9989d85a2269dc19130b48c12796 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 14 八月 2025 22:27:40 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 3
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 11 -
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 293 +++++++++++++++++++++++------------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 91 +++++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 2
6 files changed, 218 insertions(+), 184 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 9b808d8..836835d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -70,10 +70,9 @@
this.txt_itemNo2 = new DevExpress.XtraEditors.TextEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kbSl = new DevExpress.XtraEditors.TextEdit();
this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
@@ -90,12 +89,10 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -134,6 +131,11 @@
this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_fgCheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_fgCheckDatet = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -159,10 +161,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
@@ -179,12 +180,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
@@ -198,6 +197,11 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -509,15 +513,16 @@
this.layoutMx1.Controls.Add(this.txt_itemNo2);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_fbatchQty);
+ this.layoutMx1.Controls.Add(this.txt_kbSl);
this.layoutMx1.Controls.Add(this.txt_fmrmode);
this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
this.layoutMx1.Controls.Add(this.txt_aboutGuid);
this.layoutMx1.Controls.Add(this.txt_lineName);
this.layoutMx1.Controls.Add(this.txt_daa001);
this.layoutMx1.Controls.Add(this.txt_msg);
this.layoutMx1.Controls.Add(this.txt_fngHandle);
+ this.layoutMx1.Controls.Add(this.txt_fgCheckBy);
+ this.layoutMx1.Controls.Add(this.txt_fgCheckDatet);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem3,
@@ -535,11 +540,11 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(683, 111);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(342, 109);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(332, 29);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(326, 29);
this.ucBtnPrint98.TabIndex = 9;
//
// lbGuid
@@ -552,10 +557,10 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_releaseNo.Location = new System.Drawing.Point(99, 10);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(239, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
//
@@ -569,67 +574,59 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(770, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(759, 10);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(239, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 231;
//
// txt_itemNo2
//
- this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
+ this.txt_itemNo2.Location = new System.Drawing.Point(429, 10);
this.txt_itemNo2.Name = "txt_itemNo2";
- this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemNo2.Size = new System.Drawing.Size(239, 24);
this.txt_itemNo2.StyleController = this.layoutMx1;
this.txt_itemNo2.TabIndex = 232;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(770, 45);
+ this.txt_createBy.Location = new System.Drawing.Point(759, 43);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(245, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(239, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 233;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1106, 45);
+ this.txt_createDate.Location = new System.Drawing.Point(1089, 43);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(245, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(241, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
- // txt_fbatchQty
+ // txt_kbSl
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(99, 45);
- this.txt_fbatchQty.Name = "txt_fbatchQty";
- this.txt_fbatchQty.Size = new System.Drawing.Size(244, 24);
- this.txt_fbatchQty.StyleController = this.layoutMx1;
- this.txt_fbatchQty.TabIndex = 236;
+ this.txt_kbSl.Location = new System.Drawing.Point(99, 43);
+ this.txt_kbSl.Name = "txt_kbSl";
+ this.txt_kbSl.Size = new System.Drawing.Size(239, 24);
+ this.txt_kbSl.StyleController = this.layoutMx1;
+ this.txt_kbSl.TabIndex = 236;
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(434, 111);
+ this.txt_fmrmode.Location = new System.Drawing.Point(99, 109);
this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Size = new System.Drawing.Size(245, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(239, 24);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 237;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
+ this.txt_itemModel.Location = new System.Drawing.Point(1089, 10);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(241, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 238;
- //
- // txt_erpCheckBy
- //
- this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 78);
- this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(244, 24);
- this.txt_erpCheckBy.StyleController = this.layoutMx1;
- this.txt_erpCheckBy.TabIndex = 241;
//
// txt_aboutGuid
//
@@ -641,33 +638,33 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(434, 45);
+ this.txt_lineName.Location = new System.Drawing.Point(429, 43);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(245, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(239, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 244;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(99, 111);
+ this.txt_daa001.Location = new System.Drawing.Point(99, 76);
this.txt_daa001.Name = "txt_daa001";
- this.txt_daa001.Size = new System.Drawing.Size(244, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(239, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 245;
//
// txt_msg
//
- this.txt_msg.Location = new System.Drawing.Point(770, 78);
+ this.txt_msg.Location = new System.Drawing.Point(759, 109);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(581, 24);
+ this.txt_msg.Size = new System.Drawing.Size(571, 24);
this.txt_msg.StyleController = this.layoutMx1;
this.txt_msg.TabIndex = 246;
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(434, 78);
+ this.txt_fngHandle.Location = new System.Drawing.Point(429, 76);
this.txt_fngHandle.Name = "txt_fngHandle";
- this.txt_fngHandle.Size = new System.Drawing.Size(245, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(239, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 247;
//
@@ -715,13 +712,14 @@
this.layoutControlItem9,
this.layoutControlItem7,
this.layoutControlItem11,
- this.layoutControlItem14,
- this.layoutControlItem15,
- this.layoutControlItem10,
this.layoutControlItem12,
this.layoutControlItem17,
+ this.layoutControlItem15,
+ this.layoutControlItem10,
+ this.layoutControlItem13,
this.layoutControlItem16,
- this.layoutControlItem13});
+ this.layoutControlItem8,
+ this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -750,7 +748,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1363, 152);
+ this.Root.Size = new System.Drawing.Size(1342, 152);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -758,145 +756,122 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(335, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo2;
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem2.Text = "浜у搧鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(671, 33);
+ this.layoutControlItem6.Location = new System.Drawing.Point(660, 33);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(336, 33);
- this.layoutControlItem6.Text = "寮�鍗曚汉";
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem6.Text = "寮�鍗曚汉鍛�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_fbatchQty;
+ this.layoutControlItem9.Control = this.txt_kbSl;
this.layoutControlItem9.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 33);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(1007, 33);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 33);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_erpCheckBy;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 66);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 33);
- this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_daa001;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 99);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(335, 33);
- this.layoutControlItem15.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fmrmode;
- this.layoutControlItem10.Location = new System.Drawing.Point(335, 99);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(336, 33);
- this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_lineName;
- this.layoutControlItem12.Location = new System.Drawing.Point(335, 33);
+ this.layoutControlItem12.Location = new System.Drawing.Point(330, 33);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem12.Text = "浜х嚎";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_fngHandle;
- this.layoutControlItem17.Location = new System.Drawing.Point(335, 66);
+ this.layoutControlItem17.Location = new System.Drawing.Point(330, 66);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem17.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem17.Text = "澶勭疆缁撴灉";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem16
+ // layoutControlItem15
//
- this.layoutControlItem16.Control = this.txt_msg;
- this.layoutControlItem16.Location = new System.Drawing.Point(671, 66);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(672, 33);
- this.layoutControlItem16.Text = "杩濊绫诲埆";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem15.Control = this.txt_daa001;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem15.Text = "宸ュ崟鍗曞彿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fmrmode;
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.ucBtnPrint98;
- this.layoutControlItem13.Location = new System.Drawing.Point(671, 99);
+ this.layoutControlItem13.Location = new System.Drawing.Point(330, 99);
this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem13.Text = "纭畾鎵撳嵃";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@@ -1314,6 +1289,56 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_msg;
+ this.layoutControlItem16.Location = new System.Drawing.Point(660, 99);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(662, 33);
+ this.layoutControlItem16.Text = "杩濊绫诲埆";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // txt_fgCheckBy
+ //
+ this.txt_fgCheckBy.Location = new System.Drawing.Point(759, 76);
+ this.txt_fgCheckBy.Name = "txt_fgCheckBy";
+ this.txt_fgCheckBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_fgCheckBy.StyleController = this.layoutMx1;
+ this.txt_fgCheckBy.TabIndex = 248;
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fgCheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 66);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // txt_fgCheckDatet
+ //
+ this.txt_fgCheckDatet.Location = new System.Drawing.Point(1089, 76);
+ this.txt_fgCheckDatet.Name = "txt_fgCheckDatet";
+ this.txt_fgCheckDatet.Size = new System.Drawing.Size(241, 24);
+ this.txt_fgCheckDatet.StyleController = this.layoutMx1;
+ this.txt_fgCheckDatet.TabIndex = 249;
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fgCheckDatet;
+ this.layoutControlItem14.Location = new System.Drawing.Point(990, 66);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
// Frm_WomFanGong
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1349,10 +1374,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
@@ -1369,12 +1393,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -1388,6 +1410,11 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -1438,14 +1465,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
+ private DevExpress.XtraEditors.TextEdit txt_kbSl;
private DevExpress.XtraEditors.TextEdit txt_fmrmode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private UserControl.UcBtnPrint ucBtnPrint98;
private DevExpress.XtraEditors.TextEdit txt_aboutGuid;
private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
@@ -1466,18 +1491,14 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraEditors.TextEdit txt_lineName;
private DevExpress.XtraEditors.TextEdit txt_daa001;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.TextEdit txt_msg;
private DevExpress.XtraEditors.TextEdit txt_fngHandle;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx7;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx7;
@@ -1488,5 +1509,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraEditors.TextEdit txt_fgCheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_fgCheckDatet;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 56d4c84..0a1750f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -335,6 +335,7 @@
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -2503,7 +2504,7 @@
// gridColumn62
//
this.gridColumn62.Caption = "鏁版嵁鐘舵��";
- this.gridColumn62.FieldName = "barCodeRemark";
+ this.gridColumn62.FieldName = "bRemark";
this.gridColumn62.MinWidth = 25;
this.gridColumn62.Name = "gridColumn62";
this.gridColumn62.OptionsColumn.ReadOnly = true;
@@ -2562,11 +2563,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(662, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(654, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(321, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(317, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2575,16 +2576,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2609,7 +2610,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2617,7 +2618,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2625,16 +2626,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(985, 10);
+ this.radOut.Location = new System.Drawing.Point(973, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2643,7 +2644,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(325, 32);
+ this.radOut.Size = new System.Drawing.Size(321, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2651,29 +2652,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2681,11 +2682,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(424, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(420, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(230, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2696,7 +2697,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(230, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2706,7 +2707,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(230, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2734,7 +2735,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 328D;
+ columnDefinition11.Width = 323D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2748,7 +2749,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2756,21 +2757,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2780,12 +2781,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2798,18 +2799,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2819,21 +2820,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2843,7 +2844,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -3278,7 +3279,8 @@
this.gridColumn42,
this.gridColumn43,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn55});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3764,6 +3766,16 @@
this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint101.TabIndex = 0;
//
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn55.FieldName = "bRemark";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 6;
+ this.gridColumn55.Width = 94;
+ //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -4205,5 +4217,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 1bc9673..aad5477 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -53,7 +53,7 @@
return;
txt_fCustId.getSuppler(orgId, _ucKh);
//2025-08-11鍔犱笂鍙兘鏄唬绠′粨
- txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁Dgc]=1 )");
+ txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠ｇ涓嶈壇鍝佷粨]=1 )");
};
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 8ffc01c..92fda54 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -59,7 +59,7 @@
return;
txt_fCustId.getSuppler(_orgId, _ucKh);
//2025-08-11鍔犱笂鍙兘鏄唬绠′粨
- txt_fStockId.getSuppler(_orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁Dgc]=1 )");
+ txt_fStockId.getSuppler(_orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠ｇ鑹搧浠揮=1 )");
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index 9b1d4ac..7e06c35 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -56,7 +56,6 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -309,7 +308,6 @@
this.gridColumn11,
this.gridColumn13,
this.gridColumn18,
- this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
this.gridColumn23,
@@ -405,14 +403,6 @@
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 8;
this.gridColumn18.Width = 94;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "棰勮浜ч噺";
- this.gridColumn19.FieldName = "daaCl";
- this.gridColumn19.MinWidth = 25;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Width = 94;
//
// gridColumn20
//
@@ -1674,7 +1664,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index f3ce19c..f302d4d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -51,6 +51,9 @@
{
getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag);
};
+
+ this.ActiveControl = this.txt_barCode111;
+ txt_barCode111.Focus();
}
/// <summary>
///
--
Gitblit v1.9.3