From 101f98e3ea731465690b5a4f395483d3552b5995 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 04 九月 2025 09:24:45 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 110 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 3539b41..8bddabd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -862,7 +862,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1464, 570);
- this.splitMx1.SplitterPosition = 216;
+ this.splitMx1.SplitterPosition = 221;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -916,7 +916,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(582, 419, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1464, 216);
+ this.layoutMx1.Size = new System.Drawing.Size(1464, 221);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -930,7 +930,7 @@
//
// txt_wtOrg
//
- this.txt_wtOrg.Location = new System.Drawing.Point(1188, 124);
+ this.txt_wtOrg.Location = new System.Drawing.Point(1188, 126);
this.txt_wtOrg.Name = "txt_wtOrg";
this.txt_wtOrg.Properties.Appearance.Options.UseFont = true;
this.txt_wtOrg.Size = new System.Drawing.Size(264, 24);
@@ -939,7 +939,7 @@
//
// txt_scOrg
//
- this.txt_scOrg.Location = new System.Drawing.Point(1188, 96);
+ this.txt_scOrg.Location = new System.Drawing.Point(1188, 97);
this.txt_scOrg.Name = "txt_scOrg";
this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
this.txt_scOrg.Size = new System.Drawing.Size(264, 24);
@@ -948,7 +948,7 @@
//
// txt_caa016
//
- this.txt_caa016.Location = new System.Drawing.Point(105, 152);
+ this.txt_caa016.Location = new System.Drawing.Point(105, 155);
this.txt_caa016.Name = "txt_caa016";
this.txt_caa016.Properties.Appearance.Options.UseFont = true;
this.txt_caa016.Size = new System.Drawing.Size(625, 24);
@@ -966,7 +966,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(105, 124);
+ this.txt_itemModel.Location = new System.Drawing.Point(105, 126);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
this.txt_itemModel.Size = new System.Drawing.Size(264, 24);
@@ -993,7 +993,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(105, 96);
+ this.txt_itemName.Location = new System.Drawing.Point(105, 97);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(264, 24);
@@ -1029,7 +1029,7 @@
//
// txt_caa024
//
- this.txt_caa024.Location = new System.Drawing.Point(827, 96);
+ this.txt_caa024.Location = new System.Drawing.Point(827, 97);
this.txt_caa024.Name = "txt_caa024";
this.txt_caa024.Properties.Appearance.Options.UseFont = true;
this.txt_caa024.Size = new System.Drawing.Size(264, 24);
@@ -1038,7 +1038,7 @@
//
// txt_gdzt
//
- this.txt_gdzt.Location = new System.Drawing.Point(466, 124);
+ this.txt_gdzt.Location = new System.Drawing.Point(466, 126);
this.txt_gdzt.Name = "txt_gdzt";
this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
this.txt_gdzt.Size = new System.Drawing.Size(264, 24);
@@ -1065,7 +1065,7 @@
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(105, 180);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(105, 184);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
this.txt_saleOrderNo.Size = new System.Drawing.Size(264, 24);
@@ -1074,7 +1074,7 @@
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(466, 96);
+ this.txt_dwName.Location = new System.Drawing.Point(466, 97);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Size = new System.Drawing.Size(264, 24);
@@ -1124,7 +1124,7 @@
//
// txt_saleOrderEntryseq
//
- this.txt_saleOrderEntryseq.Location = new System.Drawing.Point(466, 180);
+ this.txt_saleOrderEntryseq.Location = new System.Drawing.Point(466, 184);
this.txt_saleOrderEntryseq.Name = "txt_saleOrderEntryseq";
this.txt_saleOrderEntryseq.Size = new System.Drawing.Size(264, 24);
this.txt_saleOrderEntryseq.StyleController = this.layoutMx1;
@@ -1140,7 +1140,7 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(827, 152);
+ this.textEdit1.Location = new System.Drawing.Point(827, 155);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Size = new System.Drawing.Size(264, 24);
this.textEdit1.StyleController = this.layoutMx1;
@@ -1148,7 +1148,7 @@
//
// txt_stockInLimitL
//
- this.txt_stockInLimitL.Location = new System.Drawing.Point(827, 124);
+ this.txt_stockInLimitL.Location = new System.Drawing.Point(827, 126);
this.txt_stockInLimitL.Name = "txt_stockInLimitL";
this.txt_stockInLimitL.Size = new System.Drawing.Size(264, 24);
this.txt_stockInLimitL.StyleController = this.layoutMx1;
@@ -1156,7 +1156,7 @@
//
// txt_jaTime
//
- this.txt_jaTime.Location = new System.Drawing.Point(1188, 180);
+ this.txt_jaTime.Location = new System.Drawing.Point(1188, 184);
this.txt_jaTime.Name = "txt_jaTime";
this.txt_jaTime.Size = new System.Drawing.Size(264, 24);
this.txt_jaTime.StyleController = this.layoutMx1;
@@ -1164,7 +1164,7 @@
//
// txt_jaBs
//
- this.txt_jaBs.Location = new System.Drawing.Point(1095, 152);
+ this.txt_jaBs.Location = new System.Drawing.Point(1095, 155);
this.txt_jaBs.Name = "txt_jaBs";
this.txt_jaBs.Properties.Caption = "缁撴鏍囪瘑";
this.txt_jaBs.Size = new System.Drawing.Size(357, 24);
@@ -1205,7 +1205,7 @@
//
// txt_caa013
//
- this.txt_caa013.Location = new System.Drawing.Point(827, 180);
+ this.txt_caa013.Location = new System.Drawing.Point(827, 184);
this.txt_caa013.Name = "txt_caa013";
this.txt_caa013.Size = new System.Drawing.Size(264, 24);
this.txt_caa013.StyleController = this.layoutMx1;
@@ -1376,7 +1376,7 @@
rowDefinition5,
rowDefinition6,
rowDefinition7});
- this.Root.Size = new System.Drawing.Size(1464, 216);
+ this.Root.Size = new System.Drawing.Size(1464, 221);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1447,50 +1447,50 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem12.Text = "Erp璁″垝涓嬭揪";
this.layoutControlItem12.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_scOrg;
- this.layoutControlItem16.Location = new System.Drawing.Point(1083, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1083, 85);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem16.Text = "鐢熶骇缁勭粐";
this.layoutControlItem16.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_wtOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(1083, 112);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1083, 114);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem18.Text = "濮旀墭缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_itemModel;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 114);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem15.Text = "浜у搧瑙勬牸";
this.layoutControlItem15.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(361, 84);
+ this.layoutControlItem10.Location = new System.Drawing.Point(361, 85);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem10.Text = "鍗曚綅";
this.layoutControlItem10.TextSize = new System.Drawing.Size(81, 18);
//
@@ -1512,7 +1512,7 @@
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem22.Text = "鍙帓鏁伴噺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(81, 18);
//
@@ -1534,40 +1534,40 @@
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem11.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_caa024;
- this.layoutControlItem6.Location = new System.Drawing.Point(722, 84);
+ this.layoutControlItem6.Location = new System.Drawing.Point(722, 85);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem6.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem6.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_stockInLimitL;
- this.layoutControlItem26.Location = new System.Drawing.Point(722, 112);
+ this.layoutControlItem26.Location = new System.Drawing.Point(722, 114);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem26.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem26.Text = "鍏ュ簱涓嬮檺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(81, 18);
//
// txt_stockInLimitH
//
this.txt_stockInLimitH.Control = this.textEdit1;
- this.txt_stockInLimitH.Location = new System.Drawing.Point(722, 140);
+ this.txt_stockInLimitH.Location = new System.Drawing.Point(722, 143);
this.txt_stockInLimitH.Name = "txt_stockInLimitH";
this.txt_stockInLimitH.OptionsTableLayoutItem.ColumnIndex = 2;
this.txt_stockInLimitH.OptionsTableLayoutItem.RowIndex = 5;
- this.txt_stockInLimitH.Size = new System.Drawing.Size(361, 28);
+ this.txt_stockInLimitH.Size = new System.Drawing.Size(361, 29);
this.txt_stockInLimitH.Text = "鍏ュ簱涓婇檺";
this.txt_stockInLimitH.TextSize = new System.Drawing.Size(81, 18);
//
@@ -1577,17 +1577,17 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem13.Text = "浜у搧缂栫爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_itemName;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 85);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem14.Text = "浜у搧鍚嶇О";
this.layoutControlItem14.TextSize = new System.Drawing.Size(81, 18);
//
@@ -1595,22 +1595,22 @@
//
this.layoutControlItem7.Control = this.txt_gdzt;
this.layoutControlItem7.CustomizationFormText = "涓氬姟鐘舵��";
- this.layoutControlItem7.Location = new System.Drawing.Point(361, 112);
+ this.layoutControlItem7.Location = new System.Drawing.Point(361, 114);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem7.Text = "涓氬姟鐘舵��";
this.layoutControlItem7.TextSize = new System.Drawing.Size(81, 18);
//
// txt_jaBs1111
//
this.txt_jaBs1111.Control = this.txt_jaBs;
- this.txt_jaBs1111.Location = new System.Drawing.Point(1083, 140);
+ this.txt_jaBs1111.Location = new System.Drawing.Point(1083, 143);
this.txt_jaBs1111.Name = "txt_jaBs1111";
this.txt_jaBs1111.OptionsTableLayoutItem.ColumnIndex = 3;
this.txt_jaBs1111.OptionsTableLayoutItem.RowIndex = 5;
- this.txt_jaBs1111.Size = new System.Drawing.Size(361, 28);
+ this.txt_jaBs1111.Size = new System.Drawing.Size(361, 29);
this.txt_jaBs1111.Text = "缁撴缁撹瘑";
this.txt_jaBs1111.TextSize = new System.Drawing.Size(0, 0);
this.txt_jaBs1111.TextVisible = false;
@@ -1618,54 +1618,54 @@
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_caa013;
- this.layoutControlItem32.Location = new System.Drawing.Point(722, 168);
+ this.layoutControlItem32.Location = new System.Drawing.Point(722, 172);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem32.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem32.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem32.Text = "BOM鐗堟湰";
this.layoutControlItem32.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_jaTime;
- this.layoutControlItem25.Location = new System.Drawing.Point(1083, 168);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1083, 172);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem25.Text = "缁撴鏃堕棿";
this.layoutControlItem25.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_caa016;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(722, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(722, 29);
this.layoutControlItem17.Text = "澶囨敞";
this.layoutControlItem17.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_saleOrderNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 168);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 172);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem9.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem9.Text = "閿�鍞崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(81, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_saleOrderEntryseq;
- this.layoutControlItem23.Location = new System.Drawing.Point(361, 168);
+ this.layoutControlItem23.Location = new System.Drawing.Point(361, 172);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem23.Size = new System.Drawing.Size(361, 28);
+ this.layoutControlItem23.Size = new System.Drawing.Size(361, 29);
this.layoutControlItem23.Text = "闇�姹傚崟琛屽彿";
this.layoutControlItem23.TextSize = new System.Drawing.Size(81, 18);
//
@@ -1675,7 +1675,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1464, 342);
+ this.tabMx.Size = new System.Drawing.Size(1464, 337);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1684,7 +1684,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1462, 310);
+ this.tabMxPage1.Size = new System.Drawing.Size(1462, 305);
this.tabMxPage1.Text = "鏄庣粏";
//
// gcMx1
@@ -1693,7 +1693,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1462, 310);
+ this.gcMx1.Size = new System.Drawing.Size(1462, 305);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
--
Gitblit v1.9.3