From 96c0dc8269412ffffce50634c723411043bc7be8 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 17 十月 2025 10:14:09 +0800
Subject: [PATCH] 异常单修改
---
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx | 2
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 4
DevApp/GsDevSolution.sln | 6 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 132 ++++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 63 +++++----------
5 files changed, 98 insertions(+), 109 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index e168f02..8af2fa4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -99,6 +99,8 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -114,9 +116,6 @@
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -907,16 +906,31 @@
this.gridColumn14,
this.gridColumn15,
this.gridColumn16,
+ this.gridColumn23,
this.gridColumn20,
- this.gridColumn21,
- this.gridColumn22,
- this.gridColumn23});
+ this.gridColumn21});
this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "gridColumn21";
+ this.gridColumn21.FieldName = "lfRkqty";
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 12;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "gridColumn20";
+ this.gridColumn20.FieldName = "gfRkqty";
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 13;
//
// gvMx1guid
//
@@ -1092,36 +1106,6 @@
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 11;
this.gridColumn16.Width = 82;
- //
- // gridColumn20
- //
- this.gridColumn20.Caption = "鍚堟牸鍏ュ簱鏁�";
- this.gridColumn20.FieldName = "okRkqty";
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Tag = "";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 12;
- this.gridColumn20.Width = 66;
- //
- // gridColumn21
- //
- this.gridColumn21.Caption = "宸ュ簾鍏ュ簱鏁�";
- this.gridColumn21.FieldName = "gfRkqty";
- this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.Tag = "edit";
- this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 13;
- this.gridColumn21.Width = 66;
- //
- // gridColumn22
- //
- this.gridColumn22.Caption = "鏂欏簾鍏ュ簱鏁�";
- this.gridColumn22.FieldName = "lfRkqty";
- this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Tag = "edit";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
- this.gridColumn22.Width = 66;
//
// gridColumn23
//
@@ -1314,7 +1298,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
-
+
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
@@ -1395,9 +1379,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
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 gridColumn22;
private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
@@ -1406,5 +1387,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index 26ca0ad..3655e4b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -256,8 +256,8 @@
{
Guid = _guid,
BatchQty = (row["batchQty"].ToString()), // 鎵规鏁伴噺
- GfRkqty = (row["gfRkqty"].ToString()), // 鍚堟牸鍏ュ簱鏁伴噺
- LfRkqtyz = (row["lfRkqty"].ToString()), // 涓嶅悎鏍煎叆搴撴暟閲�
+ GfRkqty = (0), // 鍚堟牸鍏ュ簱鏁伴噺
+ LfRkqty = (0), // 涓嶅悎鏍煎叆搴撴暟閲�
HandResult = (row["handResult"].ToString()), // 閫夊埆绫诲瀷
ChooseType = (row["chooseType"].ToString()), // 澶勭悊鎰忚
Process = (row["process"].ToString()), // 閫�鏂欐柟寮�
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
index 593af94..9f852af 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
@@ -53,7 +53,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 16efdfe..ca246cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -152,9 +152,9 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_iqcsub = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gv_iqcsub = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -591,7 +591,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(11, 85);
+ this.btnSelect.Location = new System.Drawing.Point(12, 84);
this.btnSelect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(101, 20);
@@ -601,43 +601,43 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(420, 60);
+ this.txt_remark.Location = new System.Drawing.Point(423, 60);
this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(265, 20);
+ this.txt_remark.Size = new System.Drawing.Size(263, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_receiveOrgId
//
this.txt_receiveOrgId.IsReadly = false;
- this.txt_receiveOrgId.Location = new System.Drawing.Point(81, 35);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(84, 36);
this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(265, 20);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(263, 20);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(420, 35);
+ this.txtSupplierCode.Location = new System.Drawing.Point(423, 36);
this.txtSupplierCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(265, 20);
+ this.txtSupplierCode.Size = new System.Drawing.Size(263, 20);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(81, 10);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Properties.Tag = "";
- this.txt_billNo.Size = new System.Drawing.Size(265, 20);
+ this.txt_billNo.Size = new System.Drawing.Size(263, 20);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -645,26 +645,26 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(81, 60);
+ this.txt_suppId.Location = new System.Drawing.Point(84, 60);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(265, 20);
+ this.txt_suppId.Size = new System.Drawing.Size(263, 20);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1028, 60);
+ this.txt_fstatus.Location = new System.Drawing.Point(1029, 60);
this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fstatus.Size = new System.Drawing.Size(337, 20);
+ this.txt_fstatus.Size = new System.Drawing.Size(335, 20);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 458;
this.txt_fstatus.Tag = "readOnly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(350, 10);
+ this.txt_fType.Location = new System.Drawing.Point(351, 12);
this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
@@ -675,44 +675,44 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(759, 10);
+ this.txt_createBy.Location = new System.Drawing.Point(762, 12);
this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(265, 20);
+ this.txt_createBy.Size = new System.Drawing.Size(263, 20);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(759, 35);
+ this.txt_createDate.Location = new System.Drawing.Point(762, 36);
this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(265, 20);
+ this.txt_createDate.Size = new System.Drawing.Size(263, 20);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1098, 10);
+ this.txt_checkUser.Location = new System.Drawing.Point(1101, 12);
this.txt_checkUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(267, 20);
+ this.txt_checkUser.Size = new System.Drawing.Size(263, 20);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1098, 35);
+ this.txt_checkDate.Location = new System.Drawing.Point(1101, 36);
this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(267, 20);
+ this.txt_checkDate.Size = new System.Drawing.Size(263, 20);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
@@ -729,20 +729,20 @@
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(759, 60);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(762, 60);
this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(265, 20);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(263, 20);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 467;
//
// txt_isSrm
//
- this.txt_isSrm.Location = new System.Drawing.Point(1028, 85);
+ this.txt_isSrm.Location = new System.Drawing.Point(1029, 84);
this.txt_isSrm.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isSrm.Name = "txt_isSrm";
this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
- this.txt_isSrm.Size = new System.Drawing.Size(337, 20);
+ this.txt_isSrm.Size = new System.Drawing.Size(335, 20);
this.txt_isSrm.StyleController = this.layoutMx1;
this.txt_isSrm.TabIndex = 468;
this.txt_isSrm.Tag = "readOnly";
@@ -823,10 +823,10 @@
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_receiveOrgId;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 25);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem1.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
//
@@ -835,17 +835,17 @@
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem2.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_suppId;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 50);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem3.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
//
@@ -855,18 +855,18 @@
this.layoutControlItem11.Location = new System.Drawing.Point(678, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem11.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem11.Text = "寤虹珛浜哄憳";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(678, 25);
+ this.layoutControlItem12.Location = new System.Drawing.Point(678, 24);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem12.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14);
//
@@ -876,29 +876,29 @@
this.layoutControlItem13.Location = new System.Drawing.Point(1017, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(341, 25);
+ this.layoutControlItem13.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(1017, 25);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1017, 24);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(341, 25);
+ this.layoutControlItem14.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(1017, 50);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1017, 48);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(341, 25);
+ this.layoutControlItem7.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -909,7 +909,7 @@
this.layoutControlItem8.Location = new System.Drawing.Point(339, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem8.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -917,34 +917,34 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(339, 25);
+ this.layoutControlItem5.Location = new System.Drawing.Point(339, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem5.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(339, 50);
+ this.layoutControlItem17.Location = new System.Drawing.Point(339, 48);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem17.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 75);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(105, 24);
this.layoutControlItem16.MinSize = new System.Drawing.Size(17, 24);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem16.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -953,22 +953,22 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(678, 50);
+ this.layoutControlItem4.Location = new System.Drawing.Point(678, 48);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(339, 25);
+ this.layoutControlItem4.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_isSrm;
- this.layoutControlItem6.Location = new System.Drawing.Point(1017, 75);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1017, 72);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(341, 25);
+ this.layoutControlItem6.Size = new System.Drawing.Size(339, 24);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -1321,7 +1321,7 @@
this.gridColumn10.MinWidth = 22;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 20;
+ this.gridColumn10.VisibleIndex = 21;
this.gridColumn10.Width = 38;
//
// gridColumn12
@@ -1347,7 +1347,7 @@
this.gvBtnAlawys.MinWidth = 70;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 22;
+ this.gvBtnAlawys.VisibleIndex = 17;
this.gvBtnAlawys.Width = 70;
//
// repositoryItemButtonEdit2
@@ -1397,7 +1397,7 @@
this.gridColumn15.MinWidth = 22;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 17;
+ this.gridColumn15.VisibleIndex = 18;
this.gridColumn15.Width = 78;
//
// gridColumn16
@@ -1407,7 +1407,7 @@
this.gridColumn16.MinWidth = 22;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 18;
+ this.gridColumn16.VisibleIndex = 19;
this.gridColumn16.Width = 78;
//
// gridColumn2
@@ -1417,7 +1417,7 @@
this.gridColumn2.MinWidth = 22;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 19;
+ this.gridColumn2.VisibleIndex = 20;
this.gridColumn2.Width = 38;
//
// gridColumn17
@@ -1427,7 +1427,7 @@
this.gridColumn17.MinWidth = 22;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 21;
+ this.gridColumn17.VisibleIndex = 22;
this.gridColumn17.Width = 108;
//
// rptHistory
@@ -1469,6 +1469,15 @@
this.gridColumn20.VisibleIndex = 14;
this.gridColumn20.Width = 82;
//
+ // gv_iqcsub
+ //
+ this.gv_iqcsub.Caption = "妫�楠屾彁浜�";
+ this.gv_iqcsub.FieldName = "iqcsub";
+ this.gv_iqcsub.Name = "gv_iqcsub";
+ this.gv_iqcsub.Visible = true;
+ this.gv_iqcsub.VisibleIndex = 2;
+ this.gv_iqcsub.Width = 66;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1480,15 +1489,6 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gv_iqcsub
- //
- this.gv_iqcsub.Caption = "妫�楠屾彁浜�";
- this.gv_iqcsub.FieldName = "iqcsub";
- this.gv_iqcsub.Name = "gv_iqcsub";
- this.gv_iqcsub.Visible = true;
- this.gv_iqcsub.VisibleIndex = 2;
- this.gv_iqcsub.Width = 66;
//
// Frm_MesInvItemArn
//
diff --git a/DevApp/GsDevSolution.sln b/DevApp/GsDevSolution.sln
index d90da1b..a26f138 100644
--- a/DevApp/GsDevSolution.sln
+++ b/DevApp/GsDevSolution.sln
@@ -5,6 +5,8 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.DevApp", "Gs.DevApp\Gs.DevApp.csproj", "{A7EB5F78-699E-4514-8905-30842765E673}"
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Gs.Setup", "Gs.Setup\Gs.Setup.vdproj", "{F3C81646-6D3A-F3FA-71B8-C96D2224C585}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@
{A7EB5F78-699E-4514-8905-30842765E673}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Debug|Any CPU.ActiveCfg = Debug
+ {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Debug|Any CPU.Build.0 = Debug
+ {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Release|Any CPU.ActiveCfg = Release
+ {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Release|Any CPU.Build.0 = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
--
Gitblit v1.9.3