From 9122bca201d907726953e452b0cc9caa212a9b81 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 15 八月 2025 14:29:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index bda50d5..1d1c252 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -793,7 +793,7 @@
this.txt_billNo.Location = new System.Drawing.Point(109, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(234, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(229, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
@@ -807,41 +807,41 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(780, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(769, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(235, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(229, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 231;
//
// txt_documentTypeTxt
//
- this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
+ this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
- this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
this.txt_documentTypeTxt.StyleController = this.layoutMx1;
this.txt_documentTypeTxt.TabIndex = 232;
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
+ this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
this.txt_suppNo.Name = "txt_suppNo";
- this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
+ this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 233;
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 234;
//
// txt_cancellationStatusTxt
//
- this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
+ this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
- this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
this.txt_cancellationStatusTxt.TabIndex = 235;
//
@@ -849,39 +849,39 @@
//
this.txt_dptName.Location = new System.Drawing.Point(109, 40);
this.txt_dptName.Name = "txt_dptName";
- this.txt_dptName.Size = new System.Drawing.Size(234, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(229, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 236;
//
// txt_purchaseDate
//
- this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
+ this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
this.txt_purchaseDate.Name = "txt_purchaseDate";
- this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
this.txt_purchaseDate.StyleController = this.layoutMx1;
this.txt_purchaseDate.TabIndex = 237;
//
// txt_docStusTxt
//
- this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
+ this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
this.txt_docStusTxt.Name = "txt_docStusTxt";
- this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_docStusTxt.StyleController = this.layoutMx1;
this.txt_docStusTxt.TabIndex = 238;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(780, 68);
+ this.txt_createDate.Location = new System.Drawing.Point(769, 68);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(229, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 239;
//
// txt_erpCheckDate
//
- this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
+ this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
this.txt_erpCheckDate.Name = "txt_erpCheckDate";
- this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
this.txt_erpCheckDate.StyleController = this.layoutMx1;
this.txt_erpCheckDate.TabIndex = 240;
//
@@ -889,7 +889,7 @@
//
this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
@@ -956,7 +956,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1363, 104);
+ this.Root.Size = new System.Drawing.Size(1342, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -964,38 +964,38 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_documentTypeTxt;
- 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, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_suppName;
- 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, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_suppNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1005,72 +1005,72 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬";
this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_purchaseDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem10.Text = "閲囪喘鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
- this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem8.Text = "浣滃簾鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_closeStatusTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem7.Text = "鍏抽棴鐘舵��";
this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_docStusTxt;
- 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, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem11.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem12.Text = "鍚屾鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_erpCheckDate;
- this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1080,7 +1080,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem14.Text = "ERP瀹℃牳浜�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1518,7 +1518,7 @@
this.gridColumn20.AppearanceCell.Options.UseForeColor = true;
this.gridColumn20.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn20.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn20.Caption = "绱瀹炴敹閲�";
+ this.gridColumn20.Caption = "绱瀹炲叆搴�";
this.gridColumn20.FieldName = "qty9";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
--
Gitblit v1.9.3