From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 12 八月 2025 13:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 466 ++++++++++++++++++++++++----------------------------------
1 files changed, 194 insertions(+), 272 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index c15e364..ff9d6d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -30,19 +30,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -207,12 +207,8 @@
this.gvMx1terminaterId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1srcType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1srcBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1deliQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1stockOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1baseRetNoticeQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1baseReturnQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1baseRemainOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1basearqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1custIno = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1custInm = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1custImd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -229,7 +225,6 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -337,7 +332,6 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -481,8 +475,6 @@
this.gv_erpId.Name = "gv_erpId";
this.gv_erpId.OptionsColumn.AllowEdit = false;
this.gv_erpId.Tag = "query_a.erp_id";
- this.gv_erpId.Visible = true;
- this.gv_erpId.VisibleIndex = 0;
this.gv_erpId.Width = 94;
//
// gv_billNo
@@ -495,7 +487,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 1;
+ this.gv_billNo.VisibleIndex = 0;
this.gv_billNo.Width = 94;
//
// gv_billTypeId
@@ -921,7 +913,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 23;
+ this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -931,7 +923,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 24;
+ this.gridColumn2.VisibleIndex = 23;
this.gridColumn2.Width = 94;
//
// gridColumn3
@@ -941,7 +933,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 25;
+ this.gridColumn3.VisibleIndex = 24;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -951,7 +943,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 26;
+ this.gridColumn4.VisibleIndex = 25;
this.gridColumn4.Width = 94;
//
// gridColumn14
@@ -961,7 +953,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 27;
+ this.gridColumn14.VisibleIndex = 26;
this.gridColumn14.Width = 94;
//
// pageBar1
@@ -1074,19 +1066,19 @@
//
// txt_receiveContact
//
- this.txt_receiveContact.Location = new System.Drawing.Point(1244, 152);
+ this.txt_receiveContact.Location = new System.Drawing.Point(1260, 152);
this.txt_receiveContact.Name = "txt_receiveContact";
this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
- this.txt_receiveContact.Size = new System.Drawing.Size(291, 24);
+ this.txt_receiveContact.Size = new System.Drawing.Size(296, 24);
this.txt_receiveContact.StyleController = this.layoutMx1;
this.txt_receiveContact.TabIndex = 427;
//
// txt_receiveId
//
- this.txt_receiveId.Location = new System.Drawing.Point(1244, 68);
+ this.txt_receiveId.Location = new System.Drawing.Point(1260, 68);
this.txt_receiveId.Name = "txt_receiveId";
this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
- this.txt_receiveId.Size = new System.Drawing.Size(291, 24);
+ this.txt_receiveId.Size = new System.Drawing.Size(296, 24);
this.txt_receiveId.StyleController = this.layoutMx1;
this.txt_receiveId.TabIndex = 425;
//
@@ -1110,10 +1102,10 @@
//
// txt_changerId
//
- this.txt_changerId.Location = new System.Drawing.Point(1244, 180);
+ this.txt_changerId.Location = new System.Drawing.Point(1260, 180);
this.txt_changerId.Name = "txt_changerId";
this.txt_changerId.Properties.Appearance.Options.UseFont = true;
- this.txt_changerId.Size = new System.Drawing.Size(291, 24);
+ this.txt_changerId.Size = new System.Drawing.Size(296, 24);
this.txt_changerId.StyleController = this.layoutMx1;
this.txt_changerId.TabIndex = 378;
//
@@ -1122,142 +1114,142 @@
this.txt_versionNo.Location = new System.Drawing.Point(99, 180);
this.txt_versionNo.Name = "txt_versionNo";
this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
- this.txt_versionNo.Size = new System.Drawing.Size(290, 24);
+ this.txt_versionNo.Size = new System.Drawing.Size(296, 24);
this.txt_versionNo.StyleController = this.layoutMx1;
this.txt_versionNo.TabIndex = 376;
//
// txt_cancellerId
//
- this.txt_cancellerId.Location = new System.Drawing.Point(480, 180);
+ this.txt_cancellerId.Location = new System.Drawing.Point(486, 180);
this.txt_cancellerId.Name = "txt_cancellerId";
this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
- this.txt_cancellerId.Size = new System.Drawing.Size(291, 24);
+ this.txt_cancellerId.Size = new System.Drawing.Size(296, 24);
this.txt_cancellerId.StyleController = this.layoutMx1;
this.txt_cancellerId.TabIndex = 374;
//
// txt_cancelStatusTxt
//
- this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 208);
+ this.txt_cancelStatusTxt.Location = new System.Drawing.Point(486, 208);
this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt";
this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_cancelStatusTxt.Size = new System.Drawing.Size(291, 24);
+ this.txt_cancelStatusTxt.Size = new System.Drawing.Size(296, 24);
this.txt_cancelStatusTxt.StyleController = this.layoutMx1;
this.txt_cancelStatusTxt.TabIndex = 372;
//
// txt_changeDate
//
- this.txt_changeDate.Location = new System.Drawing.Point(1244, 208);
+ this.txt_changeDate.Location = new System.Drawing.Point(1260, 208);
this.txt_changeDate.Name = "txt_changeDate";
this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
- this.txt_changeDate.Size = new System.Drawing.Size(291, 24);
+ this.txt_changeDate.Size = new System.Drawing.Size(296, 24);
this.txt_changeDate.StyleController = this.layoutMx1;
this.txt_changeDate.TabIndex = 344;
//
// txt_closeDate
//
- this.txt_closeDate.Location = new System.Drawing.Point(862, 236);
+ this.txt_closeDate.Location = new System.Drawing.Point(873, 236);
this.txt_closeDate.Name = "txt_closeDate";
this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
- this.txt_closeDate.Size = new System.Drawing.Size(291, 24);
+ this.txt_closeDate.Size = new System.Drawing.Size(296, 24);
this.txt_closeDate.StyleController = this.layoutMx1;
this.txt_closeDate.TabIndex = 342;
//
// txt_closerId
//
- this.txt_closerId.Location = new System.Drawing.Point(862, 208);
+ this.txt_closerId.Location = new System.Drawing.Point(873, 208);
this.txt_closerId.Name = "txt_closerId";
this.txt_closerId.Properties.Appearance.Options.UseFont = true;
- this.txt_closerId.Size = new System.Drawing.Size(291, 24);
+ this.txt_closerId.Size = new System.Drawing.Size(296, 24);
this.txt_closerId.StyleController = this.layoutMx1;
this.txt_closerId.TabIndex = 340;
//
// txt_approveDate
//
- this.txt_approveDate.Location = new System.Drawing.Point(480, 96);
+ this.txt_approveDate.Location = new System.Drawing.Point(486, 96);
this.txt_approveDate.Name = "txt_approveDate";
this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approveDate.Size = new System.Drawing.Size(291, 24);
+ this.txt_approveDate.Size = new System.Drawing.Size(296, 24);
this.txt_approveDate.StyleController = this.layoutMx1;
this.txt_approveDate.TabIndex = 338;
//
// txt_modifyDate
//
- this.txt_modifyDate.Location = new System.Drawing.Point(862, 152);
+ this.txt_modifyDate.Location = new System.Drawing.Point(873, 152);
this.txt_modifyDate.Name = "txt_modifyDate";
this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifyDate.Size = new System.Drawing.Size(291, 24);
+ this.txt_modifyDate.Size = new System.Drawing.Size(296, 24);
this.txt_modifyDate.StyleController = this.layoutMx1;
this.txt_modifyDate.TabIndex = 314;
//
// txt_modifierId
//
- this.txt_modifierId.Location = new System.Drawing.Point(862, 124);
+ this.txt_modifierId.Location = new System.Drawing.Point(873, 124);
this.txt_modifierId.Name = "txt_modifierId";
this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
- this.txt_modifierId.Size = new System.Drawing.Size(291, 24);
+ this.txt_modifierId.Size = new System.Drawing.Size(296, 24);
this.txt_modifierId.StyleController = this.layoutMx1;
this.txt_modifierId.TabIndex = 312;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(480, 152);
+ this.txt_createDate.Location = new System.Drawing.Point(486, 152);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(291, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(296, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 310;
//
// txt_creatorId
//
- this.txt_creatorId.Location = new System.Drawing.Point(480, 124);
+ this.txt_creatorId.Location = new System.Drawing.Point(486, 124);
this.txt_creatorId.Name = "txt_creatorId";
this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_creatorId.Size = new System.Drawing.Size(291, 24);
+ this.txt_creatorId.Size = new System.Drawing.Size(296, 24);
this.txt_creatorId.StyleController = this.layoutMx1;
this.txt_creatorId.TabIndex = 308;
//
// txt_linkPhone
//
- this.txt_linkPhone.Location = new System.Drawing.Point(1244, 124);
+ this.txt_linkPhone.Location = new System.Drawing.Point(1260, 124);
this.txt_linkPhone.Name = "txt_linkPhone";
this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
- this.txt_linkPhone.Size = new System.Drawing.Size(291, 24);
+ this.txt_linkPhone.Size = new System.Drawing.Size(296, 24);
this.txt_linkPhone.StyleController = this.layoutMx1;
this.txt_linkPhone.TabIndex = 288;
//
// txt_chargeId
//
- this.txt_chargeId.Location = new System.Drawing.Point(862, 68);
+ this.txt_chargeId.Location = new System.Drawing.Point(873, 68);
this.txt_chargeId.Name = "txt_chargeId";
this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
- this.txt_chargeId.Size = new System.Drawing.Size(291, 24);
+ this.txt_chargeId.Size = new System.Drawing.Size(296, 24);
this.txt_chargeId.StyleController = this.layoutMx1;
this.txt_chargeId.TabIndex = 286;
//
// txt_linkMan
//
- this.txt_linkMan.Location = new System.Drawing.Point(1244, 96);
+ this.txt_linkMan.Location = new System.Drawing.Point(1260, 96);
this.txt_linkMan.Name = "txt_linkMan";
this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
- this.txt_linkMan.Size = new System.Drawing.Size(291, 24);
+ this.txt_linkMan.Size = new System.Drawing.Size(296, 24);
this.txt_linkMan.StyleController = this.layoutMx1;
this.txt_linkMan.TabIndex = 284;
//
// txt_approverId
//
- this.txt_approverId.Location = new System.Drawing.Point(480, 68);
+ this.txt_approverId.Location = new System.Drawing.Point(486, 68);
this.txt_approverId.Name = "txt_approverId";
this.txt_approverId.Properties.Appearance.Options.UseFont = true;
- this.txt_approverId.Size = new System.Drawing.Size(291, 24);
+ this.txt_approverId.Size = new System.Drawing.Size(296, 24);
this.txt_approverId.StyleController = this.layoutMx1;
this.txt_approverId.TabIndex = 282;
//
// txt_settleId
//
- this.txt_settleId.Location = new System.Drawing.Point(862, 96);
+ this.txt_settleId.Location = new System.Drawing.Point(873, 96);
this.txt_settleId.Name = "txt_settleId";
this.txt_settleId.Properties.Appearance.Options.UseFont = true;
- this.txt_settleId.Size = new System.Drawing.Size(291, 24);
+ this.txt_settleId.Size = new System.Drawing.Size(296, 24);
this.txt_settleId.StyleController = this.layoutMx1;
this.txt_settleId.TabIndex = 265;
//
@@ -1266,16 +1258,16 @@
this.txt_note.Location = new System.Drawing.Point(99, 208);
this.txt_note.Name = "txt_note";
this.txt_note.Properties.Appearance.Options.UseFont = true;
- this.txt_note.Size = new System.Drawing.Size(290, 24);
+ this.txt_note.Size = new System.Drawing.Size(296, 24);
this.txt_note.StyleController = this.layoutMx1;
this.txt_note.TabIndex = 263;
//
// txt_changeReason
//
- this.txt_changeReason.Location = new System.Drawing.Point(1244, 236);
+ this.txt_changeReason.Location = new System.Drawing.Point(1260, 236);
this.txt_changeReason.Name = "txt_changeReason";
this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
- this.txt_changeReason.Size = new System.Drawing.Size(291, 24);
+ this.txt_changeReason.Size = new System.Drawing.Size(296, 24);
this.txt_changeReason.StyleController = this.layoutMx1;
this.txt_changeReason.TabIndex = 261;
//
@@ -1299,10 +1291,10 @@
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(862, 180);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(873, 180);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
this.txt_closeStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(291, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(296, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 247;
//
@@ -1317,55 +1309,55 @@
//
// txt_headLocId
//
- this.txt_headLocId.Location = new System.Drawing.Point(1244, 40);
+ this.txt_headLocId.Location = new System.Drawing.Point(1260, 40);
this.txt_headLocId.Name = "txt_headLocId";
this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
- this.txt_headLocId.Size = new System.Drawing.Size(291, 24);
+ this.txt_headLocId.Size = new System.Drawing.Size(296, 24);
this.txt_headLocId.StyleController = this.layoutMx1;
this.txt_headLocId.TabIndex = 243;
//
// txt_headDeliveryWay
//
- this.txt_headDeliveryWay.Location = new System.Drawing.Point(1244, 12);
+ this.txt_headDeliveryWay.Location = new System.Drawing.Point(1260, 12);
this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
- this.txt_headDeliveryWay.Size = new System.Drawing.Size(291, 24);
+ this.txt_headDeliveryWay.Size = new System.Drawing.Size(296, 24);
this.txt_headDeliveryWay.StyleController = this.layoutMx1;
this.txt_headDeliveryWay.TabIndex = 235;
//
// txt_businessTypeTxt
//
- this.txt_businessTypeTxt.Location = new System.Drawing.Point(862, 40);
+ this.txt_businessTypeTxt.Location = new System.Drawing.Point(873, 40);
this.txt_businessTypeTxt.Name = "txt_businessTypeTxt";
this.txt_businessTypeTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_businessTypeTxt.Size = new System.Drawing.Size(291, 24);
+ this.txt_businessTypeTxt.Size = new System.Drawing.Size(296, 24);
this.txt_businessTypeTxt.StyleController = this.layoutMx1;
this.txt_businessTypeTxt.TabIndex = 233;
//
// txt_fDate
//
- this.txt_fDate.Location = new System.Drawing.Point(480, 40);
+ this.txt_fDate.Location = new System.Drawing.Point(486, 40);
this.txt_fDate.Name = "txt_fDate";
this.txt_fDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fDate.Size = new System.Drawing.Size(291, 24);
+ this.txt_fDate.Size = new System.Drawing.Size(296, 24);
this.txt_fDate.StyleController = this.layoutMx1;
this.txt_fDate.TabIndex = 231;
//
// txt_billTypeId
//
- this.txt_billTypeId.Location = new System.Drawing.Point(862, 12);
+ this.txt_billTypeId.Location = new System.Drawing.Point(873, 12);
this.txt_billTypeId.Name = "txt_billTypeId";
this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
- this.txt_billTypeId.Size = new System.Drawing.Size(291, 24);
+ this.txt_billTypeId.Size = new System.Drawing.Size(296, 24);
this.txt_billTypeId.StyleController = this.layoutMx1;
this.txt_billTypeId.TabIndex = 219;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(480, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(486, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(291, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(296, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 216;
//
@@ -1374,7 +1366,7 @@
this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 40);
this.txt_documentStatusTxt.Name = "txt_documentStatusTxt";
this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_documentStatusTxt.Size = new System.Drawing.Size(290, 24);
+ this.txt_documentStatusTxt.Size = new System.Drawing.Size(296, 24);
this.txt_documentStatusTxt.StyleController = this.layoutMx1;
this.txt_documentStatusTxt.TabIndex = 229;
//
@@ -1383,7 +1375,7 @@
this.txt_erpId.Location = new System.Drawing.Point(99, 12);
this.txt_erpId.Name = "txt_erpId";
this.txt_erpId.Properties.Appearance.Options.UseFont = true;
- this.txt_erpId.Size = new System.Drawing.Size(290, 24);
+ this.txt_erpId.Size = new System.Drawing.Size(296, 24);
this.txt_erpId.StyleController = this.layoutMx1;
this.txt_erpId.TabIndex = 214;
//
@@ -1401,7 +1393,7 @@
//
this.txt_xsOrgName.Location = new System.Drawing.Point(99, 96);
this.txt_xsOrgName.Name = "txt_xsOrgName";
- this.txt_xsOrgName.Size = new System.Drawing.Size(290, 24);
+ this.txt_xsOrgName.Size = new System.Drawing.Size(296, 24);
this.txt_xsOrgName.StyleController = this.layoutMx1;
this.txt_xsOrgName.TabIndex = 429;
//
@@ -1409,7 +1401,7 @@
//
this.txt_salerName.Location = new System.Drawing.Point(99, 152);
this.txt_salerName.Name = "txt_salerName";
- this.txt_salerName.Size = new System.Drawing.Size(290, 24);
+ this.txt_salerName.Size = new System.Drawing.Size(296, 24);
this.txt_salerName.StyleController = this.layoutMx1;
this.txt_salerName.TabIndex = 430;
//
@@ -1417,7 +1409,7 @@
//
this.txt_custName.Location = new System.Drawing.Point(99, 124);
this.txt_custName.Name = "txt_custName";
- this.txt_custName.Size = new System.Drawing.Size(290, 24);
+ this.txt_custName.Size = new System.Drawing.Size(296, 24);
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 431;
//
@@ -1425,7 +1417,7 @@
//
this.txt_saleDeptName.Location = new System.Drawing.Point(99, 68);
this.txt_saleDeptName.Name = "txt_saleDeptName";
- this.txt_saleDeptName.Size = new System.Drawing.Size(290, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(296, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 432;
//
@@ -1545,48 +1537,48 @@
this.layoutControlItem29});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1547, 272);
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18});
+ this.Root.Size = new System.Drawing.Size(1568, 272);
this.Root.TextVisible = false;
//
// layoutControlItem3
@@ -1595,40 +1587,40 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(381, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(387, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_businessTypeTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(763, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(774, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_linkPhone;
- this.layoutControlItem20.Location = new System.Drawing.Point(1145, 112);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1161, 112);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽";
this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1637,48 +1629,48 @@
this.layoutControlItem2.Control = this.txt_erpId;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem2.Text = "ERPID";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_billNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(381, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(387, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_billTypeId;
- this.layoutControlItem5.Location = new System.Drawing.Point(763, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(774, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_headDeliveryWay;
- this.layoutControlItem8.Location = new System.Drawing.Point(1145, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1161, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_receiveContact;
- this.layoutControlItem37.Location = new System.Drawing.Point(1145, 140);
+ this.layoutControlItem37.Location = new System.Drawing.Point(1161, 140);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem37.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�";
this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1688,7 +1680,7 @@
this.layoutControlItem41.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem41.Name = "layoutControlItem41";
this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem41.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem41.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1698,7 +1690,7 @@
this.lab_saleDeptName.Location = new System.Drawing.Point(0, 56);
this.lab_saleDeptName.Name = "lab_saleDeptName";
this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_saleDeptName.Size = new System.Drawing.Size(381, 28);
+ this.lab_saleDeptName.Size = new System.Drawing.Size(387, 28);
this.lab_saleDeptName.Text = "閿�鍞儴闂�";
this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1708,7 +1700,7 @@
this.layoutControlItem39.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem39.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem39.Text = "閿�鍞粍缁�";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1718,117 +1710,117 @@
this.layoutControlItem40.Location = new System.Drawing.Point(0, 140);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem40.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem40.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem40.Text = "閿�鍞憳鍚�";
this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_headLocId;
- this.layoutControlItem9.Location = new System.Drawing.Point(1145, 28);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1161, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.txt_receiveId;
- this.layoutControlItem36.Location = new System.Drawing.Point(1145, 56);
+ this.layoutControlItem36.Location = new System.Drawing.Point(1161, 56);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem36.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem36.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem36.Text = "鏀惰揣鏂�";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_linkMan;
- this.layoutControlItem18.Location = new System.Drawing.Point(1145, 84);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1161, 84);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_chargeId;
- this.layoutControlItem19.Location = new System.Drawing.Point(763, 56);
+ this.layoutControlItem19.Location = new System.Drawing.Point(774, 56);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem19.Text = "浠樻鏂�";
this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_settleId;
- this.layoutControlItem16.Location = new System.Drawing.Point(763, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(774, 84);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem16.Text = "缁撶畻鏂�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_modifierId;
- this.layoutControlItem23.Location = new System.Drawing.Point(763, 112);
+ this.layoutControlItem23.Location = new System.Drawing.Point(774, 112);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem23.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem23.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem23.Text = "淇敼浜哄憳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_modifyDate;
- this.layoutControlItem24.Location = new System.Drawing.Point(763, 140);
+ this.layoutControlItem24.Location = new System.Drawing.Point(774, 140);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem24.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem24.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem24.Text = "淇敼鏃ユ湡";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_closeDate;
- this.layoutControlItem27.Location = new System.Drawing.Point(763, 224);
+ this.layoutControlItem27.Location = new System.Drawing.Point(774, 224);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem27.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_closerId;
- this.layoutControlItem26.Location = new System.Drawing.Point(763, 196);
+ this.layoutControlItem26.Location = new System.Drawing.Point(774, 196);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem26.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_closeStatusTxt;
- this.layoutControlItem11.Location = new System.Drawing.Point(763, 168);
+ this.layoutControlItem11.Location = new System.Drawing.Point(774, 168);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem11.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1838,40 +1830,40 @@
this.layoutControlItem31.Location = new System.Drawing.Point(0, 168);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem31.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem31.Text = "鐗堟湰鍙�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_changerId;
- this.layoutControlItem32.Location = new System.Drawing.Point(1145, 168);
+ this.layoutControlItem32.Location = new System.Drawing.Point(1161, 168);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem32.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem32.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem32.Text = "鍙樻洿浜哄憳";
this.layoutControlItem32.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_changeDate;
- this.layoutControlItem28.Location = new System.Drawing.Point(1145, 196);
+ this.layoutControlItem28.Location = new System.Drawing.Point(1161, 196);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem28.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_changeReason;
- this.layoutControlItem14.Location = new System.Drawing.Point(1145, 224);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1161, 224);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem14.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1881,73 +1873,73 @@
this.layoutControlItem15.Location = new System.Drawing.Point(0, 196);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem15.Size = new System.Drawing.Size(381, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_approverId;
- this.layoutControlItem17.Location = new System.Drawing.Point(381, 56);
+ this.layoutControlItem17.Location = new System.Drawing.Point(387, 56);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_approveDate;
- this.layoutControlItem25.Location = new System.Drawing.Point(381, 84);
+ this.layoutControlItem25.Location = new System.Drawing.Point(387, 84);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_creatorId;
- this.layoutControlItem21.Location = new System.Drawing.Point(381, 112);
+ this.layoutControlItem21.Location = new System.Drawing.Point(387, 112);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem21.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_createDate;
- this.layoutControlItem22.Location = new System.Drawing.Point(381, 140);
+ this.layoutControlItem22.Location = new System.Drawing.Point(387, 140);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem22.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_cancellerId;
- this.layoutControlItem30.Location = new System.Drawing.Point(381, 168);
+ this.layoutControlItem30.Location = new System.Drawing.Point(387, 168);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem30.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem30.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem30.Text = "浣滃簾浜哄憳";
this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
- this.layoutControlItem29.Location = new System.Drawing.Point(381, 196);
+ this.layoutControlItem29.Location = new System.Drawing.Point(387, 196);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem29.Size = new System.Drawing.Size(382, 28);
+ this.layoutControlItem29.Size = new System.Drawing.Size(387, 28);
this.layoutControlItem29.Text = "浣滃簾鐘舵��";
this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2008,12 +2000,8 @@
this.gvMx1terminaterId,
this.gvMx1srcType,
this.gvMx1srcBillNo,
- this.gvMx1deliQty,
this.gvMx1stockOutQty,
- this.gvMx1baseRetNoticeQty,
this.gvMx1baseReturnQty,
- this.gvMx1baseRemainOutQty,
- this.gvMx1basearqty,
this.gvMx1custIno,
this.gvMx1custInm,
this.gvMx1custImd,
@@ -2143,7 +2131,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 7;
+ this.gvMx1deliveryDate.VisibleIndex = 9;
this.gvMx1deliveryDate.Width = 94;
//
// gvMx1isFree
@@ -2155,7 +2143,7 @@
this.gvMx1isFree.Name = "gvMx1isFree";
this.gvMx1isFree.Tag = "query_a.is_free";
this.gvMx1isFree.Visible = true;
- this.gvMx1isFree.VisibleIndex = 8;
+ this.gvMx1isFree.VisibleIndex = 10;
this.gvMx1isFree.Width = 94;
//
// gvMx1ownerTypeId
@@ -2167,7 +2155,7 @@
this.gvMx1ownerTypeId.Name = "gvMx1ownerTypeId";
this.gvMx1ownerTypeId.Tag = "query_a.owner_type_id";
this.gvMx1ownerTypeId.Visible = true;
- this.gvMx1ownerTypeId.VisibleIndex = 9;
+ this.gvMx1ownerTypeId.VisibleIndex = 25;
this.gvMx1ownerTypeId.Width = 94;
//
// gvMx1ownerId
@@ -2179,7 +2167,7 @@
this.gvMx1ownerId.Name = "gvMx1ownerId";
this.gvMx1ownerId.Tag = "query_a.owner_id";
this.gvMx1ownerId.Visible = true;
- this.gvMx1ownerId.VisibleIndex = 10;
+ this.gvMx1ownerId.VisibleIndex = 26;
this.gvMx1ownerId.Width = 94;
//
// gvMx1entryNote
@@ -2324,77 +2312,29 @@
this.gvMx1srcBillNo.VisibleIndex = 21;
this.gvMx1srcBillNo.Width = 94;
//
- // gvMx1deliQty
- //
- this.gvMx1deliQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1deliQty.Caption = "绱鍙戣揣閫氱煡鏁伴噺 ";
- this.gvMx1deliQty.FieldName = "deliQty";
- this.gvMx1deliQty.MinWidth = 50;
- this.gvMx1deliQty.Name = "gvMx1deliQty";
- this.gvMx1deliQty.Tag = "query_a.deli_qty";
- this.gvMx1deliQty.Visible = true;
- this.gvMx1deliQty.VisibleIndex = 22;
- this.gvMx1deliQty.Width = 94;
- //
// gvMx1stockOutQty
//
this.gvMx1stockOutQty.AppearanceCell.Options.UseFont = true;
this.gvMx1stockOutQty.Caption = "绱鍑哄簱鏁伴噺 ";
- this.gvMx1stockOutQty.FieldName = "stockOutQty";
+ this.gvMx1stockOutQty.FieldName = "ckQty";
this.gvMx1stockOutQty.MinWidth = 50;
this.gvMx1stockOutQty.Name = "gvMx1stockOutQty";
this.gvMx1stockOutQty.Tag = "query_a.stock_out_qty";
this.gvMx1stockOutQty.Visible = true;
- this.gvMx1stockOutQty.VisibleIndex = 23;
+ this.gvMx1stockOutQty.VisibleIndex = 7;
this.gvMx1stockOutQty.Width = 94;
- //
- // gvMx1baseRetNoticeQty
- //
- this.gvMx1baseRetNoticeQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1baseRetNoticeQty.Caption = "绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級 ";
- this.gvMx1baseRetNoticeQty.FieldName = "baseRetNoticeQty";
- this.gvMx1baseRetNoticeQty.MinWidth = 50;
- this.gvMx1baseRetNoticeQty.Name = "gvMx1baseRetNoticeQty";
- this.gvMx1baseRetNoticeQty.Tag = "query_a.base_ret_notice_qty";
- this.gvMx1baseRetNoticeQty.Visible = true;
- this.gvMx1baseRetNoticeQty.VisibleIndex = 24;
- this.gvMx1baseRetNoticeQty.Width = 94;
//
// gvMx1baseReturnQty
//
this.gvMx1baseReturnQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲忥紙閿�鍞熀鏈級 ";
- this.gvMx1baseReturnQty.FieldName = "baseReturnQty";
+ this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲�";
+ this.gvMx1baseReturnQty.FieldName = "thQty";
this.gvMx1baseReturnQty.MinWidth = 50;
this.gvMx1baseReturnQty.Name = "gvMx1baseReturnQty";
this.gvMx1baseReturnQty.Tag = "query_a.base_return_qty";
this.gvMx1baseReturnQty.Visible = true;
- this.gvMx1baseReturnQty.VisibleIndex = 25;
+ this.gvMx1baseReturnQty.VisibleIndex = 8;
this.gvMx1baseReturnQty.Width = 94;
- //
- // gvMx1baseRemainOutQty
- //
- this.gvMx1baseRemainOutQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1baseRemainOutQty.Caption = "鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級 ";
- this.gvMx1baseRemainOutQty.FieldName = "baseRemainOutQty";
- this.gvMx1baseRemainOutQty.MinWidth = 50;
- this.gvMx1baseRemainOutQty.Name = "gvMx1baseRemainOutQty";
- this.gvMx1baseRemainOutQty.Tag = "query_a.base_remain_out_qty";
- this.gvMx1baseRemainOutQty.Visible = true;
- this.gvMx1baseRemainOutQty.VisibleIndex = 26;
- this.gvMx1baseRemainOutQty.Width = 94;
- //
- // gvMx1basearqty
- //
- this.gvMx1basearqty.AppearanceCell.Options.UseFont = true;
- this.gvMx1basearqty.Caption = "绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級 ";
- this.gvMx1basearqty.FieldName = "basearqty";
- this.gvMx1basearqty.MinWidth = 50;
- this.gvMx1basearqty.Name = "gvMx1basearqty";
- this.gvMx1basearqty.Tag = "query_a.basearqty";
- this.gvMx1basearqty.Visible = true;
- this.gvMx1basearqty.VisibleIndex = 27;
- this.gvMx1basearqty.Width = 94;
//
// gvMx1custIno
//
@@ -2503,7 +2443,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 28;
+ this.gridColumn8.VisibleIndex = 22;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -2513,7 +2453,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 29;
+ this.gridColumn9.VisibleIndex = 23;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -2523,7 +2463,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 30;
+ this.gridColumn10.VisibleIndex = 24;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -2533,7 +2473,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 31;
+ this.gridColumn11.VisibleIndex = 27;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -2543,7 +2483,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 32;
+ this.gridColumn12.VisibleIndex = 28;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -2553,26 +2493,14 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 33;
+ this.gridColumn13.VisibleIndex = 29;
this.gridColumn13.Width = 94;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(970, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
//
// Frm_SalesOrder
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1570, 682);
- this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_SalesOrder";
@@ -2683,14 +2611,12 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -2721,12 +2647,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminaterId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcType;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOutQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRetNoticeQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseReturnQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRemainOutQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1basearqty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1custIno;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1custInm;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1custImd;
--
Gitblit v1.9.3