From 4e5a7feccdb468ba7a8dbfbe2eed08c00797f435 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 19 九月 2025 13:06:47 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs | 101 ++----
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs | 4
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs | 36 -
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 50 ++-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 304 ++++++++++++---------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 130 ++++----
DevApp/Gs.DevApp/Gs.DevApp.csproj | 3
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 31 ++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 5
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.resx | 123 ++++++++
12 files changed, 481 insertions(+), 319 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 8cf35bf..432ab84 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 3a9be81..ba03d5f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -75,6 +75,8 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = 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.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -331,7 +333,9 @@
this.gridColumn13,
this.gridColumn14,
this.gridColumn15,
- this.gridColumn20});
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -483,7 +487,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 13;
+ this.gridColumn5.VisibleIndex = 14;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -493,7 +497,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 14;
+ this.gridColumn6.VisibleIndex = 15;
this.gridColumn6.Width = 94;
//
// gridColumn13
@@ -541,6 +545,25 @@
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 5;
this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鐢宠鍗旼uid";
+ this.gridColumn21.FieldName = "guid";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "璐т富";
+ this.gridColumn22.FieldName = "hzOrg";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 13;
+ this.gridColumn22.Width = 94;
//
// pageBar1
//
@@ -1818,5 +1841,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private UserControl.UcLookSupplier txt_wwgys;
private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 41a19c8..0309977 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -65,6 +65,7 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
@@ -595,6 +596,10 @@
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
_ucGys = dy.wwgys;//濮斿渚涘簲鍟�
+ // ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
index 4c27dba..fab4d5b 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
@@ -60,7 +60,6 @@
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -383,7 +382,6 @@
this.gv_boardStyle,
this.gridColumn14,
this.gv_fcovertQty,
- this.gv_fbatchQty,
this.gv_fcheckResu,
this.gv_remarks,
this.gv_fcheckBy,
@@ -519,19 +517,6 @@
this.gv_fcovertQty.VisibleIndex = 10;
this.gv_fcovertQty.Width = 60;
//
- // gv_fbatchQty
- //
- this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "鎶芥鏁伴噺";
- this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 30;
- this.gv_fbatchQty.Name = "gv_fbatchQty";
- this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
- this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
- this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 11;
- this.gv_fbatchQty.Width = 80;
- //
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
@@ -555,7 +540,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 12;
+ this.gv_remarks.VisibleIndex = 11;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -568,7 +553,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 13;
+ this.gv_fcheckBy.VisibleIndex = 12;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -581,7 +566,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 14;
+ this.gv_fcheckDate.VisibleIndex = 13;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -594,7 +579,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 15;
+ this.gv_createBy.VisibleIndex = 14;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -604,7 +589,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 16;
+ this.gridColumn15.VisibleIndex = 15;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -617,7 +602,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 17;
+ this.gv_lastupdateBy.VisibleIndex = 16;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -630,7 +615,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 18;
+ this.gv_lastupdateDate.VisibleIndex = 17;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -640,7 +625,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 19;
+ this.gridColumn18.VisibleIndex = 18;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -650,7 +635,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 20;
+ this.gridColumn19.VisibleIndex = 19;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -704,7 +689,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 21;
+ this.gridColumn7.VisibleIndex = 20;
this.gridColumn7.Width = 94;
//
// pageBar1
@@ -2081,7 +2066,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs
index b8b5407..896f091 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs
@@ -40,7 +40,6 @@
this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -48,11 +47,10 @@
this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
this.SuspendLayout();
@@ -81,7 +79,6 @@
this.gv_depotId,
this.gridColumn6,
this.gridColumn1,
- this.gv_depotSectionsCode,
this.gv_ownerType,
this.gv_ownerId,
this.gridColumn5,
@@ -89,9 +86,8 @@
this.gv_indepDate,
this.gridColumn7,
this.gridColumn8,
- this.gridColumn9,
- this.gridColumn10,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn9});
this.gridView1Report.GridControl = this.gcMain1Report;
this.gridView1Report.IndicatorWidth = 50;
this.gridView1Report.Name = "gridView1Report";
@@ -168,30 +164,30 @@
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gv_quantity.Tag = "query_a.QUANTITY";
this.gv_quantity.Visible = true;
- this.gv_quantity.VisibleIndex = 2;
+ this.gv_quantity.VisibleIndex = 3;
this.gv_quantity.Width = 74;
//
// gv_depotId
//
this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.Caption = "妫�楠岀姸鎬�";
+ this.gv_depotId.Caption = "鍏ュ簱鐘舵��";
this.gv_depotId.FieldName = "txtColor";
this.gv_depotId.MinWidth = 50;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 4;
+ this.gv_depotId.VisibleIndex = 5;
this.gv_depotId.Width = 73;
//
// gridColumn6
//
this.gridColumn6.Caption = "妫�楠岀粨鏋�";
- this.gridColumn6.FieldName = "checkRes";
+ this.gridColumn6.FieldName = "jyjg";
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.VisibleIndex = 11;
this.gridColumn6.Width = 74;
//
// gridColumn1
@@ -201,21 +197,8 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 13;
+ this.gridColumn1.VisibleIndex = 14;
this.gridColumn1.Width = 74;
- //
- // gv_depotSectionsCode
- //
- this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
- this.gv_depotSectionsCode.Caption = "鎬ユ枡";
- this.gv_depotSectionsCode.FieldName = "urgentFlagTxt";
- this.gv_depotSectionsCode.MinWidth = 50;
- this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
- this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
- this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
- this.gv_depotSectionsCode.Visible = true;
- this.gv_depotSectionsCode.VisibleIndex = 10;
- this.gv_depotSectionsCode.Width = 74;
//
// gv_ownerType
//
@@ -227,20 +210,20 @@
this.gv_ownerType.OptionsColumn.AllowEdit = false;
this.gv_ownerType.Tag = "query_a.Owner_Type";
this.gv_ownerType.Visible = true;
- this.gv_ownerType.VisibleIndex = 17;
+ this.gv_ownerType.VisibleIndex = 15;
this.gv_ownerType.Width = 74;
//
// gv_ownerId
//
this.gv_ownerId.AppearanceCell.Options.UseFont = true;
this.gv_ownerId.Caption = "閲囪喘鍗曞彿";
- this.gv_ownerId.FieldName = "ebeln";
+ this.gv_ownerId.FieldName = "cgdhNo";
this.gv_ownerId.MinWidth = 50;
this.gv_ownerId.Name = "gv_ownerId";
this.gv_ownerId.OptionsColumn.AllowEdit = false;
this.gv_ownerId.Tag = "query_a.Owner_Id";
this.gv_ownerId.Visible = true;
- this.gv_ownerId.VisibleIndex = 0;
+ this.gv_ownerId.VisibleIndex = 1;
this.gv_ownerId.Width = 74;
//
// gridColumn5
@@ -250,7 +233,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
+ this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 74;
//
// gv_indepUserCode
@@ -263,7 +246,7 @@
this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
this.gv_indepUserCode.Visible = true;
- this.gv_indepUserCode.VisibleIndex = 11;
+ this.gv_indepUserCode.VisibleIndex = 12;
this.gv_indepUserCode.Width = 74;
//
// gv_indepDate
@@ -276,7 +259,7 @@
this.gv_indepDate.OptionsColumn.AllowEdit = false;
this.gv_indepDate.Tag = "query_a.INDEP_DATE";
this.gv_indepDate.Visible = true;
- this.gv_indepDate.VisibleIndex = 12;
+ this.gv_indepDate.VisibleIndex = 13;
this.gv_indepDate.Width = 80;
//
// gridColumn7
@@ -290,38 +273,38 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.VisibleIndex = 4;
this.gridColumn7.Width = 77;
//
// gridColumn8
//
- this.gridColumn8.Caption = "OA澶勭悊鎰忚";
- this.gridColumn8.FieldName = "clyj";
+ this.gridColumn8.Caption = "鎬ユ枡鏍囪瘑";
+ this.gridColumn8.FieldName = "urgentFlagTxt";
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 14;
+ this.gridColumn8.VisibleIndex = 0;
this.gridColumn8.Width = 77;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "渚涘簲鍟�";
+ this.gridColumn11.FieldName = "gysName";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 8;
+ this.gridColumn11.Width = 94;
//
// gridColumn9
//
- this.gridColumn9.Caption = "OA鎸戦�夋暟閲�";
- this.gridColumn9.FieldName = "txsl";
+ this.gridColumn9.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn9.FieldName = "jyzt";
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 15;
- this.gridColumn9.Width = 77;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "OA閫夊埆绫诲埆";
- this.gridColumn10.FieldName = "xblb";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 16;
- this.gridColumn10.Width = 88;
+ this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.Width = 94;
//
// pageBar1
//
@@ -335,23 +318,13 @@
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
- // gridColumn11
- //
- this.gridColumn11.Caption = "渚涘簲鍟�";
- this.gridColumn11.FieldName = "gysName";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 8;
- this.gridColumn11.Width = 94;
- //
- // UcRptCgdhd
+ // UcRptCgdhdPrint
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.gcMain1Report);
this.Controls.Add(this.pageBar1);
- this.Name = "UcRptCgdhd";
+ this.Name = "UcRptCgdhdPrint";
this.Size = new System.Drawing.Size(1339, 682);
((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
@@ -370,7 +343,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -379,9 +351,8 @@
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs
index cf1b213..6ee655d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs
@@ -23,7 +23,7 @@
{
public partial class UcRptCgdhdPrint : DevExpress.XtraEditors.XtraUserControl
{
- string _webServiceName = "MesInvItemArnManager/";
+ string _webServiceName = "VArrivalBarcodeManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public UcRptCgdhdPrint()
{
@@ -153,8 +153,6 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ 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
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 8ee2e51..8f65f74 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -443,7 +443,7 @@
// gridColumn19
//
this.gridColumn19.Caption = "瀹岀粨鏍囪瘑";
- this.gridColumn19.FieldName = "wjStatus";
+ this.gridColumn19.FieldName = "txtColor";
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
@@ -768,25 +768,25 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(433, 44);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(438, 44);
this.txt_returnCustomer.Name = "txt_returnCustomer";
- this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
+ this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24);
this.txt_returnCustomer.TabIndex = 539;
//
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1131, 108);
+ this.txt_salesDept.Location = new System.Drawing.Point(1146, 108);
this.txt_salesDept.Name = "txt_salesDept";
- this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
+ this.txt_salesDept.Size = new System.Drawing.Size(279, 24);
this.txt_salesDept.TabIndex = 538;
//
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 108);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(792, 108);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
- this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24);
this.txt_inventoryOrg.TabIndex = 537;
//
// txt_salesOrg
@@ -794,20 +794,20 @@
this.txt_salesOrg.IsReadly = false;
this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
this.txt_salesOrg.Name = "txt_salesOrg";
- this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
+ this.txt_salesOrg.Size = new System.Drawing.Size(278, 24);
this.txt_salesOrg.TabIndex = 535;
//
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 106);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(438, 106);
this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(273, 32);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(278, 32);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 534;
//
@@ -817,7 +817,7 @@
this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
this.txt_fstockid.Name = "txt_fstockid";
- this.txt_fstockid.Size = new System.Drawing.Size(273, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(278, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -840,10 +840,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1059, 76);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1074, 76);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_chkStatus.Size = new System.Drawing.Size(345, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(351, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -851,23 +851,23 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(433, 12);
+ this.txt_billType.Location = new System.Drawing.Point(438, 12);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_billType.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(273, 24);
+ this.txt_billType.Size = new System.Drawing.Size(278, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1131, 44);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1146, 44);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedDate.Size = new System.Drawing.Size(273, 24);
+ this.txt_approvedDate.Size = new System.Drawing.Size(279, 24);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -884,20 +884,20 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1131, 12);
+ this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12);
this.txt_approvedBy.Name = "txt_approvedBy";
this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(273, 24);
+ this.txt_approvedBy.Size = new System.Drawing.Size(279, 24);
this.txt_approvedBy.StyleController = this.layoutMx1;
this.txt_approvedBy.TabIndex = 370;
this.txt_approvedBy.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(782, 44);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(792, 44);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedDate.Size = new System.Drawing.Size(273, 24);
+ this.txt_modifiedDate.Size = new System.Drawing.Size(278, 24);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
@@ -907,7 +907,7 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(273, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(278, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
@@ -924,20 +924,20 @@
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(782, 12);
+ this.txt_modifiedBy.Location = new System.Drawing.Point(792, 12);
this.txt_modifiedBy.Name = "txt_modifiedBy";
this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(273, 24);
+ this.txt_modifiedBy.Size = new System.Drawing.Size(278, 24);
this.txt_modifiedBy.StyleController = this.layoutMx1;
this.txt_modifiedBy.TabIndex = 327;
this.txt_modifiedBy.Tag = "readonly";
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(782, 76);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
- this.txt_saleDeptName.Size = new System.Drawing.Size(273, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(278, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
@@ -954,10 +954,10 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(433, 76);
+ this.txt_returnReason.Location = new System.Drawing.Point(438, 76);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(273, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(278, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
@@ -974,7 +974,7 @@
// txt_fHasLinkSource
//
this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 140);
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(438, 140);
this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
this.txt_fHasLinkSource.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -982,14 +982,14 @@
"閿�鍞嚭搴撳崟(SAL_OUTSTOCK)",
"閿�鍞鍗�(SAL_SaleOrder)"});
this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fHasLinkSource.Size = new System.Drawing.Size(273, 24);
+ this.txt_fHasLinkSource.Size = new System.Drawing.Size(278, 24);
this.txt_fHasLinkSource.StyleController = this.layoutMx1;
this.txt_fHasLinkSource.TabIndex = 544;
//
// txt_xsms
//
this.txt_xsms.EditValue = "-璇烽�夋嫨-";
- this.txt_xsms.Location = new System.Drawing.Point(782, 140);
+ this.txt_xsms.Location = new System.Drawing.Point(792, 140);
this.txt_xsms.Name = "txt_xsms";
this.txt_xsms.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1000,7 +1000,7 @@
"3:OBM",
"4:渚涘簲鍟嗕拱鏂�"});
this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_xsms.Size = new System.Drawing.Size(273, 24);
+ this.txt_xsms.Size = new System.Drawing.Size(278, 24);
this.txt_xsms.StyleController = this.layoutMx1;
this.txt_xsms.TabIndex = 545;
//
@@ -1124,7 +1124,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1416, 180);
+ this.Root.Size = new System.Drawing.Size(1437, 180);
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1132,39 +1132,39 @@
this.layoutControlItem4.Control = this.txt_billNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(1047, 0);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(1047, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(1047, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1175,7 +1175,7 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1185,7 +1185,7 @@
this.layItem1.Location = new System.Drawing.Point(0, 32);
this.layItem1.Name = "layItem1";
this.layItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem1.Size = new System.Drawing.Size(349, 32);
+ this.layItem1.Size = new System.Drawing.Size(354, 32);
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1194,44 +1194,44 @@
this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;
this.layoutControlItem21.Control = this.txt_fHasLinkRad;
- this.layoutControlItem21.Location = new System.Drawing.Point(349, 96);
+ this.layoutControlItem21.Location = new System.Drawing.Point(354, 96);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
- this.layoutControlItem21.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(698, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(708, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(349, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layItem2
//
this.layItem2.Control = this.txt_returnCustomer;
- this.layItem2.Location = new System.Drawing.Point(349, 32);
+ this.layItem2.Location = new System.Drawing.Point(354, 32);
this.layItem2.Name = "layItem2";
this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem2.Size = new System.Drawing.Size(349, 32);
+ this.layItem2.Size = new System.Drawing.Size(354, 32);
this.layItem2.Text = "閫�璐у鎴�";
this.layItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1240,11 +1240,11 @@
this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem3.Control = this.txt_inventoryOrg;
- this.layItem3.Location = new System.Drawing.Point(698, 96);
+ this.layItem3.Location = new System.Drawing.Point(708, 96);
this.layItem3.Name = "layItem3";
this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem3.Size = new System.Drawing.Size(349, 32);
+ this.layItem3.Size = new System.Drawing.Size(354, 32);
this.layItem3.Text = "搴撳瓨缁勭粐";
this.layItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1253,11 +1253,11 @@
this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem4.Control = this.txt_salesDept;
- this.layItem4.Location = new System.Drawing.Point(1047, 96);
+ this.layItem4.Location = new System.Drawing.Point(1062, 96);
this.layItem4.Name = "layItem4";
this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem4.Size = new System.Drawing.Size(349, 32);
+ this.layItem4.Size = new System.Drawing.Size(355, 32);
this.layItem4.Text = "閿�鍞儴闂�";
this.layItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1267,32 +1267,32 @@
this.layItem100.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem100.Control = this.txt_fHasLinkSource;
this.layItem100.CustomizationFormText = "鏁版嵁鏉ユ簮";
- this.layItem100.Location = new System.Drawing.Point(349, 128);
+ this.layItem100.Location = new System.Drawing.Point(354, 128);
this.layItem100.Name = "layItem100";
this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem100.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem100.Size = new System.Drawing.Size(349, 32);
+ this.layItem100.Size = new System.Drawing.Size(354, 32);
this.layItem100.Text = "鏁版嵁鏉ユ簮";
this.layItem100.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(708, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem13.Text = "淇敼浜哄憳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(708, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1300,11 +1300,11 @@
//
this.layoutControlItem9.Control = this.txt_returnReason;
this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(349, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(354, 64);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem9.Text = "鐢宠鍘熷洜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1316,7 +1316,7 @@
this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -1327,11 +1327,11 @@
this.layItem101.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem101.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem101.Control = this.txt_xsms;
- this.layItem101.Location = new System.Drawing.Point(698, 128);
+ this.layItem101.Location = new System.Drawing.Point(708, 128);
this.layItem101.Name = "layItem101";
this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem101.Size = new System.Drawing.Size(349, 32);
+ this.layItem101.Size = new System.Drawing.Size(354, 32);
this.layItem101.Text = "閿�鍞ā寮�";
this.layItem101.TextSize = new System.Drawing.Size(60, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 08d62ea..09518e5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,23 +30,23 @@
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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- 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.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -68,6 +68,7 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -164,6 +165,8 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
+ this.ucRptCgdhdPrint1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhdPrint();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -248,6 +251,7 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ this.xtraTabPageReport.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
@@ -276,7 +280,8 @@
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
- this.xtraTabPage2});
+ this.xtraTabPage2,
+ this.xtraTabPageReport});
//
// xtraTabPage1
//
@@ -341,7 +346,8 @@
this.gv_fstatus,
this.gridColumn11,
this.gv_checkDate,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn28});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -526,6 +532,16 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 94;
//
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "Srm鍒拌揣鍗曞彿";
+ this.gridColumn28.FieldName = "paperBillNo";
+ this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 13;
+ this.gridColumn28.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -603,25 +619,25 @@
this.txt_gysNo.Location = new System.Drawing.Point(114, 40);
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(219, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 467;
//
// txt_barcodeProgress
//
- this.txt_barcodeProgress.Location = new System.Drawing.Point(765, 68);
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 68);
this.txt_barcodeProgress.Name = "txt_barcodeProgress";
this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
- this.txt_barcodeProgress.Size = new System.Drawing.Size(220, 24);
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
this.txt_barcodeProgress.StyleController = this.layoutMx1;
this.txt_barcodeProgress.TabIndex = 342;
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 463;
//
@@ -630,25 +646,25 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(219, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(225, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(439, 40);
+ this.txt_gysName.Location = new System.Drawing.Point(445, 40);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(220, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(225, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 459;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(765, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(776, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(220, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(225, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 217;
//
@@ -657,34 +673,34 @@
this.txt_remark.Location = new System.Drawing.Point(114, 68);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(545, 24);
+ this.txt_remark.Size = new System.Drawing.Size(556, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(765, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(776, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(220, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(225, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 252;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(989, 12);
+ this.txt_fType.Location = new System.Drawing.Point(1005, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(322, 24);
+ this.txt_fType.Size = new System.Drawing.Size(327, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 469;
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 40);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
- this.txt_urgentFlag.Size = new System.Drawing.Size(322, 24);
+ this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
this.txt_urgentFlag.StyleController = this.layoutMx1;
this.txt_urgentFlag.TabIndex = 470;
//
@@ -717,30 +733,30 @@
this.layoutControlItem12});
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;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.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;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1323, 104);
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.Root.Size = new System.Drawing.Size(1344, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -748,27 +764,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(651, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -776,21 +792,21 @@
//
this.layoutControlItem8.Control = this.txt_createDate;
this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.Location = new System.Drawing.Point(651, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(662, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fType;
- this.layoutControlItem10.Location = new System.Drawing.Point(977, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -798,11 +814,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_urgentFlag;
- this.layoutControlItem11.Location = new System.Drawing.Point(977, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(993, 28);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -810,22 +826,22 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(651, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(662, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gysName;
- this.layoutControlItem2.Location = new System.Drawing.Point(325, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(331, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -835,7 +851,7 @@
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(325, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -846,7 +862,7 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(651, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(662, 28);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
@@ -918,10 +934,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 89);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 35);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -956,19 +972,19 @@
this.layoutControlItem27});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4});
+ rowDefinition11});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 35);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -976,7 +992,7 @@
this.layoutControlItem26.Control = this.txt_iCount_1;
this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(168, 35);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -986,7 +1002,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(168, 35);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1004,11 +1020,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(340, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(340, 39);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
@@ -1022,13 +1038,13 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(340, 32);
+ this.radOut.Size = new System.Drawing.Size(340, 38);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 50);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1050,7 +1066,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 50);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1060,7 +1076,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 89);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1092,7 +1108,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 50);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1129,30 +1145,30 @@
this.layoutControlItem25});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- 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;
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20});
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 136);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -1160,28 +1176,28 @@
this.layoutControlItem15.Control = this.txtWlid;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txtWlmc;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txtWlgg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 77);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(680, 39);
this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1191,18 +1207,18 @@
this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem19.Location = new System.Drawing.Point(340, 38);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1212,18 +1228,18 @@
this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(680, 38);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1234,7 +1250,7 @@
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1242,12 +1258,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem23.Location = new System.Drawing.Point(1020, 38);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1255,11 +1271,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem25.Location = new System.Drawing.Point(680, 77);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1688,6 +1704,22 @@
this.gridColumn24.VisibleIndex = 11;
this.gridColumn24.Width = 94;
//
+ // xtraTabPageReport
+ //
+ this.xtraTabPageReport.Controls.Add(this.ucRptCgdhdPrint1);
+ this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.xtraTabPageReport.Name = "xtraTabPageReport";
+ this.xtraTabPageReport.Size = new System.Drawing.Size(1344, 570);
+ this.xtraTabPageReport.Text = "鎶ヨ〃";
+ //
+ // ucRptCgdhdPrint1
+ //
+ this.ucRptCgdhdPrint1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucRptCgdhdPrint1.Location = new System.Drawing.Point(0, 0);
+ this.ucRptCgdhdPrint1.Name = "ucRptCgdhdPrint1";
+ this.ucRptCgdhdPrint1.Size = new System.Drawing.Size(1344, 570);
+ this.ucRptCgdhdPrint1.TabIndex = 0;
+ //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1781,6 +1813,7 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ this.xtraTabPageReport.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1902,5 +1935,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
+ private Rpt.UcRptCgdhdPrint ucRptCgdhdPrint1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index db352f3..455fbaa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -34,7 +34,11 @@
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ }, lbGuid, toolBarMenu1
+ , () =>
+ {
+ ucRptCgdhdPrint1.Initialize();
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//鎵撳嵃浜嬩欢
@@ -171,12 +175,17 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ return;
+ }
+ ucRptCgdhdPrint1.ToolBarMenu1_btnQueryClick(sender, e);
}
/// <summary>
/// 鏌ヨ鍥炶皟
@@ -196,20 +205,25 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
+
+
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
{
- //_filterList.Clear();
- //if (gridView1.ActiveFilter.Count > 0)
- //{
- // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- // gridView1.ActiveFilter.Clear();
- // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- //}
- //getPageList(1);
getPageList(this.pageBar1.CurrentPage);
+ return;
}
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ return;
+ }
+ if (xtraTabControl1.SelectedTabPageIndex == 2)
+ {
+ ucRptCgdhdPrint1.ToolBarMenu1_btnLoadClick(sender, e);
+ return;
+ }
+
+
}
/// <summary>
///
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 22bd9d8..8d57d2e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1912,6 +1912,9 @@
<EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
<DependentUpon>UcRptCgdhd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhdPrint.resx">
+ <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
<DependentUpon>WomShjh.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
index d8c7107..809fade 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
@@ -10,13 +10,16 @@
{
/// <summary>
- ///
+ /// 搴撳瓨缁勭粐锛堜富缁勭粐锛�
/// </summary>
public string OrgId
{
get;
set;
}
+ /// <summary>
+ /// 璐т富id
+ /// </summary>
public string HzId
{
get;
@@ -66,7 +69,7 @@
/// <summary>
- /// 璁剧疆
+ /// 璁剧疆璐т富id
/// </summary>
/// <param name="Code"></param>
public void SetHzId(string Code)
@@ -80,7 +83,7 @@
txt_hzabc.Text = Code;
}
/// <summary>
- /// 璁剧疆
+ /// 璁剧疆璐т富绫诲瀷
/// </summary>
/// <param name="Code"></param>
public void SetHzLx(string Code)
--
Gitblit v1.9.3