From 327ed73277fcaaa413a1b8a1d80041cfdd407599 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 21 六月 2025 10:47:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 4
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 120 --------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 574 ----------------------------------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 6
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs | 21 +
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs | 60 ++++
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1
7 files changed, 99 insertions(+), 687 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs
new file mode 100644
index 0000000..71bd03a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs
@@ -0,0 +1,60 @@
+锘縰sing Gs.DevApp.ToolBox;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ partial class Frm_XsthDetect01
+ {
+ /// <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 Windows Form 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.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.閿�鍞��璐у叆搴撴.ToString());
+ this.SuspendLayout();
+ //
+ // rkDetect011
+ //
+ this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.rkDetect011.Location = new System.Drawing.Point(0, 0);
+ this.rkDetect011.Name = "rkDetect011";
+ this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
+ this.rkDetect011.TabIndex = 0;
+ //
+ // Frm_RkDetect01
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1118, 648);
+ this.Controls.Add(this.rkDetect011);
+ this.Name = "Frm_RkDetect01";
+ this.Text = "閿�鍞��璐у叆搴撴";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private RkDetect01 rkDetect011;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs
new file mode 100644
index 0000000..a216eac
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ public partial class Frm_XsthDetect01 : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_XsthDetect01()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index cbd84bd..7ee0e9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -66,6 +66,10 @@
else
if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
rptName = "rpt_Qtrk";
+ else
+ if (strType == QcSeason.閿�鍞��璐у叆搴撴.ToString())
+ rptName = "rpt_Xsth";
+
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
ucBtnPrint1.guidKey = "";
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index d3612b5..3d52a0e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -39,26 +39,11 @@
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -135,36 +120,6 @@
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
- this.layout99 = new DevExpress.XtraLayout.LayoutControl();
- this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.radOut = new DevExpress.XtraEditors.RadioGroup();
- this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -215,8 +170,6 @@
this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -281,41 +234,6 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
- this.split99.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
- this.split99.Panel2.SuspendLayout();
- this.split99.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
- this.layout99.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
- this.layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
@@ -327,7 +245,6 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -1264,403 +1181,10 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.split99);
+ this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1272, 342);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
- //
- // split99
- //
- this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
- this.split99.Horizontal = false;
- this.split99.Location = new System.Drawing.Point(0, 0);
- this.split99.Name = "split99";
- //
- // split99.Panel1
- //
- this.split99.Panel1.Controls.Add(this.layout99);
- this.split99.Panel1.Text = "Panel1";
- //
- // split99.Panel2
- //
- 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(1272, 342);
- this.split99.SplitterPosition = 137;
- this.split99.TabIndex = 4;
- //
- // layout99
- //
- this.layout99.Controls.Add(this.layoutControl1);
- this.layout99.Controls.Add(this.ucBtnPrint1);
- this.layout99.Controls.Add(this.radOut);
- this.layout99.Controls.Add(this.lbMxGuid);
- this.layout99.Controls.Add(this.txtWlid);
- this.layout99.Controls.Add(this.txt_psnQty_1);
- this.layout99.Controls.Add(this.txtWlmc);
- this.layout99.Controls.Add(this.txtWlgg);
- this.layout99.Controls.Add(this.txt_kQty);
- this.layout99.Controls.Add(this.txtQuantity);
- this.layout99.Controls.Add(this.txt_yQty);
- this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem29});
- this.layout99.Location = new System.Drawing.Point(0, 0);
- 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(1272, 137);
- this.layout99.TabIndex = 0;
- this.layout99.Text = "layoutControl1";
- //
- // layoutControl1
- //
- this.layoutControl1.Controls.Add(this.txt_iCount_1);
- this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
- this.layoutControl1.Name = "layoutControl1";
- this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 28);
- 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.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(62, 24);
- 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(272, 2);
- this.txt_yuliang_1.Name = "txt_yuliang_1";
- this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
- this.txt_yuliang_1.StyleController = this.layoutControl1;
- this.txt_yuliang_1.TabIndex = 229;
- //
- // layoutControlGroup2
- //
- this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.layoutControlGroup2.GroupBordersVisible = false;
- this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem33,
- this.layoutControlItem34});
- this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- 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(336, 28);
- this.layoutControlGroup2.TextVisible = false;
- //
- // layoutControlItem33
- //
- 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(168, 28);
- this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txt_yuliang_1;
- this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 28);
- this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
- 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.TabIndex = 230;
- //
- // radOut
- //
- this.radOut.Location = new System.Drawing.Point(1033, 10);
- this.radOut.Margin = new System.Windows.Forms.Padding(0);
- this.radOut.Name = "radOut";
- this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
- this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- 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.StyleController = this.layout99;
- this.radOut.TabIndex = 476;
- //
- // lbMxGuid
- //
- this.lbMxGuid.Location = new System.Drawing.Point(755, 76);
- this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
- this.lbMxGuid.StyleController = this.layout99;
- this.lbMxGuid.TabIndex = 229;
- this.lbMxGuid.Text = "lbMxGuid";
- this.lbMxGuid.Visible = false;
- //
- // txtWlid
- //
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
- this.txtWlid.Name = "txtWlid";
- this.txtWlid.Properties.Appearance.Options.UseFont = true;
- this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
- this.txtWlid.StyleController = this.layout99;
- this.txtWlid.TabIndex = 214;
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
- 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(234, 24);
- this.txt_psnQty_1.StyleController = this.layout99;
- this.txt_psnQty_1.TabIndex = 226;
- //
- // txtWlmc
- //
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
- this.txtWlmc.Name = "txtWlmc";
- this.txtWlmc.Properties.Appearance.Options.UseFont = true;
- this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
- this.txtWlmc.StyleController = this.layout99;
- this.txtWlmc.TabIndex = 216;
- //
- // txtWlgg
- //
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
- this.txtWlgg.Name = "txtWlgg";
- this.txtWlgg.Properties.Appearance.Options.UseFont = true;
- this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
- this.txtWlgg.StyleController = this.layout99;
- this.txtWlgg.TabIndex = 218;
- //
- // txt_kQty
- //
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
- 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(234, 24);
- this.txt_kQty.StyleController = this.layout99;
- this.txt_kQty.TabIndex = 224;
- //
- // txtQuantity
- //
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
- this.txtQuantity.Name = "txtQuantity";
- this.txtQuantity.Properties.Appearance.Options.UseFont = true;
- this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
- this.txtQuantity.StyleController = this.layout99;
- this.txtQuantity.TabIndex = 220;
- //
- // txt_yQty
- //
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
- 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(234, 24);
- this.txt_yQty.StyleController = this.layout99;
- this.txt_yQty.TabIndex = 222;
- //
- // layoutControlItem29
- //
- this.layoutControlItem29.Control = this.lbMxGuid;
- this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem29.Text = "lbMxGuid";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem29.TextVisible = false;
- //
- // layoutControlGroup1
- //
- this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.layoutControlGroup1.GroupBordersVisible = false;
- this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem22,
- this.layoutControlItem23,
- this.layoutControlItem24,
- this.layoutControlItem25,
- this.layoutControlItem26,
- this.layoutControlItem27,
- this.layoutControlItem28,
- this.layoutControlItem30,
- this.layoutControlItem31,
- this.layoutControlItem32});
- this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
- this.layoutControlGroup1.TextVisible = false;
- //
- // layoutControlItem22
- //
- 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(340, 32);
- this.layoutControlItem22.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txtWlmc;
- this.layoutControlItem23.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem23.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.Control = this.txtWlgg;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(680, 32);
- this.layoutControlItem24.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txtQuantity;
- this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.txt_yQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 32);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_kQty;
- this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_psnQty_1;
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 32);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem30
- //
- this.layoutControlItem30.Control = this.radOut;
- this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0);
- this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
- this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
- 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(340, 32);
- this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem30.Text = "鑷姩璁＄畻";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem30.TextVisible = false;
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32);
- this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
- this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
- 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(340, 32);
- this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem31.TextVisible = false;
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.layoutControl1;
- this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem32.TextVisible = false;
//
// gcMx1
//
@@ -1673,7 +1197,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1272, 193);
+ this.gcMx1.Size = new System.Drawing.Size(1272, 342);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2066,8 +1590,6 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.rptChongDa});
this.gcMx2.Size = new System.Drawing.Size(1272, 342);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2089,8 +1611,7 @@
this.gridColumn28,
this.gridColumn29,
this.gridColumn30,
- this.gridColumn31,
- this.gvBtnAlawys});
+ this.gridColumn31});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2235,27 +1756,6 @@
this.gridColumn31.VisibleIndex = 11;
this.gridColumn31.Width = 94;
//
- // gvBtnAlawys
- //
- this.gvBtnAlawys.Caption = "閲嶆墦";
- this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
- this.gvBtnAlawys.MinWidth = 25;
- this.gvBtnAlawys.Name = "gvBtnAlawys";
- this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 12;
- this.gvBtnAlawys.Width = 94;
- //
- // rptChongDa
- //
- this.rptChongDa.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.rptChongDa.Name = "rptChongDa";
- this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
- //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -2339,41 +1839,6 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
- this.split99.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
- this.split99.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
- this.split99.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
- this.layout99.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
- this.layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
@@ -2385,7 +1850,6 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -2484,16 +1948,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private UserControl.UcBtnPrint ucBtnPrint1;
- private DevExpress.XtraEditors.LabelControl lbMxGuid;
- private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.TextEdit txt_yQty;
- private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.TextEdit txtWlid;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
@@ -2527,29 +1981,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
- private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
- private DevExpress.XtraEditors.RadioGroup radOut;
- private DevExpress.XtraEditors.SplitContainerControl split99;
- private DevExpress.XtraLayout.LayoutControl layout99;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
- private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
}
}
\ 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 443f5a3..226ff69 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -75,49 +75,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- this.ucBtnPrint1.btnPrintClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
- 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_psnQty_1.TextChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
- };
-
- radOut.SelectedIndexChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
- };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -370,9 +327,9 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -383,10 +340,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -646,77 +605,6 @@
{
var strJson = UtilityHelper.HttpPost("",
_webServiceName + "DeleteModelOrMx",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
- {
- if (e.FocusedRowHandle >= 0)
- {
- DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
- lbMxGuid.Text = row["guid"].ToString();
- ucBtnPrint1.guidKey = row["guid"].ToString();
- txtWlid.Text = row["itemNo"].ToString();
- txtWlgg.Text = row["itemModel"].ToString();
- txtWlmc.Text = row["itemName"].ToString();
- txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺
- txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
- }
- else
- {
- lbMxGuid.Text = "";
- ucBtnPrint1.guidKey = "";
- txtWlid.Text = "";
- txtWlgg.Text = "";
- txtWlmc.Text = "";
- txtQuantity.Text = "";
- txt_yQty.Text = "";
- txt_kQty.Text = "";
- txt_psnQty_1.Text = "";
- txt_iCount_1.Text = "";
- }
- }
-
- /// <summary>
- /// 閲嶆墦
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
- return;
- var rowhandle = gvMx2.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx2.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var _obj = new
- {
- mxGuid = mxGuid,
- inType = "dhtm"
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "VArrivalBarcodeManager/DeleteBarcode",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d45399c..4892384 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -596,6 +596,12 @@
<Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
<DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs">
+ <DependentUpon>Frm_XsthDetect01.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\RkQC\RkDetect01.cs">
<SubType>UserControl</SubType>
</Compile>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 5d2a28b..e2c6889 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2438,6 +2438,7 @@
fqc,
鐢熶骇閫�鏂欏叆搴撴,
鍏跺畠鍏ュ簱妫�,
+ 閿�鍞��璐у叆搴撴,
瓒呮湡妫�
}
--
Gitblit v1.9.3