From 6cae04cd8fff50564a89a8b2b271ef31c3fcf6fb Mon Sep 17 00:00:00 2001
From: huawei <huawei@2214094776>
Date: 星期三, 10 十二月 2025 17:35:08 +0800
Subject: [PATCH] 搬标准版代码（采购退货申请、退货单、销售退货申请、退货单）
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 42 +
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice1.Designer.cs | 73 ++
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 145 ++++-
DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx | 120 ++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs | 3
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 17
DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs | 59 ++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 5
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 896 ++++++++++++++++++++--------------
DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs | 139 +++++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 12
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs | 5
14 files changed, 1,114 insertions(+), 413 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index e1f8649..8d01757 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -30,6 +30,8 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
@@ -51,6 +53,8 @@
var orgId = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(orgId))
return;
+ txt_fRequireOrgId.SetIdOrCode(orgId);
+ txt_fOwnerIdHead.SetIdOrCode(orgId);
txt_suppId.getSuppler(orgId, _ucGys);
txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
};
@@ -156,6 +160,8 @@
setSrm();
};
}
+
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -174,6 +180,27 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_billNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
+ }
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ //guidKey, rptParameter
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1, "billNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_CGTH{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ this.toolBarMenu1.guidKey = rowGuid;
+
}
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -208,6 +235,11 @@
_filterList = e.FilterList;
getPageList(1);
}
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
+
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -634,6 +666,9 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
}
;
toolBarMenu1.guidKey = "";
@@ -737,6 +772,9 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+
var strOrgGuid = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(strOrgGuid))
{
@@ -744,13 +782,15 @@
return;
}
;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index f91d0d1..c61890d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -28,9 +28,9 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -80,6 +80,7 @@
_filterList = e.FilterList;
getPageList(1);
}
+
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -283,7 +284,8 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
@@ -305,7 +307,7 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 031ead2..80dcfb4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -86,6 +86,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_returnCustomer = new Gs.DevApp.UserControl.UcLookCustomer();
this.txt_salesDept = new Gs.DevApp.UserControl.UcLookDepartment();
@@ -99,16 +100,17 @@
this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
- this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_shUserName2 = new DevExpress.XtraEditors.TextEdit();
this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
- this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_xgUserName1 = new DevExpress.XtraEditors.TextEdit();
this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fHasLinkSource = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_xsms = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -131,6 +133,10 @@
this.layItem100 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layItem101 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -203,8 +209,6 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -230,16 +234,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -262,6 +267,10 @@
((System.ComponentModel.ISupportInitialize)(this.layItem100)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItem101)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -310,8 +319,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -323,9 +330,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1799, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -333,10 +341,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1439, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1799, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -345,8 +354,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1437, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1797, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -355,6 +365,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -367,17 +378,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1437, 570);
+ this.split1.Size = new System.Drawing.Size(1797, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1437, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1797, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -408,8 +421,9 @@
this.gridColumn25,
this.gridColumn26,
this.gridColumn2});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -420,274 +434,269 @@
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "涓婚敭GUID";
this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
+ this.gv_id.MinWidth = 62;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.ID";
- this.gv_id.Width = 94;
+ this.gv_id.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "瀹℃牳鏍囪瘑";
this.gridColumn1.FieldName = "chkStatus";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹岀粨鏍囪瘑";
- this.gridColumn19.FieldName = "wjStatus";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.FieldName = "txtColor";
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 1;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn27
//
this.gridColumn27.Caption = "婧愬崟鏍囪瘑";
this.gridColumn27.FieldName = "fHasLinkTxt";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 2;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// gv_billType
//
this.gv_billType.AppearanceCell.Options.UseFont = true;
this.gv_billType.Caption = "鍗曟嵁绫诲瀷 ";
this.gv_billType.FieldName = "billType";
- this.gv_billType.MinWidth = 50;
+ this.gv_billType.MinWidth = 62;
this.gv_billType.Name = "gv_billType";
this.gv_billType.OptionsColumn.AllowEdit = false;
this.gv_billType.Tag = "query_a.BILL_TYPE";
this.gv_billType.Visible = true;
- this.gv_billType.VisibleIndex = 17;
- this.gv_billType.Width = 94;
+ this.gv_billType.VisibleIndex = 14;
+ this.gv_billType.Width = 117;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 62;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 94;
+ this.gv_billNo.Width = 117;
//
// gv_salesOrg
//
this.gv_salesOrg.AppearanceCell.Options.UseFont = true;
this.gv_salesOrg.Caption = "閿�鍞粍缁� ";
this.gv_salesOrg.FieldName = "xsOrgName";
- this.gv_salesOrg.MinWidth = 50;
+ this.gv_salesOrg.MinWidth = 62;
this.gv_salesOrg.Name = "gv_salesOrg";
this.gv_salesOrg.OptionsColumn.AllowEdit = false;
this.gv_salesOrg.Tag = "query_a.SALES_ORG";
this.gv_salesOrg.Visible = true;
- this.gv_salesOrg.VisibleIndex = 16;
- this.gv_salesOrg.Width = 94;
+ this.gv_salesOrg.VisibleIndex = 13;
+ this.gv_salesOrg.Width = 117;
//
// gv_salesDept
//
this.gv_salesDept.AppearanceCell.Options.UseFont = true;
this.gv_salesDept.Caption = "閿�鍞儴闂� ";
this.gv_salesDept.FieldName = "saleDeptName";
- this.gv_salesDept.MinWidth = 50;
+ this.gv_salesDept.MinWidth = 62;
this.gv_salesDept.Name = "gv_salesDept";
this.gv_salesDept.OptionsColumn.AllowEdit = false;
this.gv_salesDept.Tag = "query_a.SALES_DEPT";
this.gv_salesDept.Visible = true;
- this.gv_salesDept.VisibleIndex = 6;
- this.gv_salesDept.Width = 94;
+ this.gv_salesDept.VisibleIndex = 5;
+ this.gv_salesDept.Width = 117;
//
// gv_salesPerson
//
this.gv_salesPerson.AppearanceCell.Options.UseFont = true;
this.gv_salesPerson.Caption = "閿�鍞憳 ";
this.gv_salesPerson.FieldName = "salerName";
- this.gv_salesPerson.MinWidth = 50;
+ this.gv_salesPerson.MinWidth = 62;
this.gv_salesPerson.Name = "gv_salesPerson";
this.gv_salesPerson.OptionsColumn.AllowEdit = false;
this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
- this.gv_salesPerson.Width = 94;
+ this.gv_salesPerson.Width = 117;
//
// gv_returnReason
//
this.gv_returnReason.AppearanceCell.Options.UseFont = true;
this.gv_returnReason.Caption = "閫�璐у師鍥� ";
this.gv_returnReason.FieldName = "thyy";
- this.gv_returnReason.MinWidth = 50;
+ this.gv_returnReason.MinWidth = 62;
this.gv_returnReason.Name = "gv_returnReason";
this.gv_returnReason.OptionsColumn.AllowEdit = false;
this.gv_returnReason.Tag = "query_a.RETURN_REASON";
this.gv_returnReason.Visible = true;
- this.gv_returnReason.VisibleIndex = 7;
- this.gv_returnReason.Width = 94;
+ this.gv_returnReason.VisibleIndex = 6;
+ this.gv_returnReason.Width = 117;
//
// gv_createdBy
//
this.gv_createdBy.AppearanceCell.Options.UseFont = true;
this.gv_createdBy.Caption = "鍒涘缓浜� ";
- this.gv_createdBy.FieldName = "createdBy";
- this.gv_createdBy.MinWidth = 50;
+ this.gv_createdBy.FieldName = "cjPeople";
+ this.gv_createdBy.MinWidth = 62;
this.gv_createdBy.Name = "gv_createdBy";
this.gv_createdBy.OptionsColumn.AllowEdit = false;
this.gv_createdBy.Tag = "query_a.CREATED_BY";
this.gv_createdBy.Visible = true;
- this.gv_createdBy.VisibleIndex = 8;
- this.gv_createdBy.Width = 94;
+ this.gv_createdBy.VisibleIndex = 7;
+ this.gv_createdBy.Width = 117;
//
// gv_createdDate
//
this.gv_createdDate.AppearanceCell.Options.UseFont = true;
this.gv_createdDate.Caption = "鍒涘缓鏃堕棿 ";
this.gv_createdDate.FieldName = "createdDate";
- this.gv_createdDate.MinWidth = 50;
+ this.gv_createdDate.MinWidth = 62;
this.gv_createdDate.Name = "gv_createdDate";
this.gv_createdDate.OptionsColumn.AllowEdit = false;
this.gv_createdDate.Tag = "query_a.CREATED_DATE";
this.gv_createdDate.Visible = true;
- this.gv_createdDate.VisibleIndex = 9;
- this.gv_createdDate.Width = 94;
+ this.gv_createdDate.VisibleIndex = 8;
+ this.gv_createdDate.Width = 117;
//
// gv_modifiedBy
//
this.gv_modifiedBy.AppearanceCell.Options.UseFont = true;
this.gv_modifiedBy.Caption = "淇敼浜� ";
this.gv_modifiedBy.FieldName = "modifiedBy";
- this.gv_modifiedBy.MinWidth = 50;
+ this.gv_modifiedBy.MinWidth = 62;
this.gv_modifiedBy.Name = "gv_modifiedBy";
this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
- this.gv_modifiedBy.Visible = true;
- this.gv_modifiedBy.VisibleIndex = 10;
- this.gv_modifiedBy.Width = 94;
+ this.gv_modifiedBy.Width = 117;
//
// gv_modifiedDate
//
this.gv_modifiedDate.AppearanceCell.Options.UseFont = true;
this.gv_modifiedDate.Caption = "淇敼鏃堕棿 ";
this.gv_modifiedDate.FieldName = "modifiedDate";
- this.gv_modifiedDate.MinWidth = 50;
+ this.gv_modifiedDate.MinWidth = 62;
this.gv_modifiedDate.Name = "gv_modifiedDate";
this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
- this.gv_modifiedDate.Visible = true;
- this.gv_modifiedDate.VisibleIndex = 11;
- this.gv_modifiedDate.Width = 94;
+ this.gv_modifiedDate.Width = 117;
//
// gv_approvedBy
//
this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
this.gv_approvedBy.Caption = "瀹℃牳浜� ";
- this.gv_approvedBy.FieldName = "approvedBy";
- this.gv_approvedBy.MinWidth = 50;
+ this.gv_approvedBy.FieldName = "shPeople";
+ this.gv_approvedBy.MinWidth = 62;
this.gv_approvedBy.Name = "gv_approvedBy";
this.gv_approvedBy.OptionsColumn.AllowEdit = false;
this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
this.gv_approvedBy.Visible = true;
- this.gv_approvedBy.VisibleIndex = 12;
- this.gv_approvedBy.Width = 94;
+ this.gv_approvedBy.VisibleIndex = 9;
+ this.gv_approvedBy.Width = 117;
//
// gv_approvedDate
//
this.gv_approvedDate.AppearanceCell.Options.UseFont = true;
this.gv_approvedDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_approvedDate.FieldName = "approvedDate";
- this.gv_approvedDate.MinWidth = 50;
+ this.gv_approvedDate.MinWidth = 62;
this.gv_approvedDate.Name = "gv_approvedDate";
this.gv_approvedDate.OptionsColumn.AllowEdit = false;
this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
this.gv_approvedDate.Visible = true;
- this.gv_approvedDate.VisibleIndex = 13;
- this.gv_approvedDate.Width = 94;
+ this.gv_approvedDate.VisibleIndex = 10;
+ this.gv_approvedDate.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹㈡埛";
this.gridColumn18.FieldName = "custName";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 4;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gv_customerOrderNo
//
this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
this.gv_customerOrderNo.Caption = "婧愰攢鍞鍗�";
this.gv_customerOrderNo.FieldName = "xsNo";
- this.gv_customerOrderNo.MinWidth = 50;
+ this.gv_customerOrderNo.MinWidth = 62;
this.gv_customerOrderNo.Name = "gv_customerOrderNo";
this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
- this.gv_customerOrderNo.Visible = true;
- this.gv_customerOrderNo.VisibleIndex = 5;
- this.gv_customerOrderNo.Width = 94;
+ this.gv_customerOrderNo.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "浠撳簱ID";
this.gridColumn24.FieldName = "ckId";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "浠撳簱鍚嶇О";
this.gridColumn25.FieldName = "ckName";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 14;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.VisibleIndex = 11;
+ this.gridColumn25.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "浠撳簱缂栧彿";
this.gridColumn26.FieldName = "ckNo";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 15;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.VisibleIndex = 12;
+ this.gridColumn26.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鏁版嵁鏉ユ簮";
this.gridColumn2.FieldName = "fHasLinkSource";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 18;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.VisibleIndex = 15;
+ this.gridColumn2.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1437, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1797, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1437, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1797, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -695,6 +704,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -707,12 +717,18 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+
this.splitMx1.Size = new System.Drawing.Size(1437, 570);
- this.splitMx1.SplitterPosition = 174;
+ this.splitMx1.SplitterPosition = 182;
+
+ this.splitMx1.Size = new System.Drawing.Size(1797, 698);
+ this.splitMx1.SplitterPosition = 213;
+
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.txt_returnCustomer);
this.layoutMx1.Controls.Add(this.txt_salesDept);
@@ -726,16 +742,17 @@
this.layoutMx1.Controls.Add(this.txt_billType);
this.layoutMx1.Controls.Add(this.txt_approvedDate);
this.layoutMx1.Controls.Add(this.txt_id);
- this.layoutMx1.Controls.Add(this.txt_approvedBy);
+ this.layoutMx1.Controls.Add(this.txt_shUserName2);
this.layoutMx1.Controls.Add(this.txt_modifiedDate);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_salerName);
- this.layoutMx1.Controls.Add(this.txt_modifiedBy);
+ this.layoutMx1.Controls.Add(this.txt_xgUserName1);
this.layoutMx1.Controls.Add(this.txt_saleDeptName);
this.layoutMx1.Controls.Add(this.txt_createdDate);
this.layoutMx1.Controls.Add(this.txt_returnReason);
this.layoutMx1.Controls.Add(this.txt_createdBy);
this.layoutMx1.Controls.Add(this.txt_fHasLinkSource);
+ this.layoutMx1.Controls.Add(this.txt_xsms);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem19,
@@ -745,19 +762,34 @@
this.layoutControlItem18,
this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(575, 496, 812, 534);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1437, 174);
+
+ this.layoutMx1.Size = new System.Drawing.Size(1437, 182);
+
+ this.layoutMx1.Size = new System.Drawing.Size(1797, 213);
+
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // ucBtnPrintAll1
+ //
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(1074, 140);
+ this.ucBtnPrintAll1.mxList = null;
+ this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+ this.ucBtnPrintAll1.rptType = null;
+ this.ucBtnPrintAll1.Size = new System.Drawing.Size(196, 27);
+ this.ucBtnPrintAll1.TabIndex = 546;
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 102);
+ this.btnSelect.Location = new System.Drawing.Point(14, 128);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(126, 27);
+ this.btnSelect.Size = new System.Drawing.Size(158, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 541;
this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
@@ -765,82 +797,89 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(433, 38);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(537, 52);
+ this.txt_returnCustomer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_returnCustomer.Name = "txt_returnCustomer";
- this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
+ this.txt_returnCustomer.Size = new System.Drawing.Size(346, 28);
this.txt_returnCustomer.TabIndex = 539;
//
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1131, 102);
+ this.txt_salesDept.Location = new System.Drawing.Point(1411, 128);
+ this.txt_salesDept.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_salesDept.Name = "txt_salesDept";
- this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
+ this.txt_salesDept.Size = new System.Drawing.Size(346, 28);
this.txt_salesDept.TabIndex = 538;
//
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 102);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(974, 128);
+ this.txt_inventoryOrg.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
- this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(346, 28);
this.txt_inventoryOrg.TabIndex = 537;
//
// txt_salesOrg
//
this.txt_salesOrg.IsReadly = false;
- this.txt_salesOrg.Location = new System.Drawing.Point(84, 38);
+ this.txt_salesOrg.Location = new System.Drawing.Point(101, 52);
+ this.txt_salesOrg.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_salesOrg.Name = "txt_salesOrg";
- this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
+ this.txt_salesOrg.Size = new System.Drawing.Size(345, 28);
this.txt_salesOrg.TabIndex = 535;
//
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 100);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(537, 126);
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(346, 38);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 534;
//
// txt_fstockid
//
this.txt_fstockid.IsReadly = false;
- this.txt_fstockid.Location = new System.Drawing.Point(84, 70);
+ this.txt_fstockid.Location = new System.Drawing.Point(101, 90);
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(345, 28);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 131);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 160);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(335, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);
+ this.txt_wjStatus.Location = new System.Drawing.Point(798, 175);
+ this.txt_wjStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(386, 27);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 453;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1059, 70);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1324, 90);
+ this.txt_chkStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(433, 27);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -848,122 +887,134 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(433, 6);
+ this.txt_billType.Location = new System.Drawing.Point(537, 14);
+ this.txt_billType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(346, 28);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1131, 38);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1411, 52);
+ this.txt_approvedDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(346, 28);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(90, 3);
+ this.txt_id.Location = new System.Drawing.Point(112, 4);
+ this.txt_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(189, 24);
+ this.txt_id.Size = new System.Drawing.Size(236, 28);
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 210;
this.txt_id.Tag = "readonly";
//
- // txt_approvedBy
+ // txt_shUserName2
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1131, 6);
- 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.StyleController = this.layoutMx1;
- this.txt_approvedBy.TabIndex = 370;
- this.txt_approvedBy.Tag = "readonly";
+ this.txt_shUserName2.Location = new System.Drawing.Point(1411, 14);
+ this.txt_shUserName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_shUserName2.Name = "txt_shUserName2";
+ this.txt_shUserName2.Properties.Appearance.Options.UseFont = true;
+ this.txt_shUserName2.Size = new System.Drawing.Size(346, 28);
+ this.txt_shUserName2.StyleController = this.layoutMx1;
+ this.txt_shUserName2.TabIndex = 370;
+ this.txt_shUserName2.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(782, 38);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(974, 52);
+ this.txt_modifiedDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(346, 28);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 6);
+ this.txt_billNo.Location = new System.Drawing.Point(101, 14);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(345, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
//
// txt_salerName
//
- this.txt_salerName.Location = new System.Drawing.Point(700, 44);
+ this.txt_salerName.Location = new System.Drawing.Point(875, 54);
+ this.txt_salerName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_salerName.Name = "txt_salerName";
this.txt_salerName.Properties.Appearance.Options.UseFont = true;
- this.txt_salerName.Size = new System.Drawing.Size(232, 24);
+ this.txt_salerName.Size = new System.Drawing.Size(290, 28);
this.txt_salerName.StyleController = this.layoutMx1;
this.txt_salerName.TabIndex = 267;
this.txt_salerName.Tag = "readonly";
//
- // txt_modifiedBy
+ // txt_xgUserName1
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(782, 6);
- 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.StyleController = this.layoutMx1;
- this.txt_modifiedBy.TabIndex = 327;
- this.txt_modifiedBy.Tag = "readonly";
+ this.txt_xgUserName1.Location = new System.Drawing.Point(974, 14);
+ this.txt_xgUserName1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_xgUserName1.Name = "txt_xgUserName1";
+ this.txt_xgUserName1.Properties.Appearance.Options.UseFont = true;
+ this.txt_xgUserName1.Size = new System.Drawing.Size(346, 28);
+ this.txt_xgUserName1.StyleController = this.layoutMx1;
+ this.txt_xgUserName1.TabIndex = 327;
+ this.txt_xgUserName1.Tag = "readonly";
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(782, 70);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(974, 90);
+ this.txt_saleDeptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(346, 28);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
//
// txt_createdDate
//
- this.txt_createdDate.Location = new System.Drawing.Point(710, 110);
+ this.txt_createdDate.Location = new System.Drawing.Point(888, 134);
+ this.txt_createdDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createdDate.Name = "txt_createdDate";
this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createdDate.Size = new System.Drawing.Size(237, 24);
+ this.txt_createdDate.Size = new System.Drawing.Size(296, 28);
this.txt_createdDate.StyleController = this.layoutMx1;
this.txt_createdDate.TabIndex = 319;
this.txt_createdDate.Tag = "readonly";
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(433, 70);
+ this.txt_returnReason.Location = new System.Drawing.Point(537, 90);
+ this.txt_returnReason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(346, 28);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
// txt_createdBy
//
- this.txt_createdBy.Location = new System.Drawing.Point(710, 77);
+ this.txt_createdBy.Location = new System.Drawing.Point(888, 94);
+ this.txt_createdBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createdBy.Name = "txt_createdBy";
this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createdBy.Size = new System.Drawing.Size(237, 24);
+ this.txt_createdBy.Size = new System.Drawing.Size(296, 28);
this.txt_createdBy.StyleController = this.layoutMx1;
this.txt_createdBy.TabIndex = 312;
this.txt_createdBy.Tag = "readonly";
@@ -971,7 +1022,8 @@
// txt_fHasLinkSource
//
this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 134);
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(537, 166);
+ this.txt_fHasLinkSource.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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)});
@@ -979,9 +1031,28 @@
"閿�鍞嚭搴撳崟(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(346, 28);
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(974, 166);
+ this.txt_xsms.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ 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)});
+ this.txt_xsms.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "1:ODM",
+ "2:OEM",
+ "3:OBM",
+ "4:渚涘簲鍟嗕拱鏂�"});
+ this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_xsms.Size = new System.Drawing.Size(346, 28);
+ this.txt_xsms.StyleController = this.layoutMx1;
+ this.txt_xsms.TabIndex = 545;
//
// layoutControlItem19
//
@@ -1002,7 +1073,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem1.Text = "涓婚敭GUID";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(82, 22);
//
// layoutControlItem12
//
@@ -1013,7 +1084,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);
this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 22);
//
// layoutControlItem11
//
@@ -1024,7 +1095,7 @@
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);
this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 22);
//
// layoutControlItem18
//
@@ -1047,7 +1118,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
this.layoutControlItem6.Text = "閿�鍞憳鍚�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 22);
//
// Root
//
@@ -1070,7 +1141,9 @@
this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem9,
- this.layoutControlItem3});
+ this.layoutControlItem3,
+ this.layItem101,
+ this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1102,7 +1175,11 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1416, 180);
+
+ this.Root.Size = new System.Drawing.Size(1437, 182);
+
+ this.Root.Size = new System.Drawing.Size(1771, 214);
+
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1110,39 +1187,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(436, 38);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(1047, 0);
+ this.layoutControlItem15.Control = this.txt_shUserName2;
+ this.layoutControlItem15.Location = new System.Drawing.Point(1310, 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(437, 38);
this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(1047, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1310, 38);
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(437, 38);
this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(1047, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1310, 76);
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(437, 38);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1150,94 +1227,94 @@
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_fstockid;
- this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 76);
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(436, 38);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 22);
//
// layItem1
//
this.layItem1.Control = this.txt_salesOrg;
- this.layItem1.Location = new System.Drawing.Point(0, 32);
+ this.layItem1.Location = new System.Drawing.Point(0, 38);
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(436, 38);
this.layItem1.Text = "閿�鍞粍缁�";
- this.layItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem21
//
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(436, 114);
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(437, 38);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(698, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(873, 76);
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(437, 38);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(349, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(436, 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(437, 38);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layItem2
//
this.layItem2.Control = this.txt_returnCustomer;
- this.layItem2.Location = new System.Drawing.Point(349, 32);
+ this.layItem2.Location = new System.Drawing.Point(436, 38);
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(437, 38);
this.layItem2.Text = "閫�璐у鎴�";
- this.layItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layItem3
//
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(873, 114);
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(437, 38);
this.layItem3.Text = "搴撳瓨缁勭粐";
- this.layItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layItem4
//
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(1310, 114);
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(437, 38);
this.layItem4.Text = "閿�鍞儴闂�";
- this.layItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layItem100
//
@@ -1245,42 +1322,109 @@
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(436, 152);
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, 34);
+
+ this.layItem100.Size = new System.Drawing.Size(437, 38);
+
this.layItem100.Text = "鏁版嵁鏉ユ簮";
- this.layItem100.TextSize = new System.Drawing.Size(60, 18);
+ this.layItem100.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
- this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
+ this.layoutControlItem13.Control = this.txt_xgUserName1;
+ this.layoutControlItem13.Location = new System.Drawing.Point(873, 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(437, 38);
this.layoutControlItem13.Text = "淇敼浜哄憳";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(873, 38);
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(437, 38);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_returnReason;
+ this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+ this.layoutControlItem9.Location = new System.Drawing.Point(436, 76);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(437, 38);
+ this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.btnSelect;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem3.MaxSize = new System.Drawing.Size(162, 38);
+ this.layoutControlItem3.MinSize = new System.Drawing.Size(25, 38);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(436, 38);
+ this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
+ // layItem101
+ //
+ 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(873, 152);
+ this.layItem101.Name = "layItem101";
+ this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
+
+ this.layItem101.Size = new System.Drawing.Size(354, 34);
+
+ this.layItem101.Size = new System.Drawing.Size(437, 38);
+
+ this.layItem101.Text = "閿�鍞ā寮�";
+ this.layItem101.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.ucBtnPrintAll1;
+ this.layoutControlItem2.Location = new System.Drawing.Point(1062, 128);
+ this.layoutControlItem2.MaxSize = new System.Drawing.Size(200, 31);
+ this.layoutControlItem2.MinSize = new System.Drawing.Size(101, 31);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem2.Size = new System.Drawing.Size(355, 34);
+ this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem2.Text = "鎵撳嵃鎵�鏈夋槑缁�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem2.TextVisible = false;
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1437, 384);
+
+ this.tabMx.Size = new System.Drawing.Size(1437, 376);
+
+ this.tabMx.Size = new System.Drawing.Size(1797, 470);
+
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1289,8 +1433,13 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.split99);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1435, 352);
+
+ this.tabMxPage1.Size = new System.Drawing.Size(1435, 344);
+
+ this.tabMxPage1.Size = new System.Drawing.Size(1795, 432);
+
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1298,6 +1447,7 @@
this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
this.split99.Horizontal = false;
this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split99.Name = "split99";
//
// split99.Panel1
@@ -1310,8 +1460,13 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1435, 352);
+
+ this.split99.Size = new System.Drawing.Size(1435, 344);
this.split99.SplitterPosition = 132;
+
+ this.split99.Size = new System.Drawing.Size(1795, 432);
+ this.split99.SplitterPosition = 161;
+
this.split99.TabIndex = 4;
//
// layout99
@@ -1331,10 +1486,11 @@
this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29});
this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1435, 132);
+ this.layout99.Size = new System.Drawing.Size(1795, 161);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -1342,29 +1498,32 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(719, 86);
+ this.layoutControl1.Location = new System.Drawing.Point(899, 105);
+ this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(350, 34);
+ this.layoutControl1.Size = new System.Drawing.Size(439, 42);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);
+ this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(92, 28);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 228;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(279, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(344, 2);
+ this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(69, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(93, 28);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -1389,7 +1548,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition6});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(439, 42);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1397,34 +1556,34 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(175, 34);
+ this.layoutControlItem33.Size = new System.Drawing.Size(219, 42);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_yuliang_1;
- this.layoutControlItem34.Location = new System.Drawing.Point(175, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(219, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(175, 34);
+ this.layoutControlItem34.Size = new System.Drawing.Size(220, 42);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(108, 22);
//
// ucBtnPrint1
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1072, 47);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1341, 57);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(441, 46);
this.ucBtnPrint1.TabIndex = 230;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1074, 10);
+ this.radOut.Location = new System.Drawing.Point(1344, 12);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1432,15 +1591,17 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
- this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.radOut.Size = new System.Drawing.Size(439, 45);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(755, 76);
+ this.lbMxGuid.Location = new System.Drawing.Point(944, 93);
+ this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+ this.lbMxGuid.Size = new System.Drawing.Size(72, 22);
this.lbMxGuid.StyleController = this.layout99;
this.lbMxGuid.TabIndex = 229;
this.lbMxGuid.Text = "lbMxGuid";
@@ -1448,72 +1609,79 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ this.txtWlid.Location = new System.Drawing.Point(137, 14);
+ this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(247, 24);
+ this.txtWlid.Size = new System.Drawing.Size(315, 28);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(821, 49);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(1022, 59);
+ this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(248, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(316, 28);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 226;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 49);
+ this.txtWlmc.Location = new System.Drawing.Point(137, 59);
+ this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(247, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(315, 28);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 86);
+ this.txtWlgg.Location = new System.Drawing.Point(137, 105);
+ this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(601, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(758, 28);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(821, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(1022, 14);
+ this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(248, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(316, 28);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(467, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(579, 14);
+ this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(248, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(316, 28);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(467, 49);
+ this.txt_yQty.Location = new System.Drawing.Point(579, 59);
+ this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(248, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(316, 28);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -1569,7 +1737,7 @@
rowDefinition7,
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1795, 161);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -1577,84 +1745,81 @@
this.layoutControlItem22.Control = this.txtWlid;
this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.Size = new System.Drawing.Size(353, 37);
+ this.layoutControlItem22.Size = new System.Drawing.Size(442, 45);
this.layoutControlItem22.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txtWlmc;
- this.layoutControlItem23.Location = new System.Drawing.Point(0, 37);
+ this.layoutControlItem23.Location = new System.Drawing.Point(0, 45);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(353, 37);
+ this.layoutControlItem23.Size = new System.Drawing.Size(442, 46);
this.layoutControlItem23.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtWlgg;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 74);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 91);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(707, 38);
+ this.layoutControlItem24.Size = new System.Drawing.Size(885, 46);
this.layoutControlItem24.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txtQuantity;
- this.layoutControlItem25.Location = new System.Drawing.Point(353, 0);
+ this.layoutControlItem25.Location = new System.Drawing.Point(442, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(354, 37);
+ this.layoutControlItem25.Size = new System.Drawing.Size(443, 45);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_yQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(353, 37);
+ this.layoutControlItem26.Location = new System.Drawing.Point(442, 45);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(354, 37);
+ this.layoutControlItem26.Size = new System.Drawing.Size(443, 46);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_kQty;
- this.layoutControlItem27.Location = new System.Drawing.Point(707, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(885, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(354, 37);
+ this.layoutControlItem27.Size = new System.Drawing.Size(443, 45);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_psnQty_1;
- this.layoutControlItem28.Location = new System.Drawing.Point(707, 37);
+ this.layoutControlItem28.Location = new System.Drawing.Point(885, 45);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(354, 37);
+ this.layoutControlItem28.Size = new System.Drawing.Size(443, 46);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.radOut;
- this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0);
- this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
- this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem30.Location = new System.Drawing.Point(1328, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem30.Size = new System.Drawing.Size(354, 37);
- this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 0, 0, 0);
+ this.layoutControlItem30.Size = new System.Drawing.Size(443, 45);
this.layoutControlItem30.Text = "鑷姩璁＄畻";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
@@ -1662,15 +1827,12 @@
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37);
- this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
- this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1328, 45);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem31.Size = new System.Drawing.Size(354, 37);
- this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem31.Size = new System.Drawing.Size(443, 46);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1678,11 +1840,11 @@
// layoutControlItem32
//
this.layoutControlItem32.Control = this.layoutControl1;
- this.layoutControlItem32.Location = new System.Drawing.Point(707, 74);
+ this.layoutControlItem32.Location = new System.Drawing.Point(885, 91);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(354, 38);
+ this.layoutControlItem32.Size = new System.Drawing.Size(443, 46);
this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
@@ -1690,14 +1852,20 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1435, 208);
+
+ this.gcMx1.Size = new System.Drawing.Size(1435, 200);
+
+ this.gcMx1.Size = new System.Drawing.Size(1795, 256);
+
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1723,6 +1891,7 @@
this.gridColumn21,
this.gridColumn22,
this.gvMxDel});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1734,88 +1903,88 @@
this.gvMx1id.AppearanceCell.Options.UseFont = true;
this.gvMx1id.Caption = "涓婚敭GUID";
this.gvMx1id.FieldName = "guid";
- this.gvMx1id.MinWidth = 50;
+ this.gvMx1id.MinWidth = 62;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.ID";
- this.gvMx1id.Width = 94;
+ this.gvMx1id.Width = 117;
//
// gvMx1materialId
//
this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
this.gvMx1materialId.Caption = "鐗╂枡ID ";
this.gvMx1materialId.FieldName = "itemId";
- this.gvMx1materialId.MinWidth = 50;
+ this.gvMx1materialId.MinWidth = 62;
this.gvMx1materialId.Name = "gvMx1materialId";
this.gvMx1materialId.Tag = "query_a.MATERIAL_ID";
- this.gvMx1materialId.Width = 94;
+ this.gvMx1materialId.Width = 117;
//
// gvMx1materialName
//
this.gvMx1materialName.AppearanceCell.Options.UseFont = true;
this.gvMx1materialName.Caption = "鐗╂枡鍚嶇О ";
this.gvMx1materialName.FieldName = "itemName";
- this.gvMx1materialName.MinWidth = 50;
+ this.gvMx1materialName.MinWidth = 62;
this.gvMx1materialName.Name = "gvMx1materialName";
this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
this.gvMx1materialName.Visible = true;
this.gvMx1materialName.VisibleIndex = 0;
- this.gvMx1materialName.Width = 94;
+ this.gvMx1materialName.Width = 117;
//
// gvMx1materialSpecification
//
this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;
this.gvMx1materialSpecification.Caption = "鐗╂枡瑙勬牸 ";
this.gvMx1materialSpecification.FieldName = "itemModel";
- this.gvMx1materialSpecification.MinWidth = 50;
+ this.gvMx1materialSpecification.MinWidth = 62;
this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
this.gvMx1materialSpecification.Visible = true;
this.gvMx1materialSpecification.VisibleIndex = 8;
- this.gvMx1materialSpecification.Width = 94;
+ this.gvMx1materialSpecification.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "鐗╂枡缂栫爜";
this.gridColumn20.FieldName = "itemNo";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gvMx1salesUnitId
//
this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;
this.gvMx1salesUnitId.Caption = "閿�鍞崟浣� ";
this.gvMx1salesUnitId.FieldName = "xxDw";
- this.gvMx1salesUnitId.MinWidth = 50;
+ this.gvMx1salesUnitId.MinWidth = 62;
this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
this.gvMx1salesUnitId.Visible = true;
this.gvMx1salesUnitId.VisibleIndex = 2;
- this.gvMx1salesUnitId.Width = 94;
+ this.gvMx1salesUnitId.Width = 117;
//
// gvMx1salesQuantity
//
this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;
this.gvMx1salesQuantity.Caption = "閿�鍞暟閲� ";
this.gvMx1salesQuantity.FieldName = "salesQuantity";
- this.gvMx1salesQuantity.MinWidth = 50;
+ this.gvMx1salesQuantity.MinWidth = 62;
this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
this.gvMx1salesQuantity.Visible = true;
this.gvMx1salesQuantity.VisibleIndex = 3;
- this.gvMx1salesQuantity.Width = 94;
+ this.gvMx1salesQuantity.Width = 117;
//
// gridColumn32
//
this.gridColumn32.Caption = "鍙戣揣鎬婚噺";
this.gridColumn32.FieldName = "fhQuantity";
- this.gridColumn32.MinWidth = 25;
+ this.gridColumn32.MinWidth = 31;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 12;
- this.gridColumn32.Width = 94;
+ this.gridColumn32.Width = 117;
//
// gvMx1note
//
@@ -1826,12 +1995,12 @@
this.gvMx1note.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1note.Caption = "鐢宠澶囨敞 ";
this.gvMx1note.FieldName = "note";
- this.gvMx1note.MinWidth = 50;
+ this.gvMx1note.MinWidth = 62;
this.gvMx1note.Name = "gvMx1note";
this.gvMx1note.Tag = "edit";
this.gvMx1note.Visible = true;
this.gvMx1note.VisibleIndex = 5;
- this.gvMx1note.Width = 94;
+ this.gvMx1note.Width = 117;
//
// gridColumn13
//
@@ -1841,12 +2010,12 @@
this.gridColumn13.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn13.Caption = "鐢宠鏁伴噺";
this.gridColumn13.FieldName = "sqQty";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "yz_quantity_0_edit";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 4;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gvMx1returnDate
//
@@ -1858,12 +2027,12 @@
this.gvMx1returnDate.Caption = "閫�璐ф棩鏈� ";
this.gvMx1returnDate.ColumnEdit = this.repositoryItemDateEdit1;
this.gvMx1returnDate.FieldName = "returnDate";
- this.gvMx1returnDate.MinWidth = 50;
+ this.gvMx1returnDate.MinWidth = 62;
this.gvMx1returnDate.Name = "gvMx1returnDate";
this.gvMx1returnDate.Tag = "edit";
this.gvMx1returnDate.Visible = true;
this.gvMx1returnDate.VisibleIndex = 6;
- this.gvMx1returnDate.Width = 94;
+ this.gvMx1returnDate.Width = 117;
//
// repositoryItemDateEdit1
//
@@ -1879,12 +2048,12 @@
this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
this.gvMx1isFree.FieldName = "isFreeChk";
- this.gvMx1isFree.MinWidth = 50;
+ this.gvMx1isFree.MinWidth = 62;
this.gvMx1isFree.Name = "gvMx1isFree";
this.gvMx1isFree.Tag = "query_a.IS_FREE";
this.gvMx1isFree.Visible = true;
this.gvMx1isFree.VisibleIndex = 9;
- this.gvMx1isFree.Width = 94;
+ this.gvMx1isFree.Width = 117;
//
// gvMx1returnType
//
@@ -1896,12 +2065,12 @@
this.gvMx1returnType.Caption = "閫�璐х被鍨� ";
this.gvMx1returnType.ColumnEdit = this.repositoryItemComboBox1;
this.gvMx1returnType.FieldName = "returnType";
- this.gvMx1returnType.MinWidth = 50;
+ this.gvMx1returnType.MinWidth = 62;
this.gvMx1returnType.Name = "gvMx1returnType";
this.gvMx1returnType.Tag = "edit";
this.gvMx1returnType.Visible = true;
this.gvMx1returnType.VisibleIndex = 7;
- this.gvMx1returnType.Width = 94;
+ this.gvMx1returnType.Width = 117;
//
// repositoryItemComboBox1
//
@@ -1920,39 +2089,39 @@
//
this.gridColumn12.Caption = "閫佽揣鏄庣粏guid";
this.gridColumn12.FieldName = "deliveDetailGuid";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "鍙墦鍗版暟閲�";
this.gridColumn21.FieldName = "kdy";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 10;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "宸叉墦鍗版暟閲�";
this.gridColumn22.FieldName = "ydy";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 11;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 13;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.Width = 117;
//
// repositoryItemButtonEdit1
//
@@ -1968,17 +2137,28 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1435, 357);
+
+ this.tabMxPage2.Size = new System.Drawing.Size(1435, 344);
+
+ this.tabMxPage2.Size = new System.Drawing.Size(1794, 428);
+
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1435, 357);
+
+ this.gcMx2.Size = new System.Drawing.Size(1435, 344);
+
+ this.gcMx2.Size = new System.Drawing.Size(1794, 428);
+
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2000,6 +2180,7 @@
this.gridColumn29,
this.gridColumn30,
this.gridColumn31});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2011,184 +2192,160 @@
this.gridColumn3.AppearanceCell.Options.UseFont = true;
this.gridColumn3.Caption = "guid";
this.gridColumn3.FieldName = "guid";
- this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.MinWidth = 62;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "query_a.guid";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 25;
+ this.gvMx1itemBarcode.MinWidth = 31;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 300;
+ this.gvMx1itemBarcode.Width = 375;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡缂栫爜";
this.gridColumn14.FieldName = "itemNo";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 1;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "鐗╂枡鍚嶇О";
this.gridColumn15.FieldName = "itemName";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 2;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn16.FieldName = "itemModel";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 3;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 62;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 4;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鍗曚綅";
this.gridColumn17.FieldName = "dwName";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 5;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜�";
this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 25;
+ this.gvMx1createBy.MinWidth = 31;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 6;
- this.gvMx1createBy.Width = 94;
+ this.gvMx1createBy.Width = 117;
//
// gvMx1lotDate
//
this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
this.gvMx1lotDate.FieldName = "createDate";
- this.gvMx1lotDate.MinWidth = 25;
+ this.gvMx1lotDate.MinWidth = 31;
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
this.gvMx1lotDate.VisibleIndex = 7;
- this.gvMx1lotDate.Width = 94;
+ this.gvMx1lotDate.Width = 117;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏄惁鍏ュ簱";
this.gridColumn28.FieldName = "isRk";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 8;
- this.gridColumn28.Width = 94;
+ this.gridColumn28.Width = 117;
//
// gridColumn29
//
this.gridColumn29.Caption = "鍏ュ簱浜�";
this.gridColumn29.FieldName = "rkUser";
- this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 9;
- this.gridColumn29.Width = 94;
+ this.gridColumn29.Width = 117;
//
// gridColumn30
//
this.gridColumn30.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn30.FieldName = "rkDate";
- this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.MinWidth = 31;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 10;
- this.gridColumn30.Width = 94;
+ this.gridColumn30.Width = 117;
//
// gridColumn31
//
this.gridColumn31.Caption = "鍏ュ簱浣�";
this.gridColumn31.FieldName = "rkPositon";
- this.gridColumn31.MinWidth = 25;
+ this.gridColumn31.MinWidth = 31;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 11;
- this.gridColumn31.Width = 94;
+ this.gridColumn31.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(962, 40);
+ this.picCheckBox.Location = new System.Drawing.Point(1202, 49);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 451;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(349, 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.Text = "鐢宠鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.btnSelect;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);
- 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.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
- //
// Frm_SalesReturnNotice
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1439, 682);
+ this.ClientSize = new System.Drawing.Size(1799, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_SalesReturnNotice";
this.Text = "閿�鍞��璐х敵璇峰崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2216,16 +2373,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -2248,6 +2406,10 @@
((System.ComponentModel.ISupportInitialize)(this.layItem100)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItem101)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2296,8 +2458,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
@@ -2334,9 +2494,9 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_approvedDate;
- private DevExpress.XtraEditors.TextEdit txt_approvedBy;
+ private DevExpress.XtraEditors.TextEdit txt_shUserName2;
private DevExpress.XtraEditors.TextEdit txt_modifiedDate;
- private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
+ private DevExpress.XtraEditors.TextEdit txt_xgUserName1;
private DevExpress.XtraEditors.TextEdit txt_createdDate;
private DevExpress.XtraEditors.TextEdit txt_createdBy;
private DevExpress.XtraEditors.TextEdit txt_salerName;
@@ -2453,5 +2613,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_xsms;
+ private DevExpress.XtraLayout.LayoutControlItem layItem101;
+ private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 2ce2ed3..15210d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,4 +1,3 @@
-using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
@@ -34,6 +33,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -50,40 +50,11 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //鎵撳嵃浜嬩欢
+ #region 鎵撳嵃鐩稿叧
+ //棰勮鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- string rowGuid = lbMxGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (lbMxGuid.Text.Trim().Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- this.ucBtnPrint1.rptParameter = "rpt_Xsth{"
- + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
- + "," + txt_iCount_1.Text.Trim()//寮犳暟
- + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
- + "}";
- txt_iCount_1.Text = "";
- txt_psnQty_1.Text = "";
+ _print(0);
};
//鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
this.ucBtnPrint1.btnAllClick += (s, e) =>
@@ -124,6 +95,11 @@
}
}
};
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1);
+ };
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
//鎵撳嵃鑷姩璁＄畻
txt_psnQty_1.TextChanged += (s, e) =>
@@ -134,6 +110,46 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
+ //鍏ㄩ儴鎵撳嵃
+ ucBtnPrintAll1.btnPrintClick += (s, e) =>
+ {
+ this.ucBtnPrintAll1.rptType = "";
+ this.ucBtnPrintAll1.mxList = null;
+ if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭墦鍗板墠璇峰厛淇濆瓨鍗曟嵁锛�");
+ return;
+ }
+ getModel(lbGuid.Text.Trim());
+ List<dynamic> lst = new List<dynamic>();
+ DataTable dt = (DataTable)gcMx1.DataSource;
+ foreach (DataRow row in dt.Rows)
+ {
+ string guid = row["guid"].ToString();
+ string psnQty = row["kdy"].ToString();
+ if (string.IsNullOrEmpty(psnQty))
+ {
+ continue;
+ }
+ if (psnQty == "0")
+ {
+ continue;
+ }
+ lst.Add(new
+ {
+ guid = guid,
+ kdy = psnQty,
+ });
+ }
+ if (lst.Count <= 0)
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐨勭墿鏂欙紒");
+ return;
+ }
+ this.ucBtnPrintAll1.rptType = "rpt_Xsth";
+ this.ucBtnPrintAll1.mxList = lst;
+ };
+ #endregion
//閿�鍞粍缁�
txt_salesOrg.EditChanged += (s, e) =>
{
@@ -306,6 +322,44 @@
};
}
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+ private void _print(int type)
+ {
+ string rowGuid = lbMxGuid.Text.Trim();
+ ucBtnPrint1.guidKey = rowGuid;
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (lbMxGuid.Text.Trim().Length < 10)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint1.rptParameter = "rpt_Xsth{"
+ + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+ + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+ + "," + txt_iCount_1.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ + "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ }
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -496,6 +550,7 @@
string _inventoryOrg = txt_inventoryOrg.GetId();
string _returnCustomer = txt_returnCustomer.GetId().ToString();
string _salesDept = txt_salesDept.GetId();
+ string _xsms = txt_xsms.Text.ToString();
if (txt_billType.SelectedIndex < 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -541,6 +596,12 @@
txt_salesDept.Focus();
return;
}
+ if (txt_xsms.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞ā寮忥紒");
+ txt_xsms.Focus();
+ return;
+ }
}
var _obj = new
{
@@ -555,6 +616,7 @@
inventoryOrg = _inventoryOrg,
returnCustomer = _returnCustomer,
salesDept = _salesDept,
+ xsms = _xsms,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -765,8 +827,16 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -802,6 +872,9 @@
break;
case 0:
strMsg = "鍙嶅鏍�";
+ break;
+ case 2:
+ strMsg = "瀹岀粨";
break;
}
;
@@ -931,12 +1004,14 @@
layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ layItem101.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
else
{
layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layItem101.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice1.Designer.cs
new file mode 100644
index 0000000..6558000
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice1.Designer.cs
@@ -0,0 +1,73 @@
+锘�//------------------------------------------------------------------------------
+// <auto-generated>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+// 杩愯鏃剁増鏈�:4.0.30319.42000
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
+// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Gs.DevApp.DevFrm.Sales {
+ using System;
+
+
+ /// <summary>
+ /// 涓�涓己绫诲瀷鐨勮祫婧愮被锛岀敤浜庢煡鎵炬湰鍦板寲鐨勫瓧绗︿覆绛夈��
+ /// </summary>
+ // 姝ょ被鏄敱 StronglyTypedResourceBuilder
+ // 绫婚�氳繃绫讳技浜� ResGen 鎴� Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆�
+ // 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈� .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛� ResGen
+ // (浠� /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 VS 椤圭洰銆�
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Frm_SalesReturnNotice {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Frm_SalesReturnNotice() {
+ }
+
+ /// <summary>
+ /// 杩斿洖姝ょ被浣跨敤鐨勭紦瀛樼殑 ResourceManager 瀹炰緥銆�
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gs.DevApp.DevFrm.Sales.Frm_SalesReturnNotice", typeof(Frm_SalesReturnNotice).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// 閲嶅啓褰撳墠绾跨▼鐨� CurrentUICulture 灞炴�э紝瀵�
+ /// 浣跨敤姝ゅ己绫诲瀷璧勬簮绫荤殑鎵�鏈夎祫婧愭煡鎵炬墽琛岄噸鍐欍��
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘绫讳技浜� {X=17,Y=17} 鐨� System.Drawing.Point 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Point tips_TrayLocation {
+ get {
+ object obj = ResourceManager.GetObject("tips.TrayLocation", resourceCulture);
+ return ((System.Drawing.Point)(obj));
+ }
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
index 826cbba..8af0e6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
@@ -272,7 +272,8 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs
index f638ee5..18cd283 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs
@@ -106,7 +106,7 @@
salesQuantity = "",
isFreeChk = "0",
fhQuantity = "",
- });
+ });
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 379d893..01160dd 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1382,6 +1382,12 @@
<Compile Include="UserControl\SelectSrm.Designer.cs">
<DependentUpon>SelectSrm.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcBtnPrintAll.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintAll.Designer.cs">
+ <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcBtnPrintOne.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -2341,6 +2347,9 @@
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcBtnPrintAll.resx">
+ <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
<DependentUpon>UcBtnPrintOne.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index ca8220d..02f8454 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -10,11 +10,19 @@
{
public partial class SelectCk : DevExpress.XtraEditors.XtraForm
{
+ /// <summary>
+ /// 缁勭粐id
+ /// </summary>
string _strGuid = "";
+ /// <summary>
+ /// 鐗╂枡id锛屼负浜嗘煡璇㈠簱瀛�
+ /// </summary>
+ string _itemId = "";
private List<FilterEntity> _filterList = new List<FilterEntity>();
- public SelectCk(string strGuid)
+ public SelectCk(string strGuid, string itemId = "")
{
_strGuid = strGuid;
+ _itemId = itemId;
InitializeComponent();
getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
@@ -45,14 +53,14 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += (" and org.fid='" + _strGuid + "'");
- var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", this._itemId, _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn =
- UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage", json);
+ UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage2", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -97,6 +105,7 @@
{
guid = mxGuid,
name = mxName,
+ kcQty = dr["kcQty"].ToString()
});
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
index 70272fb..d6440c1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -102,6 +102,11 @@
/// </summary>
public event EventHandler btnAllClick;
+ /// <summary>
+ /// 鐩存帴鎵撳嵃
+ /// </summary>
+ public event EventHandler btnZhiJieClick;
+
private bool _ckRptService()
{
try
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs
new file mode 100644
index 0000000..072d28a
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs
@@ -0,0 +1,59 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcBtnPrintAll
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.SuspendLayout();
+ //
+ // simpleButton1
+ //
+ this.simpleButton1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.simpleButton1.Location = new System.Drawing.Point(0, 0);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(150, 39);
+ this.simpleButton1.TabIndex = 0;
+ this.simpleButton1.Text = "鎵撳嵃鎵�鏈夋槑缁�";
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ //
+ // UcBtnPrintAll
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.simpleButton1);
+ this.Name = "UcBtnPrintAll";
+ this.Size = new System.Drawing.Size(150, 39);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs
new file mode 100644
index 0000000..a793d6d
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs
@@ -0,0 +1,139 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraEditors;
+using FastReport;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class UcBtnPrintAll : DevExpress.XtraEditors.XtraUserControl
+ {
+ public UcBtnPrintAll()
+ {
+ InitializeComponent();
+ }
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ public event EventHandler btnPrintClick;
+
+ public string rptType { get; set; }
+ public List<dynamic> mxList { get; set; }
+ private void simpleButton1_Click(object sender, EventArgs e)
+ {
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
+ else
+ return;
+
+ if (string.IsNullOrEmpty(rptType))
+ {
+ return;
+ }
+ if (mxList.Count<=0)
+ {
+ return;
+ }
+ int rowsCount = 0;
+ foreach (dynamic obj in mxList)
+ {
+ string guid = obj.guid.ToString();
+ string psnQty = obj.kdy.ToString();
+ if (string.IsNullOrEmpty(psnQty))
+ {
+ continue;
+ }
+ if (psnQty == "0")
+ {
+ continue;
+ }
+ string rptParameter = rptType + "{"
+ + guid//鍏宠仈涓婚敭
+ + "," + ""
+ + "," + 0//浣欐暟
+ + "," + 1//寮犳暟
+ + "," + psnQty//姣忓紶鏉＄爜鏁伴噺锛岀洰鍓嶇瓑浜庣敵璇烽噺
+ + "}";
+ var _obj = new
+ {
+ rptParameter = rptParameter,
+ guid = guid,
+ isDesign = 0
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
+ JsonConvert.SerializeObject(_obj));
+ var _job = JObject.Parse(strJson);
+ var rtnCode = _job["rtnCode"].ToString();
+ if (int.Parse(rtnCode) > 0)
+ {
+ //妯℃澘
+ var report = new FastReport.Report();
+
+ EnvironmentSettings eSet = new EnvironmentSettings();
+ eSet.ReportSettings.ShowProgress = false;
+ report = new FastReport.Report();
+
+ var buffer = (byte[])_job["rtnData"]["reportTemplateData"];
+ using (var Stream = new MemoryStream(buffer))
+ {
+ report.Load(Stream);
+ }
+ //涓昏〃
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
+ var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ _zb.TableName = "zb";
+ //鏄庣粏琛�1
+ var array1 = new JArray();
+ foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
+ var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ _mx1.TableName = "mx1";
+ //鏄庣粏琛�2
+ var array2 = new JArray();
+ foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
+ var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ _mx2.TableName = "mx2";
+ //鍔犲埌鏁版嵁闆嗕腑
+ var ds = new DataSet();
+ ds.Tables.Add(_zb);
+ ds.Tables.Add(_mx1);
+ ds.Tables.Add(_mx2);
+ report.RegisterData(ds);
+ report.PrintSettings.ShowDialog = false;
+ report.Print();
+ report.PrintSettings.ShowDialog = false;
+ report.Dispose();
+ rowsCount++;
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ Thread.Sleep(50);
+ }
+ if (rowsCount > 0)
+ MsgHelper.ShowInformation("鎻愮ず锛氭搷浣滄垚鍔燂紝鍏辨墦鍗�" + rowsCount.ToString() + "寮狅紒");
+ else
+ MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐗╂枡锛�");
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx
@@ -0,0 +1,120 @@
+锘�<?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>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 12a6e95..ff8d298 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1134,6 +1134,11 @@
/// </summary>
public event EventHandler btnBaoGaoClick;
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ public event EventHandler btnWjClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3