From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 108 +++++++++++++++++++++++------------------------------
1 files changed, 47 insertions(+), 61 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 8fc63cf..ef2f532 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -115,9 +115,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -127,6 +125,7 @@
this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -470,7 +469,7 @@
this.gv_closeType.OptionsColumn.AllowEdit = false;
this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
this.gv_closeType.Visible = true;
- this.gv_closeType.VisibleIndex = 26;
+ this.gv_closeType.VisibleIndex = 28;
this.gv_closeType.Width = 94;
//
// gv_forceCloserid
@@ -484,7 +483,7 @@
this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
this.gv_forceCloserid.Visible = true;
- this.gv_forceCloserid.VisibleIndex = 25;
+ this.gv_forceCloserid.VisibleIndex = 27;
this.gv_forceCloserid.Width = 94;
//
// gv_saleOrderEntryseq
@@ -498,7 +497,7 @@
this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
this.gv_saleOrderEntryseq.Visible = true;
- this.gv_saleOrderEntryseq.VisibleIndex = 24;
+ this.gv_saleOrderEntryseq.VisibleIndex = 26;
this.gv_saleOrderEntryseq.Width = 94;
//
// lb_saleOrderNo
@@ -531,7 +530,7 @@
this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
this.gv_saleOrderNo.Visible = true;
- this.gv_saleOrderNo.VisibleIndex = 23;
+ this.gv_saleOrderNo.VisibleIndex = 25;
this.gv_saleOrderNo.Width = 100;
//
// gv_srcBillentryseq
@@ -545,7 +544,7 @@
this.gv_srcBillentryseq.OptionsColumn.AllowEdit = false;
this.gv_srcBillentryseq.Tag = "query_a.SRC_BILLENTRYSEQ";
this.gv_srcBillentryseq.Visible = true;
- this.gv_srcBillentryseq.VisibleIndex = 22;
+ this.gv_srcBillentryseq.VisibleIndex = 24;
this.gv_srcBillentryseq.Width = 94;
//
// gv_srcBillNo
@@ -559,7 +558,7 @@
this.gv_srcBillNo.OptionsColumn.AllowEdit = false;
this.gv_srcBillNo.Tag = "query_a.SRC_BILL_NO";
this.gv_srcBillNo.Visible = true;
- this.gv_srcBillNo.VisibleIndex = 21;
+ this.gv_srcBillNo.VisibleIndex = 23;
this.gv_srcBillNo.Width = 100;
//
// gv_srcBillType
@@ -573,7 +572,7 @@
this.gv_srcBillType.OptionsColumn.AllowEdit = false;
this.gv_srcBillType.Tag = "query_a.SRC_BILL_TYPE";
this.gv_srcBillType.Visible = true;
- this.gv_srcBillType.VisibleIndex = 20;
+ this.gv_srcBillType.VisibleIndex = 22;
this.gv_srcBillType.Width = 94;
//
// gv_createType
@@ -587,7 +586,7 @@
this.gv_createType.OptionsColumn.AllowEdit = false;
this.gv_createType.Tag = "query_a.CREATE_TYPE";
this.gv_createType.Visible = true;
- this.gv_createType.VisibleIndex = 19;
+ this.gv_createType.VisibleIndex = 21;
this.gv_createType.Width = 100;
//
// lb_stockInlimitl
@@ -620,7 +619,7 @@
this.gv_stockInlimitl.OptionsColumn.AllowEdit = false;
this.gv_stockInlimitl.Tag = "query_a.STOCK_INLIMITL";
this.gv_stockInlimitl.Visible = true;
- this.gv_stockInlimitl.VisibleIndex = 28;
+ this.gv_stockInlimitl.VisibleIndex = 30;
this.gv_stockInlimitl.Width = 100;
//
// lb_stockInlimith
@@ -653,7 +652,7 @@
this.gv_stockInlimith.OptionsColumn.AllowEdit = false;
this.gv_stockInlimith.Tag = "query_a.STOCK_INLIMITH";
this.gv_stockInlimith.Visible = true;
- this.gv_stockInlimith.VisibleIndex = 27;
+ this.gv_stockInlimith.VisibleIndex = 29;
this.gv_stockInlimith.Width = 100;
//
// lb_depotCode
@@ -700,7 +699,7 @@
this.gv_caa024.OptionsColumn.AllowEdit = false;
this.gv_caa024.Tag = "query_a.CAA024";
this.gv_caa024.Visible = true;
- this.gv_caa024.VisibleIndex = 14;
+ this.gv_caa024.VisibleIndex = 16;
this.gv_caa024.Width = 94;
//
// gv_checkUser
@@ -714,7 +713,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 15;
+ this.gv_checkUser.VisibleIndex = 17;
this.gv_checkUser.Width = 94;
//
// gv_fstatus
@@ -813,7 +812,7 @@
this.gv_caa018.OptionsColumn.AllowEdit = false;
this.gv_caa018.Tag = "query_a.CAA018";
this.gv_caa018.Visible = true;
- this.gv_caa018.VisibleIndex = 29;
+ this.gv_caa018.VisibleIndex = 31;
this.gv_caa018.Width = 94;
//
// lb_caa016
@@ -846,7 +845,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 18;
+ this.gv_caa016.VisibleIndex = 20;
this.gv_caa016.Width = 100;
//
// gv_caa015
@@ -860,7 +859,7 @@
this.gv_caa015.OptionsColumn.AllowEdit = false;
this.gv_caa015.Tag = "query_a.CAA015";
this.gv_caa015.Visible = true;
- this.gv_caa015.VisibleIndex = 17;
+ this.gv_caa015.VisibleIndex = 19;
this.gv_caa015.Width = 100;
//
// lb_caa012
@@ -886,7 +885,7 @@
//
this.gv_caa012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_caa012.AppearanceCell.Options.UseFont = true;
- this.gv_caa012.Caption = "宸ュ崟鏁伴噺";
+ this.gv_caa012.Caption = "宸ュ崟鎬绘暟";
this.gv_caa012.FieldName = "caa012";
this.gv_caa012.MinWidth = 50;
this.gv_caa012.Name = "gv_caa012";
@@ -926,7 +925,7 @@
this.gv_caa011.OptionsColumn.AllowEdit = false;
this.gv_caa011.Tag = "query_a.CAA011";
this.gv_caa011.Visible = true;
- this.gv_caa011.VisibleIndex = 13;
+ this.gv_caa011.VisibleIndex = 15;
this.gv_caa011.Width = 180;
//
// lb_caa010
@@ -959,7 +958,7 @@
this.gv_caa010.OptionsColumn.AllowEdit = false;
this.gv_caa010.Tag = "query_a.CAA010";
this.gv_caa010.Visible = true;
- this.gv_caa010.VisibleIndex = 12;
+ this.gv_caa010.VisibleIndex = 14;
this.gv_caa010.Width = 180;
//
// lb_caa009
@@ -992,7 +991,7 @@
this.gv_caa009.OptionsColumn.AllowEdit = false;
this.gv_caa009.Tag = "query_a.CAA009";
this.gv_caa009.Visible = true;
- this.gv_caa009.VisibleIndex = 11;
+ this.gv_caa009.VisibleIndex = 13;
this.gv_caa009.Width = 94;
//
// lb_caa006
@@ -1058,7 +1057,7 @@
this.gv_caa005.OptionsColumn.AllowEdit = false;
this.gv_caa005.Tag = "query_a.CAA005";
this.gv_caa005.Visible = true;
- this.gv_caa005.VisibleIndex = 16;
+ this.gv_caa005.VisibleIndex = 18;
this.gv_caa005.Width = 180;
//
// lb_caa001
@@ -1158,6 +1157,8 @@
this.gv_caa006,
this.gridColumn3,
this.gv_caa012,
+ this.gridColumn7,
+ this.gridColumn4,
this.gv_caa009,
this.gv_caa010,
this.gv_caa011,
@@ -1176,10 +1177,7 @@
this.gv_closeType,
this.gv_stockInlimith,
this.gv_stockInlimitl,
- this.gv_caa018,
- this.gridColumn6,
- this.gridColumn5,
- this.gridColumn4});
+ this.gv_caa018});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -1220,35 +1218,15 @@
this.gridColumn3.VisibleIndex = 9;
this.gridColumn3.Width = 120;
//
- // gridColumn6
+ // gridColumn7
//
- this.gridColumn6.Caption = "鎺掍骇ID";
- this.gridColumn6.MinWidth = 50;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.OptionsColumn.AllowEdit = false;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 30;
- this.gridColumn6.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鎺掍骇绾夸綋";
- this.gridColumn5.MinWidth = 100;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.OptionsColumn.AllowEdit = false;
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 31;
- this.gridColumn5.Width = 100;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鎺掍骇绾垮埆";
- this.gridColumn4.MinWidth = 80;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.AllowEdit = false;
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 32;
- this.gridColumn4.Width = 94;
+ this.gridColumn7.Caption = "宸叉帓鎬绘暟";
+ this.gridColumn7.FieldName = "caa012yp";
+ this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 11;
+ this.gridColumn7.Width = 94;
//
// xtraTabControl1
//
@@ -1268,7 +1246,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1278,7 +1256,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
@@ -1290,7 +1267,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
@@ -1369,6 +1346,16 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鏈帓鎬绘暟";
+ this.gridColumn4.FieldName = "caa012wp";
+ this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.Width = 94;
//
// Frm_Womcaa
//
@@ -1514,13 +1501,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private UserControl.UcLookWorkshop txt_caa021;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
}
}
\ No newline at end of file
--
Gitblit v1.9.3