From e740617f4c4009642a3097afda28d557984f40e1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 08:28:34 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 35 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 22
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 4
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 3
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 16
DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.cs | 136 +++++++
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 239 ++++++------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 134 +++---
DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs | 376 +++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.resx | 120 ++++++
12 files changed, 889 insertions(+), 209 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3168274..7074e85 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 253d349..6fb41f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -38,6 +38,7 @@
this.toolZhiChi = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTime = new System.Windows.Forms.ToolStripStatusLabel();
this.toolVersion = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolFont = new System.Windows.Forms.ToolStripStatusLabel();
this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
this.barMy = new DevExpress.XtraBars.BarSubItem();
this.barExit = new DevExpress.XtraBars.BarButtonItem();
@@ -88,7 +89,8 @@
this.tooLoading,
this.toolZhiChi,
this.toolTime,
- this.toolVersion});
+ this.toolVersion,
+ this.toolFont});
this.strp1.Location = new System.Drawing.Point(0, 701);
this.strp1.Name = "strp1";
this.strp1.Size = new System.Drawing.Size(1022, 26);
@@ -106,8 +108,8 @@
//
this.toolZhiChi.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
this.toolZhiChi.Name = "toolZhiChi";
- this.toolZhiChi.Size = new System.Drawing.Size(194, 20);
- this.toolZhiChi.Text = "鎶�鏈敮鎸侊細瀹佹尝骞挎繁绉戞妧";
+ this.toolZhiChi.Size = new System.Drawing.Size(183, 20);
+ this.toolZhiChi.Text = "鎶�鏈敮鎸�:瀹佹尝骞挎繁绉戞妧";
//
// toolTime
//
@@ -122,6 +124,13 @@
this.toolVersion.Name = "toolVersion";
this.toolVersion.Size = new System.Drawing.Size(89, 20);
this.toolVersion.Text = "鐗堟湰淇℃伅";
+ //
+ // toolFont
+ //
+ this.toolFont.Image = global::Gs.DevApp.Properties.Resources.article_16x16;
+ this.toolFont.Name = "toolFont";
+ this.toolFont.Size = new System.Drawing.Size(89, 20);
+ this.toolFont.Text = "鐗堥潰淇℃伅";
//
// fluentDesignFormControl1
//
@@ -310,5 +319,6 @@
private DevExpress.XtraBars.BarEditItem barOrg;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
private System.Windows.Forms.ToolStripStatusLabel toolVersion;
+ private System.Windows.Forms.ToolStripStatusLabel toolFont;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 3aee6c8..bd2360f 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -1,6 +1,9 @@
锘縰sing DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
using DevExpress.XtraBars.Navigation;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.TextEditController;
+using DevExpress.XtraLayout;
using DevExpress.XtraTab;
using DevExpress.XtraTab.ViewInfo;
using Gs.DevApp.DevFrm.User;
@@ -14,7 +17,9 @@
using System.Configuration;
using System.Data;
using System.Drawing;
+using System.IO;
using System.Reflection;
+using System.Text;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -100,7 +105,7 @@
string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
string _version = ConfigurationManager.AppSettings["Version"];
- toolVersion.Text = "褰撳墠鐗堟湰:" + _version + "锛屾湇鍔″湴鍧�:" + _webApiUrl;
+ toolVersion.Text = "褰撳墠鐗堟湰:" + _version + ",鏈嶅姟Api:" + _webApiUrl;
#endregion
}
/// <summary>
@@ -400,6 +405,30 @@
newForm.Dock = DockStyle.Fill;
newForm.Visible = true;
shiXian(newForm, formName, InitializeVal);
+ #region 鍔犱笂搴曢儴鎻愰啋
+ string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
+ string _ver = "";
+ var _obj = new
+ {
+ formPath = formName,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "Fm/GetModelByVersion", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ _ver = _rtn.rtnData;
+ }
+ else
+ _ver = _rtn.rtnMsg;
+ }
+ catch (Exception ex)
+ {
+ _ver = ex.Message;
+ }
+ toolFont.Text = (",瀛椾綋:" + _strFont + ",绐椾綋:" + formName + ",鐗堥潰:" + _ver);
+ #endregion
return newForm;
}
catch (Exception)
@@ -492,9 +521,9 @@
private void GetOrg()
{
string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
- System.Text.StringBuilder sbSql= new System.Text.StringBuilder();
+ System.Text.StringBuilder sbSql = new System.Text.StringBuilder();
sbSql.Append(" and IS_STATUS=1");
- sbSql.Append(" and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where userGuid='"+ LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='缁勭粐' ) ");
+ sbSql.Append(" and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='缁勭粐' ) ");
var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, sbSql.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index c7a3bc0..932351e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -96,13 +96,13 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.layWeight = new DevExpress.XtraLayout.LayoutControl();
- this.txtW1 = new DevExpress.XtraEditors.TextEdit();
- this.txtW2 = new DevExpress.XtraEditors.TextEdit();
- this.txtW3 = new DevExpress.XtraEditors.TextEdit();
- this.txtW4 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight3 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight4 = new DevExpress.XtraEditors.TextEdit();
this.btnW = new DevExpress.XtraEditors.SimpleButton();
this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
- this.txtW5 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_weight5 = new DevExpress.XtraEditors.TextEdit();
this.btnClean = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -249,12 +249,12 @@
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layWeight)).BeginInit();
this.layWeight.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight4.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
@@ -894,13 +894,13 @@
// layWeight
//
this.layWeight.BackColor = System.Drawing.Color.LightBlue;
- this.layWeight.Controls.Add(this.txtW1);
- this.layWeight.Controls.Add(this.txtW2);
- this.layWeight.Controls.Add(this.txtW3);
- this.layWeight.Controls.Add(this.txtW4);
+ this.layWeight.Controls.Add(this.txt_weight1);
+ this.layWeight.Controls.Add(this.txt_weight2);
+ this.layWeight.Controls.Add(this.txt_weight3);
+ this.layWeight.Controls.Add(this.txt_weight4);
this.layWeight.Controls.Add(this.btnW);
this.layWeight.Controls.Add(this.txtWCurrent);
- this.layWeight.Controls.Add(this.txtW5);
+ this.layWeight.Controls.Add(this.txt_weight5);
this.layWeight.Controls.Add(this.btnClean);
this.layWeight.Location = new System.Drawing.Point(10, 227);
this.layWeight.Margin = new System.Windows.Forms.Padding(0);
@@ -910,41 +910,41 @@
this.layWeight.TabIndex = 818;
this.layWeight.Text = "layoutControl1";
//
- // txtW1
+ // txt_weight1
//
- this.txtW1.Location = new System.Drawing.Point(52, 2);
- this.txtW1.Name = "txtW1";
- this.txtW1.Properties.ReadOnly = true;
- this.txtW1.Size = new System.Drawing.Size(76, 24);
- this.txtW1.StyleController = this.layWeight;
- this.txtW1.TabIndex = 4;
+ this.txt_weight1.Location = new System.Drawing.Point(52, 2);
+ this.txt_weight1.Name = "txt_weight1";
+ this.txt_weight1.Properties.ReadOnly = true;
+ this.txt_weight1.Size = new System.Drawing.Size(76, 24);
+ this.txt_weight1.StyleController = this.layWeight;
+ this.txt_weight1.TabIndex = 4;
//
- // txtW2
+ // txt_weight2
//
- this.txtW2.Location = new System.Drawing.Point(182, 2);
- this.txtW2.Name = "txtW2";
- this.txtW2.Properties.ReadOnly = true;
- this.txtW2.Size = new System.Drawing.Size(79, 24);
- this.txtW2.StyleController = this.layWeight;
- this.txtW2.TabIndex = 5;
+ this.txt_weight2.Location = new System.Drawing.Point(182, 2);
+ this.txt_weight2.Name = "txt_weight2";
+ this.txt_weight2.Properties.ReadOnly = true;
+ this.txt_weight2.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight2.StyleController = this.layWeight;
+ this.txt_weight2.TabIndex = 5;
//
- // txtW3
+ // txt_weight3
//
- this.txtW3.Location = new System.Drawing.Point(315, 2);
- this.txtW3.Name = "txtW3";
- this.txtW3.Properties.ReadOnly = true;
- this.txtW3.Size = new System.Drawing.Size(79, 24);
- this.txtW3.StyleController = this.layWeight;
- this.txtW3.TabIndex = 6;
+ this.txt_weight3.Location = new System.Drawing.Point(315, 2);
+ this.txt_weight3.Name = "txt_weight3";
+ this.txt_weight3.Properties.ReadOnly = true;
+ this.txt_weight3.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight3.StyleController = this.layWeight;
+ this.txt_weight3.TabIndex = 6;
//
- // txtW4
+ // txt_weight4
//
- this.txtW4.Location = new System.Drawing.Point(448, 2);
- this.txtW4.Name = "txtW4";
- this.txtW4.Properties.ReadOnly = true;
- this.txtW4.Size = new System.Drawing.Size(79, 24);
- this.txtW4.StyleController = this.layWeight;
- this.txtW4.TabIndex = 7;
+ this.txt_weight4.Location = new System.Drawing.Point(448, 2);
+ this.txt_weight4.Name = "txt_weight4";
+ this.txt_weight4.Properties.ReadOnly = true;
+ this.txt_weight4.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight4.StyleController = this.layWeight;
+ this.txt_weight4.TabIndex = 7;
//
// btnW
//
@@ -963,19 +963,23 @@
//
this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
this.txtWCurrent.Name = "txtWCurrent";
+ this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
+ this.txtWCurrent.Properties.Appearance.Options.UseBackColor = true;
+ this.txtWCurrent.Properties.Appearance.Options.UseForeColor = true;
this.txtWCurrent.Properties.ReadOnly = true;
this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
this.txtWCurrent.StyleController = this.layWeight;
this.txtWCurrent.TabIndex = 10;
//
- // txtW5
+ // txt_weight5
//
- this.txtW5.Location = new System.Drawing.Point(581, 2);
- this.txtW5.Name = "txtW5";
- this.txtW5.Properties.ReadOnly = true;
- this.txtW5.Size = new System.Drawing.Size(79, 24);
- this.txtW5.StyleController = this.layWeight;
- this.txtW5.TabIndex = 11;
+ this.txt_weight5.Location = new System.Drawing.Point(581, 2);
+ this.txt_weight5.Name = "txt_weight5";
+ this.txt_weight5.Properties.ReadOnly = true;
+ this.txt_weight5.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight5.StyleController = this.layWeight;
+ this.txt_weight5.TabIndex = 11;
//
// btnClean
//
@@ -1038,7 +1042,7 @@
//
// layoutControlItem31
//
- this.layoutControlItem31.Control = this.txtW1;
+ this.layoutControlItem31.Control = this.txt_weight1;
this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
@@ -1047,7 +1051,7 @@
//
// layoutControlItem32
//
- this.layoutControlItem32.Control = this.txtW2;
+ this.layoutControlItem32.Control = this.txt_weight2;
this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1057,7 +1061,7 @@
//
// layoutControlItem33
//
- this.layoutControlItem33.Control = this.txtW3;
+ this.layoutControlItem33.Control = this.txt_weight3;
this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1067,7 +1071,7 @@
//
// layoutControlItem34
//
- this.layoutControlItem34.Control = this.txtW4;
+ this.layoutControlItem34.Control = this.txt_weight4;
this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1099,7 +1103,7 @@
//
// layoutControlItem35
//
- this.layoutControlItem35.Control = this.txtW5;
+ this.layoutControlItem35.Control = this.txt_weight5;
this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
@@ -2471,12 +2475,12 @@
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layWeight)).EndInit();
this.layWeight.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight4.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_weight5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
@@ -2735,10 +2739,10 @@
private DevExpress.XtraLayout.LayoutControl layWeight;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraEditors.TextEdit txtW1;
- private DevExpress.XtraEditors.TextEdit txtW2;
- private DevExpress.XtraEditors.TextEdit txtW3;
- private DevExpress.XtraEditors.TextEdit txtW4;
+ private DevExpress.XtraEditors.TextEdit txt_weight1;
+ private DevExpress.XtraEditors.TextEdit txt_weight2;
+ private DevExpress.XtraEditors.TextEdit txt_weight3;
+ private DevExpress.XtraEditors.TextEdit txt_weight4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
@@ -2748,7 +2752,7 @@
private DevExpress.XtraEditors.TextEdit txtWCurrent;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraEditors.TextEdit txtW5;
+ private DevExpress.XtraEditors.TextEdit txt_weight5;
private DevExpress.XtraEditors.SimpleButton btnClean;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 90482ae..9b68dc3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -124,27 +124,27 @@
ToolBox.MsgHelper.ShowError("璇锋鏌ョО閲嶈缃紒");
return;
}
- if (txtW1.Text.Trim().Length <= 0)
+ if (txt_weight1.Text.Trim().Length <= 0)
{
_setWeigth(1, _strCurrent);
return;
}
- if (txtW2.Text.Trim().Length <= 0)
+ if (txt_weight2.Text.Trim().Length <= 0)
{
_setWeigth(2, _strCurrent);
return;
}
- if (txtW3.Text.Trim().Length <= 0)
+ if (txt_weight3.Text.Trim().Length <= 0)
{
_setWeigth(3, _strCurrent);
return;
}
- if (txtW4.Text.Trim().Length <= 0)
+ if (txt_weight4.Text.Trim().Length <= 0)
{
_setWeigth(4, _strCurrent);
return;
}
- if (txtW5.Text.Trim().Length <= 0)
+ if (txt_weight5.Text.Trim().Length <= 0)
{
_setWeigth(5, _strCurrent);
return;
@@ -188,32 +188,32 @@
{
if (_weightType == 1)
{
- txtW1.Text = _weight;
+ txt_weight1.Text = _weight;
return;
}
if (_weightType == 2)
{
- txtW2.Text = _weight;
+ txt_weight2.Text = _weight;
return;
}
if (_weightType == 3)
{
- txtW3.Text = _weight;
+ txt_weight3.Text = _weight;
return;
}
if (_weightType == 4)
{
- txtW4.Text = _weight;
+ txt_weight4.Text = _weight;
return;
}
if (_weightType == 5)
{
- txtW5.Text = _weight;
+ txt_weight5.Text = _weight;
return;
}
if (_weightType == 99)
{
- this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
+ this.txt_weight1.Text = this.txt_weight2.Text = this.txt_weight3.Text = this.txt_weight4.Text = this.txt_weight5.Text = "";
return;
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs
new file mode 100644
index 0000000..c90cc26
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs
@@ -0,0 +1,376 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+ partial class CkKuCun
+ {
+ /// <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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = "鏌ヨ";
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ 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(4);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gv_itemId,
+ this.gridColumn3,
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gv_quantity,
+ this.gv_depotId,
+ this.gridColumn6,
+ this.gridColumn1,
+ this.gridColumn5,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9,
+ this.gridColumn10});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowFooter = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭GUID";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gv_itemId
+ //
+ this.gv_itemId.AppearanceCell.Options.UseFont = true;
+ this.gv_itemId.Caption = "鐗╂枡ID ";
+ this.gv_itemId.FieldName = "itemId";
+ this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.Name = "gv_itemId";
+ this.gv_itemId.OptionsColumn.AllowEdit = false;
+ this.gv_itemId.Tag = "query_a.ITEM_ID";
+ this.gv_itemId.Width = 73;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 73;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn2.FieldName = "itemName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 73;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn4.FieldName = "itemModel";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.Width = 73;
+ //
+ // gv_quantity
+ //
+ this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceCell.Options.UseFont = true;
+ this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
+ this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_quantity.Caption = "Mes搴撳瓨 ";
+ this.gv_quantity.FieldName = "kcQty";
+ this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.Name = "gv_quantity";
+ this.gv_quantity.OptionsColumn.AllowEdit = false;
+ this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
+ this.gv_quantity.Tag = "query_a.QUANTITY";
+ this.gv_quantity.Visible = true;
+ this.gv_quantity.VisibleIndex = 4;
+ this.gv_quantity.Width = 73;
+ //
+ // gv_depotId
+ //
+ this.gv_depotId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotId.Caption = "浠撳簱ID";
+ this.gv_depotId.FieldName = "ckId";
+ this.gv_depotId.MinWidth = 50;
+ this.gv_depotId.Name = "gv_depotId";
+ this.gv_depotId.OptionsColumn.AllowEdit = false;
+ this.gv_depotId.Tag = "query_a.DEPOT_ID";
+ this.gv_depotId.Width = 73;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "浠撳簱缂栧彿";
+ this.gridColumn6.FieldName = "ckNo";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 2;
+ this.gridColumn6.Width = 73;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn1.FieldName = "ckName";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 73;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "缁勭粐";
+ this.gridColumn5.FieldName = "orgName";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "Erp搴撳瓨鐘舵��";
+ this.gridColumn7.FieldName = "erpKcZt";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 9;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍗曚綅";
+ this.gridColumn8.FieldName = "dwName";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn9.Caption = "Erp搴撳瓨";
+ this.gridColumn9.FieldName = "erpKcQty";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 5;
+ this.gridColumn9.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn10.Caption = "宸紓";
+ this.gridColumn10.FieldName = "kcCy";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 6;
+ this.gridColumn10.Width = 94;
+ //
+ // 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.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // CkKuCun
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Name = "CkKuCun";
+ this.Text = "鍗虫椂搴撳瓨宸紓琛�";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.cs
new file mode 100644
index 0000000..f9648c6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.cs
@@ -0,0 +1,136 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+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.Rpt
+{
+ public partial class CkKuCun : DevExpress.XtraEditors.XtraForm
+ {
+ string _webServiceName = "Ck/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public CkKuCun()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ //{
+ //}, (value) =>
+ //{
+ // getPageList(this.pageBar1.CurrentPage);
+ //}, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ }
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageJskc", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.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/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 49d1e33..7703225 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -633,9 +633,8 @@
this.gv_batchNo.MinWidth = 25;
this.gv_batchNo.Name = "gv_batchNo";
this.gv_batchNo.OptionsColumn.AllowEdit = false;
+ this.gv_batchNo.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
this.gv_batchNo.Tag = "query_a.BATCH_NO";
- this.gv_batchNo.Visible = true;
- this.gv_batchNo.VisibleIndex = 19;
this.gv_batchNo.Width = 94;
//
// gv_bomVersion
@@ -647,8 +646,6 @@
this.gv_bomVersion.Name = "gv_bomVersion";
this.gv_bomVersion.OptionsColumn.AllowEdit = false;
this.gv_bomVersion.Tag = "query_a.BOM_VERSION";
- this.gv_bomVersion.Visible = true;
- this.gv_bomVersion.VisibleIndex = 20;
this.gv_bomVersion.Width = 94;
//
// gv_generationMethod
@@ -661,7 +658,7 @@
this.gv_generationMethod.OptionsColumn.AllowEdit = false;
this.gv_generationMethod.Tag = "query_a.GENERATION_METHOD";
this.gv_generationMethod.Visible = true;
- this.gv_generationMethod.VisibleIndex = 21;
+ this.gv_generationMethod.VisibleIndex = 19;
this.gv_generationMethod.Width = 94;
//
// gv_demandOrderNo
@@ -673,8 +670,6 @@
this.gv_demandOrderNo.Name = "gv_demandOrderNo";
this.gv_demandOrderNo.OptionsColumn.AllowEdit = false;
this.gv_demandOrderNo.Tag = "query_a.DEMAND_ORDER_NO";
- this.gv_demandOrderNo.Visible = true;
- this.gv_demandOrderNo.VisibleIndex = 22;
this.gv_demandOrderNo.Width = 94;
//
// gv_demandOrderLineNo
@@ -686,8 +681,6 @@
this.gv_demandOrderLineNo.Name = "gv_demandOrderLineNo";
this.gv_demandOrderLineNo.OptionsColumn.AllowEdit = false;
this.gv_demandOrderLineNo.Tag = "query_a.DEMAND_ORDER_LINE_NO";
- this.gv_demandOrderLineNo.Visible = true;
- this.gv_demandOrderLineNo.VisibleIndex = 23;
this.gv_demandOrderLineNo.Width = 60;
//
// gv_closingPerson
@@ -722,7 +715,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 24;
+ this.gv_remarks.VisibleIndex = 20;
this.gv_remarks.Width = 94;
//
// gv_purchaseorderno
@@ -735,7 +728,7 @@
this.gv_purchaseorderno.OptionsColumn.AllowEdit = false;
this.gv_purchaseorderno.Tag = "query_a.PURCHASEORDERNO";
this.gv_purchaseorderno.Visible = true;
- this.gv_purchaseorderno.VisibleIndex = 25;
+ this.gv_purchaseorderno.VisibleIndex = 21;
this.gv_purchaseorderno.Width = 94;
//
// gv_purchaseorderentryseq
@@ -748,7 +741,7 @@
this.gv_purchaseorderentryseq.OptionsColumn.AllowEdit = false;
this.gv_purchaseorderentryseq.Tag = "query_a.PURCHASEORDERENTRYSEQ";
this.gv_purchaseorderentryseq.Visible = true;
- this.gv_purchaseorderentryseq.VisibleIndex = 26;
+ this.gv_purchaseorderentryseq.VisibleIndex = 22;
this.gv_purchaseorderentryseq.Width = 70;
//
// gv_auditor
@@ -803,7 +796,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 27;
+ this.gridColumn7.VisibleIndex = 23;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -813,7 +806,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 28;
+ this.gridColumn14.VisibleIndex = 24;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -948,7 +941,7 @@
this.txt_stockownerName.Location = new System.Drawing.Point(114, 208);
this.txt_stockownerName.Name = "txt_stockownerName";
this.txt_stockownerName.Properties.Appearance.Options.UseFont = true;
- this.txt_stockownerName.Size = new System.Drawing.Size(165, 24);
+ this.txt_stockownerName.Size = new System.Drawing.Size(170, 24);
this.txt_stockownerName.StyleController = this.layoutMx1;
this.txt_stockownerName.TabIndex = 664;
//
@@ -957,79 +950,79 @@
this.txt_orderNo.Location = new System.Drawing.Point(114, 12);
this.txt_orderNo.Name = "txt_orderNo";
this.txt_orderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_orderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_orderNo.Size = new System.Drawing.Size(170, 24);
this.txt_orderNo.StyleController = this.layoutMx1;
this.txt_orderNo.TabIndex = 211;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(656, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(666, 96);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(165, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(170, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 662;
//
// txt_orderType
//
- this.txt_orderType.Location = new System.Drawing.Point(385, 12);
+ this.txt_orderType.Location = new System.Drawing.Point(390, 12);
this.txt_orderType.Name = "txt_orderType";
this.txt_orderType.Properties.Appearance.Options.UseFont = true;
- this.txt_orderType.Size = new System.Drawing.Size(165, 24);
+ this.txt_orderType.Size = new System.Drawing.Size(170, 24);
this.txt_orderType.StyleController = this.layoutMx1;
this.txt_orderType.TabIndex = 219;
//
// txt_auditDate
//
- this.txt_auditDate.Location = new System.Drawing.Point(927, 152);
+ this.txt_auditDate.Location = new System.Drawing.Point(942, 152);
this.txt_auditDate.Name = "txt_auditDate";
this.txt_auditDate.Properties.Appearance.Options.UseFont = true;
- this.txt_auditDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_auditDate.Size = new System.Drawing.Size(172, 24);
this.txt_auditDate.StyleController = this.layoutMx1;
this.txt_auditDate.TabIndex = 532;
//
// txt_planConfirmation
//
- this.txt_planConfirmation.Location = new System.Drawing.Point(927, 124);
+ this.txt_planConfirmation.Location = new System.Drawing.Point(942, 124);
this.txt_planConfirmation.Name = "txt_planConfirmation";
this.txt_planConfirmation.Properties.Appearance.Options.UseFont = true;
- this.txt_planConfirmation.Size = new System.Drawing.Size(166, 24);
+ this.txt_planConfirmation.Size = new System.Drawing.Size(172, 24);
this.txt_planConfirmation.StyleController = this.layoutMx1;
this.txt_planConfirmation.TabIndex = 627;
//
// txt_workOrderQty
//
- this.txt_workOrderQty.Location = new System.Drawing.Point(656, 12);
+ this.txt_workOrderQty.Location = new System.Drawing.Point(666, 12);
this.txt_workOrderQty.Name = "txt_workOrderQty";
this.txt_workOrderQty.Properties.Appearance.Options.UseFont = true;
- this.txt_workOrderQty.Size = new System.Drawing.Size(165, 24);
+ this.txt_workOrderQty.Size = new System.Drawing.Size(170, 24);
this.txt_workOrderQty.StyleController = this.layoutMx1;
this.txt_workOrderQty.TabIndex = 231;
//
// txt_auditStatus
//
- this.txt_auditStatus.Location = new System.Drawing.Point(927, 208);
+ this.txt_auditStatus.Location = new System.Drawing.Point(942, 208);
this.txt_auditStatus.Name = "txt_auditStatus";
this.txt_auditStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_auditStatus.Size = new System.Drawing.Size(166, 24);
+ this.txt_auditStatus.Size = new System.Drawing.Size(172, 24);
this.txt_auditStatus.StyleController = this.layoutMx1;
this.txt_auditStatus.TabIndex = 507;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(385, 68);
+ this.txt_itemName.Location = new System.Drawing.Point(390, 68);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(165, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(170, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 660;
//
// txt_businessStatusTxt
//
- this.txt_businessStatusTxt.Location = new System.Drawing.Point(927, 12);
+ this.txt_businessStatusTxt.Location = new System.Drawing.Point(942, 12);
this.txt_businessStatusTxt.Name = "txt_businessStatusTxt";
this.txt_businessStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_businessStatusTxt.Size = new System.Drawing.Size(166, 24);
+ this.txt_businessStatusTxt.Size = new System.Drawing.Size(172, 24);
this.txt_businessStatusTxt.StyleController = this.layoutMx1;
this.txt_businessStatusTxt.TabIndex = 222;
//
@@ -1047,43 +1040,43 @@
this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(114, 40);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
this.txt_erpProductionOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(170, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 319;
//
// txt_auditor
//
- this.txt_auditor.Location = new System.Drawing.Point(927, 180);
+ this.txt_auditor.Location = new System.Drawing.Point(942, 180);
this.txt_auditor.Name = "txt_auditor";
this.txt_auditor.Properties.Appearance.Options.UseFont = true;
- this.txt_auditor.Size = new System.Drawing.Size(166, 24);
+ this.txt_auditor.Size = new System.Drawing.Size(172, 24);
this.txt_auditor.StyleController = this.layoutMx1;
this.txt_auditor.TabIndex = 519;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(385, 208);
+ this.txt_remarks.Location = new System.Drawing.Point(390, 208);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(436, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(446, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 397;
//
// txt_trackingNo
//
- this.txt_trackingNo.Location = new System.Drawing.Point(385, 40);
+ this.txt_trackingNo.Location = new System.Drawing.Point(390, 40);
this.txt_trackingNo.Name = "txt_trackingNo";
this.txt_trackingNo.Properties.Appearance.Options.UseFont = true;
- this.txt_trackingNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_trackingNo.Size = new System.Drawing.Size(170, 24);
this.txt_trackingNo.StyleController = this.layoutMx1;
this.txt_trackingNo.TabIndex = 267;
//
// txt_yrkQty
//
- this.txt_yrkQty.Location = new System.Drawing.Point(656, 40);
+ this.txt_yrkQty.Location = new System.Drawing.Point(666, 40);
this.txt_yrkQty.Name = "txt_yrkQty";
this.txt_yrkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_yrkQty.Size = new System.Drawing.Size(165, 24);
+ this.txt_yrkQty.Size = new System.Drawing.Size(170, 24);
this.txt_yrkQty.StyleController = this.layoutMx1;
this.txt_yrkQty.TabIndex = 471;
//
@@ -1101,7 +1094,7 @@
this.txt_itemNo.Location = new System.Drawing.Point(114, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 226;
//
@@ -1110,16 +1103,16 @@
this.txt_purchaseorderno.Location = new System.Drawing.Point(114, 96);
this.txt_purchaseorderno.Name = "txt_purchaseorderno";
this.txt_purchaseorderno.Properties.Appearance.Options.UseFont = true;
- this.txt_purchaseorderno.Size = new System.Drawing.Size(165, 24);
+ this.txt_purchaseorderno.Size = new System.Drawing.Size(170, 24);
this.txt_purchaseorderno.StyleController = this.layoutMx1;
this.txt_purchaseorderno.TabIndex = 427;
//
// txt_demandOrderNo
//
- this.txt_demandOrderNo.Location = new System.Drawing.Point(385, 96);
+ this.txt_demandOrderNo.Location = new System.Drawing.Point(390, 96);
this.txt_demandOrderNo.Name = "txt_demandOrderNo";
this.txt_demandOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_demandOrderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_demandOrderNo.Size = new System.Drawing.Size(170, 24);
this.txt_demandOrderNo.StyleController = this.layoutMx1;
this.txt_demandOrderNo.TabIndex = 351;
//
@@ -1128,43 +1121,43 @@
this.txt_purchaseorderentryseq.Location = new System.Drawing.Point(114, 124);
this.txt_purchaseorderentryseq.Name = "txt_purchaseorderentryseq";
this.txt_purchaseorderentryseq.Properties.Appearance.Options.UseFont = true;
- this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(165, 24);
+ this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(170, 24);
this.txt_purchaseorderentryseq.StyleController = this.layoutMx1;
this.txt_purchaseorderentryseq.TabIndex = 438;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(656, 124);
+ this.txt_dwName.Location = new System.Drawing.Point(666, 124);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(165, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(170, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 228;
//
// txt_closingType
//
- this.txt_closingType.Location = new System.Drawing.Point(385, 180);
+ this.txt_closingType.Location = new System.Drawing.Point(390, 180);
this.txt_closingType.Name = "txt_closingType";
this.txt_closingType.Properties.Appearance.Options.UseFont = true;
- this.txt_closingType.Size = new System.Drawing.Size(165, 24);
+ this.txt_closingType.Size = new System.Drawing.Size(170, 24);
this.txt_closingType.StyleController = this.layoutMx1;
this.txt_closingType.TabIndex = 378;
//
// txt_estimatedStartTime
//
- this.txt_estimatedStartTime.Location = new System.Drawing.Point(927, 40);
+ this.txt_estimatedStartTime.Location = new System.Drawing.Point(942, 40);
this.txt_estimatedStartTime.Name = "txt_estimatedStartTime";
this.txt_estimatedStartTime.Properties.Appearance.Options.UseFont = true;
- this.txt_estimatedStartTime.Size = new System.Drawing.Size(166, 24);
+ this.txt_estimatedStartTime.Size = new System.Drawing.Size(172, 24);
this.txt_estimatedStartTime.StyleController = this.layoutMx1;
this.txt_estimatedStartTime.TabIndex = 243;
//
// txt_demandOrderLineNo
//
- this.txt_demandOrderLineNo.Location = new System.Drawing.Point(385, 124);
+ this.txt_demandOrderLineNo.Location = new System.Drawing.Point(390, 124);
this.txt_demandOrderLineNo.Name = "txt_demandOrderLineNo";
this.txt_demandOrderLineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_demandOrderLineNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_demandOrderLineNo.Size = new System.Drawing.Size(170, 24);
this.txt_demandOrderLineNo.StyleController = this.layoutMx1;
this.txt_demandOrderLineNo.TabIndex = 360;
//
@@ -1173,34 +1166,34 @@
this.txt_sourceOrderNo.Location = new System.Drawing.Point(114, 180);
this.txt_sourceOrderNo.Name = "txt_sourceOrderNo";
this.txt_sourceOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_sourceOrderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_sourceOrderNo.Size = new System.Drawing.Size(170, 24);
this.txt_sourceOrderNo.StyleController = this.layoutMx1;
this.txt_sourceOrderNo.TabIndex = 336;
//
// txt_closingPerson
//
- this.txt_closingPerson.Location = new System.Drawing.Point(385, 152);
+ this.txt_closingPerson.Location = new System.Drawing.Point(390, 152);
this.txt_closingPerson.Name = "txt_closingPerson";
this.txt_closingPerson.Properties.Appearance.Options.UseFont = true;
- this.txt_closingPerson.Size = new System.Drawing.Size(165, 24);
+ this.txt_closingPerson.Size = new System.Drawing.Size(170, 24);
this.txt_closingPerson.StyleController = this.layoutMx1;
this.txt_closingPerson.TabIndex = 370;
//
// txt_storageUpperLimit
//
- this.txt_storageUpperLimit.Location = new System.Drawing.Point(656, 152);
+ this.txt_storageUpperLimit.Location = new System.Drawing.Point(666, 152);
this.txt_storageUpperLimit.Name = "txt_storageUpperLimit";
this.txt_storageUpperLimit.Properties.Appearance.Options.UseFont = true;
- this.txt_storageUpperLimit.Size = new System.Drawing.Size(165, 24);
+ this.txt_storageUpperLimit.Size = new System.Drawing.Size(170, 24);
this.txt_storageUpperLimit.StyleController = this.layoutMx1;
this.txt_storageUpperLimit.TabIndex = 258;
//
// txt_estimatedEndTime
//
- this.txt_estimatedEndTime.Location = new System.Drawing.Point(927, 68);
+ this.txt_estimatedEndTime.Location = new System.Drawing.Point(942, 68);
this.txt_estimatedEndTime.Name = "txt_estimatedEndTime";
this.txt_estimatedEndTime.Properties.Appearance.Options.UseFont = true;
- this.txt_estimatedEndTime.Size = new System.Drawing.Size(166, 24);
+ this.txt_estimatedEndTime.Size = new System.Drawing.Size(172, 24);
this.txt_estimatedEndTime.StyleController = this.layoutMx1;
this.txt_estimatedEndTime.TabIndex = 247;
//
@@ -1209,33 +1202,33 @@
this.txt_bomVersion.Location = new System.Drawing.Point(114, 152);
this.txt_bomVersion.Name = "txt_bomVersion";
this.txt_bomVersion.Properties.Appearance.Options.UseFont = true;
- this.txt_bomVersion.Size = new System.Drawing.Size(165, 24);
+ this.txt_bomVersion.Size = new System.Drawing.Size(170, 24);
this.txt_bomVersion.StyleController = this.layoutMx1;
this.txt_bomVersion.TabIndex = 280;
//
// txt_storageLowerLimit
//
- this.txt_storageLowerLimit.Location = new System.Drawing.Point(656, 180);
+ this.txt_storageLowerLimit.Location = new System.Drawing.Point(666, 180);
this.txt_storageLowerLimit.Name = "txt_storageLowerLimit";
this.txt_storageLowerLimit.Properties.Appearance.Options.UseFont = true;
- this.txt_storageLowerLimit.Size = new System.Drawing.Size(165, 24);
+ this.txt_storageLowerLimit.Size = new System.Drawing.Size(170, 24);
this.txt_storageLowerLimit.StyleController = this.layoutMx1;
this.txt_storageLowerLimit.TabIndex = 262;
//
// txt_planReleaseDate
//
- this.txt_planReleaseDate.Location = new System.Drawing.Point(927, 96);
+ this.txt_planReleaseDate.Location = new System.Drawing.Point(942, 96);
this.txt_planReleaseDate.Name = "txt_planReleaseDate";
this.txt_planReleaseDate.Properties.Appearance.Options.UseFont = true;
- this.txt_planReleaseDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_planReleaseDate.Size = new System.Drawing.Size(172, 24);
this.txt_planReleaseDate.StyleController = this.layoutMx1;
this.txt_planReleaseDate.TabIndex = 252;
//
// txt_wrkQty
//
- this.txt_wrkQty.Location = new System.Drawing.Point(656, 68);
+ this.txt_wrkQty.Location = new System.Drawing.Point(666, 68);
this.txt_wrkQty.Name = "txt_wrkQty";
- this.txt_wrkQty.Size = new System.Drawing.Size(165, 24);
+ this.txt_wrkQty.Size = new System.Drawing.Size(170, 24);
this.txt_wrkQty.StyleController = this.layoutMx1;
this.txt_wrkQty.TabIndex = 667;
//
@@ -1359,7 +1352,7 @@
rowDefinition6,
rowDefinition7,
rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1105, 244);
+ this.Root.Size = new System.Drawing.Size(1126, 244);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1367,37 +1360,37 @@
this.layoutControlItem1.Control = this.txt_orderNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem1.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_orderType;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_workOrderQty;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_businessStatusTxt;
- this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem4.Text = "涓氬姟鐘舵��";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1407,29 +1400,29 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_trackingNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem6.Text = "璁″垝璺熻釜鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_yrkQty;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(552, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1439,18 +1432,18 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem9.Text = "浜у搧缂栫爜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem10.Location = new System.Drawing.Point(276, 56);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1460,18 +1453,18 @@
this.layoutControlItem12.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem12.Text = "閲囪喘璁㈠崟";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_demandOrderNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 84);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem13.Text = "闇�姹傚崟鎹彿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1481,18 +1474,18 @@
this.layoutControlItem16.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem16.Text = "閲囪喘鍗曡鍙�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_demandOrderLineNo;
- this.layoutControlItem17.Location = new System.Drawing.Point(271, 112);
+ this.layoutControlItem17.Location = new System.Drawing.Point(276, 112);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem17.Text = "闇�姹傚崟鎹鍙�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1502,18 +1495,18 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 140);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem20.Text = "BOM鐗堟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_closingPerson;
- this.layoutControlItem21.Location = new System.Drawing.Point(271, 140);
+ this.layoutControlItem21.Location = new System.Drawing.Point(276, 140);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem21.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem21.Text = "缁撴浜哄憳";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1523,18 +1516,18 @@
this.layoutControlItem24.Location = new System.Drawing.Point(0, 168);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem24.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem24.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem24.Text = "婧愬崟缂栧彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_closingType;
- this.layoutControlItem25.Location = new System.Drawing.Point(271, 168);
+ this.layoutControlItem25.Location = new System.Drawing.Point(276, 168);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem25.Text = "缁撴绫诲瀷";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1544,7 +1537,7 @@
this.layoutControlItem33.Location = new System.Drawing.Point(0, 196);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem33.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem33.Text = "鍏ュ簱璐т富";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1552,22 +1545,22 @@
//
this.layoutControlItem15.Control = this.txt_estimatedStartTime;
this.layoutControlItem15.CustomizationFormText = "Erp棰勮寮�宸�";
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem15.Text = "Erp棰勮寮�宸�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_estimatedEndTime;
- this.layoutControlItem19.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem19.Location = new System.Drawing.Point(828, 56);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem19.Text = "Erp棰勮瀹屽伐";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1575,22 +1568,22 @@
//
this.layoutControlItem23.Control = this.txt_planReleaseDate;
this.layoutControlItem23.CustomizationFormText = "Erp璁″垝涓嬭揪";
- this.layoutControlItem23.Location = new System.Drawing.Point(813, 84);
+ this.layoutControlItem23.Location = new System.Drawing.Point(828, 84);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem23.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem23.Text = "Erp璁″垝涓嬭揪";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_planConfirmation;
- this.layoutControlItem27.Location = new System.Drawing.Point(813, 112);
+ this.layoutControlItem27.Location = new System.Drawing.Point(828, 112);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem27.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem27.Text = "Erp璁″垝纭";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1598,100 +1591,100 @@
//
this.layoutControlItem31.Control = this.txt_auditDate;
this.layoutControlItem31.CustomizationFormText = "Mes瀹℃牳鏃堕棿";
- this.layoutControlItem31.Location = new System.Drawing.Point(813, 140);
+ this.layoutControlItem31.Location = new System.Drawing.Point(828, 140);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem31.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem31.Text = "Mes瀹℃牳鏃堕棿";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_auditor;
- this.layoutControlItem26.Location = new System.Drawing.Point(813, 168);
+ this.layoutControlItem26.Location = new System.Drawing.Point(828, 168);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem26.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem26.Text = "Mes瀹℃牳浜哄憳";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_auditStatus;
- this.layoutControlItem30.Location = new System.Drawing.Point(813, 196);
+ this.layoutControlItem30.Location = new System.Drawing.Point(828, 196);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem30.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem30.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem30.Text = "Mes瀹℃牳鐘舵��";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_storageLowerLimit;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 168);
+ this.layoutControlItem22.Location = new System.Drawing.Point(552, 168);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem22.Text = "鍏ュ簱涓嬮檺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_storageUpperLimit;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 140);
+ this.layoutControlItem18.Location = new System.Drawing.Point(552, 140);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem18.Text = "鍏ュ簱涓婇檺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dwName;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(552, 112);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem14.Text = "鍗曚綅";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 84);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 84);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_wrkQty;
- this.layoutControlItem35.Location = new System.Drawing.Point(542, 56);
+ this.layoutControlItem35.Location = new System.Drawing.Point(552, 56);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem35.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem35.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem35.Text = "鏈叆搴撴暟";
this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_remarks;
- this.layoutControlItem28.Location = new System.Drawing.Point(271, 196);
+ this.layoutControlItem28.Location = new System.Drawing.Point(276, 196);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(552, 28);
this.layoutControlItem28.Text = "澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 2da2b2e..74e30c4 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -764,6 +764,12 @@
<Compile Include="DevFrm\Rpt\Ckcgmx.Designer.cs">
<DependentUpon>Ckcgmx.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\CkKuCun.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CkKuCun.Designer.cs">
+ <DependentUpon>CkKuCun.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\CKTmkc.cs">
<SubType>Form</SubType>
</Compile>
@@ -1849,6 +1855,9 @@
<EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx">
<DependentUpon>Ckcgmx.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\CkKuCun.resx">
+ <DependentUpon>CkKuCun.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
<DependentUpon>CKTmkc.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 894d7c2..2a3bea3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -620,7 +620,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -649,7 +649,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 69);
+ this.Size = new System.Drawing.Size(1543, 72);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index da1b4e2..203fcb5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -438,6 +438,7 @@
lst.Add(btnLianBan.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -490,6 +491,7 @@
lst.Add(btnLianBan.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
}
}
@@ -515,6 +517,7 @@
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
--
Gitblit v1.9.3