From c9f2d8386d02da81fe65479e7ecd53fc0c8c7569 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 01 十一月 2021 10:24:24 +0800
Subject: [PATCH] nothing
---
BaseSet/公用资料/生产基础资料/Gy_Process.cs | 69 +
LMES/ClsShowMod.cs | 2
WorkM/流转卡管理/MES_StationOutBill.cs | 4
WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs | 6
WarM/条码打印/Gy_BarCodeBill.cs | 4
WebAPI/Models/Gy_OrderLevList.cs | 24
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 12
BaseSet/公用资料/生产基础资料/Gy_Process.resx | 140 +-
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 57
WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs | 62
Model/基础资料/基础资料/ClsGy_Process_Model.cs | 2
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 377 +++++--
WebAPI/Models/Gy_WorkPayType.cs | 9
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs | 4
WorkM/流转卡管理/MES_StationOutBill.designer.cs | 1619 +++++++++++++++++--------------
WebAPI/Models/Gy_OrderBackInfo.cs | 20
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 57
WebAPI/DLL/ClsGy_EquipFileMain.cs | 23
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs | 68
WebAPI/Controllers/PublicPageMethodController.cs | 6
BaseSet/BaseSet.csproj.user | 2
WebAPI/Models/Gy_WorkType.cs | 6
WebAPI/Models/ClsGy_EquipFileMain.cs | 35
WarM/条码打印/Gy_BarCodeBill.designer.cs | 5
DAL/基础资料/公用基础资料/ClsGy_Process_Ctl.cs | 10
DAL/基础资料/公用基础资料/ClsGy_Process_View.cs | 2
WebAPI/WebAPI.csproj | 11
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 356 +++++++
WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs | 4
29 files changed, 1,926 insertions(+), 1,070 deletions(-)
diff --git a/BaseSet/BaseSet.csproj.user b/BaseSet/BaseSet.csproj.user
index eca3abc..1c6f68c 100644
--- a/BaseSet/BaseSet.csproj.user
+++ b/BaseSet/BaseSet.csproj.user
@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index 5dd9a26..d66843d 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -444,6 +444,7 @@
DAL.ClsIF_Department_View oDept = new DAL.ClsIF_Department_View();
//DAL.ClsK3_Process_View oProc = new DAL.ClsK3_Process_View();
DAL.ClsGy_ProcMul_View oPm = new DAL.ClsGy_ProcMul_View();
+ DAL.ClsGy_Warehouse_View oWH = new DAL.ClsGy_Warehouse_View();
if (oProcHlp.GetInfoByID(sItemID))
{
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
@@ -481,6 +482,27 @@
{
txtHProcMulID.Text = "";
}
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HBadWHID))
+ {
+ txtHBadWHID.Text = oWH.omodel.HName;
+ txtHBadWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHBadWHID.Text = "";
+ }
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWasterWHID))
+ {
+ txtHWasterWHID.Text = oWH.omodel.HName;
+ txtHWasterWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWasterWHID.Text = "";
+ }
+ //
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
txtHRemark.Text = oProcHlp.omodel.HRemark;
txtHProcCheckNote.Text = oProcHlp.omodel.HProcCheckNote;
@@ -489,6 +511,7 @@
txtHFixPrice.Text = oProcHlp.omodel.HFixPrice.ToString();
txtHOverFixPrice.Text = oProcHlp.omodel.HOverFixPrice.ToString();
cmbHBillSubType.Text = oProcHlp.omodel.HBillSubType;
+
if (oProcHlp.omodel.HStopflag)
chkHStopflag.Checked = true;
else
@@ -584,6 +607,8 @@
oProc.oModel.HFixPrice = DBUtility.ClsPub.isDoule(txtHFixPrice.Text);
oProc.oModel.HOverFixPrice = DBUtility.ClsPub.isDoule(txtHOverFixPrice.Text);
oProc.oModel.HProcMulID = DBUtility.ClsPub.isLong(txtHProcMulID.Tag.ToString());
+ oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
+ oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
oProc.oModel.HTypeCount = chkHTypeCount.Checked;
oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -683,6 +708,48 @@
DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
}
-
+ private void cmdHBadWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHBadWHID.Text = oWare.oModel.HName;
+ this.txtHBadWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHBadWHID.Text = "";
+ }
+ }
+
+ private void cmdHWasterWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWasterWHID.Text = oWare.oModel.HName;
+ this.txtHWasterWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWasterWHID.Text = "";
+ }
+ }
+
+ private void txtHBadWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHBadWHID.Text.Length == 0)
+ {
+ txtHBadWHID.Tag = "0";
+ }
+ }
+
+ private void txtHWasterWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWasterWHID.Text.Length == 0)
+ {
+ txtHWasterWHID.Tag = "0";
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
index 0914f8f..5e3eb19 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
@@ -58,6 +58,8 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHProcCheckNote = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
this.cmdHProcMulID = new System.Windows.Forms.Button();
this.label13 = new System.Windows.Forms.Label();
this.txtHProcMulID = new System.Windows.Forms.TextBox();
@@ -99,8 +101,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.label14 = new System.Windows.Forms.Label();
- this.txtHProcCheckNote = new System.Windows.Forms.TextBox();
+ this.cmdHBadWHID = new System.Windows.Forms.Button();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHBadWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWasterWHID = new System.Windows.Forms.Button();
+ this.label16 = new System.Windows.Forms.Label();
+ this.txtHWasterWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -144,7 +150,7 @@
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(877, 50);
+ this.ToolBar.Size = new System.Drawing.Size(1169, 62);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 13;
this.ToolBar.Text = "toolStrip1";
@@ -152,7 +158,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// dc
//
@@ -184,7 +190,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// xz
//
@@ -232,7 +238,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// cx
//
@@ -265,7 +271,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// fz
//
@@ -298,13 +304,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -314,7 +320,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -324,7 +330,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -334,7 +340,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -344,7 +350,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -363,7 +369,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// imageList1
//
@@ -378,9 +384,10 @@
this.stTab.Controls.Add(this.tabPage2);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
+ this.stTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(736, 495);
+ this.stTab.Size = new System.Drawing.Size(982, 619);
this.stTab.TabIndex = 15;
//
// tabPage1
@@ -388,10 +395,11 @@
this.tabPage1.BackColor = System.Drawing.SystemColors.Control;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
- this.tabPage1.Size = new System.Drawing.Size(728, 469);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(974, 590);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
//
@@ -402,12 +410,14 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersVisible = false;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(720, 461);
+ this.grdMain.Size = new System.Drawing.Size(964, 580);
this.grdMain.TabIndex = 0;
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
//
@@ -415,6 +425,12 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.cmdHWasterWHID);
+ this.tabPage2.Controls.Add(this.label16);
+ this.tabPage2.Controls.Add(this.txtHWasterWHID);
+ this.tabPage2.Controls.Add(this.cmdHBadWHID);
+ this.tabPage2.Controls.Add(this.label15);
+ this.tabPage2.Controls.Add(this.txtHBadWHID);
this.tabPage2.Controls.Add(this.txtHProcCheckNote);
this.tabPage2.Controls.Add(this.label14);
this.tabPage2.Controls.Add(this.cmdHProcMulID);
@@ -452,21 +468,43 @@
this.tabPage2.Controls.Add(this.label2);
this.tabPage2.Controls.Add(this.txtHNumber);
this.tabPage2.Controls.Add(this.label1);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
- this.tabPage2.Size = new System.Drawing.Size(728, 469);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Size = new System.Drawing.Size(974, 590);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // txtHProcCheckNote
+ //
+ this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcCheckNote.Location = new System.Drawing.Point(103, 333);
+ this.txtHProcCheckNote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProcCheckNote.Multiline = true;
+ this.txtHProcCheckNote.Name = "txtHProcCheckNote";
+ this.txtHProcCheckNote.Size = new System.Drawing.Size(573, 74);
+ this.txtHProcCheckNote.TabIndex = 218;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(25, 337);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(68, 45);
+ this.label14.TabIndex = 217;
+ this.label14.Text = "鏈� 宸� 搴廫r\n\r\n纭璁板綍";
//
// cmdHProcMulID
//
this.cmdHProcMulID.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcMulID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcMulID.Image")));
this.cmdHProcMulID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHProcMulID.Location = new System.Drawing.Point(497, 113);
+ this.cmdHProcMulID.Location = new System.Drawing.Point(649, 116);
+ this.cmdHProcMulID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHProcMulID.Name = "cmdHProcMulID";
- this.cmdHProcMulID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHProcMulID.Size = new System.Drawing.Size(29, 28);
this.cmdHProcMulID.TabIndex = 216;
this.cmdHProcMulID.UseVisualStyleBackColor = false;
this.cmdHProcMulID.Click += new System.EventHandler(this.cmdHProcMulID_Click);
@@ -475,9 +513,10 @@
//
this.label13.AutoSize = true;
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(300, 118);
+ this.label13.Location = new System.Drawing.Point(386, 123);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(47, 12);
+ this.label13.Size = new System.Drawing.Size(61, 15);
this.label13.TabIndex = 214;
this.label13.Text = "宸� 娈�";
//
@@ -485,9 +524,10 @@
//
this.txtHProcMulID.BackColor = System.Drawing.SystemColors.Window;
this.txtHProcMulID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcMulID.Location = new System.Drawing.Point(353, 114);
+ this.txtHProcMulID.Location = new System.Drawing.Point(457, 117);
+ this.txtHProcMulID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcMulID.Name = "txtHProcMulID";
- this.txtHProcMulID.Size = new System.Drawing.Size(144, 21);
+ this.txtHProcMulID.Size = new System.Drawing.Size(191, 25);
this.txtHProcMulID.TabIndex = 215;
this.txtHProcMulID.Tag = "0";
this.txtHProcMulID.TextChanged += new System.EventHandler(this.txtHProcessID_K3_TextChanged);
@@ -495,26 +535,29 @@
// txtHOverFixPrice
//
this.txtHOverFixPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOverFixPrice.Location = new System.Drawing.Point(353, 86);
+ this.txtHOverFixPrice.Location = new System.Drawing.Point(457, 83);
+ this.txtHOverFixPrice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHOverFixPrice.Name = "txtHOverFixPrice";
- this.txtHOverFixPrice.Size = new System.Drawing.Size(166, 21);
+ this.txtHOverFixPrice.Size = new System.Drawing.Size(220, 25);
this.txtHOverFixPrice.TabIndex = 213;
//
// txtHFixPrice
//
this.txtHFixPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHFixPrice.Location = new System.Drawing.Point(353, 58);
+ this.txtHFixPrice.Location = new System.Drawing.Point(457, 47);
+ this.txtHFixPrice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHFixPrice.Name = "txtHFixPrice";
- this.txtHFixPrice.Size = new System.Drawing.Size(166, 21);
+ this.txtHFixPrice.Size = new System.Drawing.Size(220, 25);
this.txtHFixPrice.TabIndex = 212;
//
// label12
//
this.label12.AutoSize = true;
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(270, 90);
+ this.label12.Location = new System.Drawing.Point(346, 87);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(77, 12);
+ this.label12.Size = new System.Drawing.Size(97, 15);
this.label12.TabIndex = 211;
this.label12.Text = "鍔犵彮琛ヨ创瀹氶";
//
@@ -522,18 +565,20 @@
//
this.label11.AutoSize = true;
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(294, 62);
+ this.label11.Location = new System.Drawing.Point(378, 53);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.Size = new System.Drawing.Size(67, 15);
this.label11.TabIndex = 208;
this.label11.Text = "鐝骇瀹氶";
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(294, 34);
+ this.label10.Location = new System.Drawing.Point(378, 17);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.Size = new System.Drawing.Size(67, 15);
this.label10.TabIndex = 207;
this.label10.Text = "姹囨姤绫诲瀷";
//
@@ -543,17 +588,19 @@
this.cmbHBillSubType.Items.AddRange(new object[] {
"璁惧",
"娴佹按绾�"});
- this.cmbHBillSubType.Location = new System.Drawing.Point(353, 30);
+ this.cmbHBillSubType.Location = new System.Drawing.Point(457, 13);
+ this.cmbHBillSubType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHBillSubType.Name = "cmbHBillSubType";
- this.cmbHBillSubType.Size = new System.Drawing.Size(166, 20);
+ this.cmbHBillSubType.Size = new System.Drawing.Size(220, 23);
this.cmbHBillSubType.TabIndex = 206;
//
// chkHAutoTrunFlag
//
this.chkHAutoTrunFlag.AutoSize = true;
- this.chkHAutoTrunFlag.Location = new System.Drawing.Point(346, 349);
+ this.chkHAutoTrunFlag.Location = new System.Drawing.Point(447, 437);
+ this.chkHAutoTrunFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
- this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
+ this.chkHAutoTrunFlag.Size = new System.Drawing.Size(89, 19);
this.chkHAutoTrunFlag.TabIndex = 205;
this.chkHAutoTrunFlag.Text = "鑷姩绉昏浆";
this.chkHAutoTrunFlag.UseVisualStyleBackColor = true;
@@ -563,9 +610,10 @@
this.cmdHProcessID_K3.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcessID_K3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcessID_K3.Image")));
this.cmdHProcessID_K3.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHProcessID_K3.Location = new System.Drawing.Point(497, 169);
+ this.cmdHProcessID_K3.Location = new System.Drawing.Point(649, 186);
+ this.cmdHProcessID_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHProcessID_K3.Name = "cmdHProcessID_K3";
- this.cmdHProcessID_K3.Size = new System.Drawing.Size(22, 22);
+ this.cmdHProcessID_K3.Size = new System.Drawing.Size(29, 28);
this.cmdHProcessID_K3.TabIndex = 204;
this.cmdHProcessID_K3.UseVisualStyleBackColor = false;
this.cmdHProcessID_K3.Click += new System.EventHandler(this.cmdHProcessID_K3_Click);
@@ -574,9 +622,10 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(294, 174);
+ this.label9.Location = new System.Drawing.Point(378, 193);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(59, 12);
+ this.label9.Size = new System.Drawing.Size(77, 15);
this.label9.TabIndex = 202;
this.label9.Text = "ERP 宸� 搴�";
//
@@ -584,9 +633,10 @@
//
this.txtHProcessID_K3.BackColor = System.Drawing.SystemColors.Window;
this.txtHProcessID_K3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcessID_K3.Location = new System.Drawing.Point(353, 170);
+ this.txtHProcessID_K3.Location = new System.Drawing.Point(457, 187);
+ this.txtHProcessID_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcessID_K3.Name = "txtHProcessID_K3";
- this.txtHProcessID_K3.Size = new System.Drawing.Size(144, 21);
+ this.txtHProcessID_K3.Size = new System.Drawing.Size(191, 25);
this.txtHProcessID_K3.TabIndex = 203;
this.txtHProcessID_K3.Tag = "0";
this.txtHProcessID_K3.TextChanged += new System.EventHandler(this.txtHProcessID_K3_TextChanged);
@@ -594,43 +644,48 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(29, 174);
+ this.label8.Location = new System.Drawing.Point(25, 193);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 12);
+ this.label8.Size = new System.Drawing.Size(69, 15);
this.label8.TabIndex = 201;
this.label8.Text = "搴� 鍙�";
//
// txtHSNo
//
this.txtHSNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSNo.Location = new System.Drawing.Point(88, 170);
+ this.txtHSNo.Location = new System.Drawing.Point(103, 187);
+ this.txtHSNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSNo.Name = "txtHSNo";
- this.txtHSNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSNo.Size = new System.Drawing.Size(220, 25);
this.txtHSNo.TabIndex = 200;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(29, 146);
+ this.label7.Location = new System.Drawing.Point(25, 157);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
+ this.label7.Size = new System.Drawing.Size(67, 15);
this.label7.TabIndex = 199;
this.label7.Text = "閮ㄩ棬浠ｇ爜";
//
// txtHDeptNumber
//
this.txtHDeptNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHDeptNumber.Location = new System.Drawing.Point(88, 142);
+ this.txtHDeptNumber.Location = new System.Drawing.Point(103, 153);
+ this.txtHDeptNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDeptNumber.Name = "txtHDeptNumber";
- this.txtHDeptNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHDeptNumber.Size = new System.Drawing.Size(220, 25);
this.txtHDeptNumber.TabIndex = 198;
//
// chkHTypeCount
//
this.chkHTypeCount.AutoSize = true;
- this.chkHTypeCount.Location = new System.Drawing.Point(260, 349);
+ this.chkHTypeCount.Location = new System.Drawing.Point(333, 437);
+ this.chkHTypeCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHTypeCount.Name = "chkHTypeCount";
- this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
+ this.chkHTypeCount.Size = new System.Drawing.Size(89, 19);
this.chkHTypeCount.TabIndex = 197;
this.chkHTypeCount.Text = "鏍哥畻鏍囪";
this.chkHTypeCount.UseVisualStyleBackColor = true;
@@ -638,9 +693,10 @@
// chkHTypeFlow
//
this.chkHTypeFlow.AutoSize = true;
- this.chkHTypeFlow.Location = new System.Drawing.Point(174, 349);
+ this.chkHTypeFlow.Location = new System.Drawing.Point(218, 437);
+ this.chkHTypeFlow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHTypeFlow.Name = "chkHTypeFlow";
- this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
+ this.chkHTypeFlow.Size = new System.Drawing.Size(89, 19);
this.chkHTypeFlow.TabIndex = 196;
this.chkHTypeFlow.Text = "娴佽浆鏍囪";
this.chkHTypeFlow.UseVisualStyleBackColor = true;
@@ -648,18 +704,20 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(29, 118);
+ this.label6.Location = new System.Drawing.Point(25, 123);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.Size = new System.Drawing.Size(68, 15);
this.label6.TabIndex = 195;
this.label6.Text = "鏉� 褰� 鐮�";
//
// txtHBarCode
//
this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(88, 114);
+ this.txtHBarCode.Location = new System.Drawing.Point(103, 117);
+ this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(166, 21);
+ this.txtHBarCode.Size = new System.Drawing.Size(220, 25);
this.txtHBarCode.TabIndex = 194;
//
// cmdHDeptID
@@ -667,9 +725,10 @@
this.cmdHDeptID.BackColor = System.Drawing.Color.Transparent;
this.cmdHDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDeptID.Image")));
this.cmdHDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHDeptID.Location = new System.Drawing.Point(497, 141);
+ this.cmdHDeptID.Location = new System.Drawing.Point(649, 151);
+ this.cmdHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHDeptID.Name = "cmdHDeptID";
- this.cmdHDeptID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHDeptID.Size = new System.Drawing.Size(29, 28);
this.cmdHDeptID.TabIndex = 193;
this.cmdHDeptID.UseVisualStyleBackColor = false;
this.cmdHDeptID.Click += new System.EventHandler(this.cmdHFactoryID_Click);
@@ -678,9 +737,10 @@
//
this.label28.AutoSize = true;
this.label28.ForeColor = System.Drawing.Color.Black;
- this.label28.Location = new System.Drawing.Point(294, 146);
+ this.label28.Location = new System.Drawing.Point(378, 157);
+ this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(53, 12);
+ this.label28.Size = new System.Drawing.Size(67, 15);
this.label28.TabIndex = 191;
this.label28.Text = "閮ㄩ棬杞﹂棿";
//
@@ -688,9 +748,10 @@
//
this.txtHDeptID.BackColor = System.Drawing.SystemColors.Window;
this.txtHDeptID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHDeptID.Location = new System.Drawing.Point(353, 142);
+ this.txtHDeptID.Location = new System.Drawing.Point(457, 153);
+ this.txtHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDeptID.Name = "txtHDeptID";
- this.txtHDeptID.Size = new System.Drawing.Size(144, 21);
+ this.txtHDeptID.Size = new System.Drawing.Size(191, 25);
this.txtHDeptID.TabIndex = 192;
this.txtHDeptID.Tag = "0";
this.txtHDeptID.TextChanged += new System.EventHandler(this.txtHFactoryID_TextChanged);
@@ -699,25 +760,28 @@
//
this.txtHName.BackColor = System.Drawing.Color.Beige;
this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHName.Location = new System.Drawing.Point(88, 58);
+ this.txtHName.Location = new System.Drawing.Point(103, 47);
+ this.txtHName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHName.Name = "txtHName";
- this.txtHName.Size = new System.Drawing.Size(166, 21);
+ this.txtHName.Size = new System.Drawing.Size(220, 25);
this.txtHName.TabIndex = 18;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(29, 90);
+ this.label4.Location = new System.Drawing.Point(25, 87);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.Size = new System.Drawing.Size(68, 15);
this.label4.TabIndex = 17;
this.label4.Text = "鍔� 璁� 鐮�";
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(467, 389);
+ this.cmdCancel.Location = new System.Drawing.Point(609, 487);
+ this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(52, 23);
+ this.cmdCancel.Size = new System.Drawing.Size(69, 29);
this.cmdCancel.TabIndex = 16;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -725,9 +789,10 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(409, 389);
+ this.cmdOK.Location = new System.Drawing.Point(531, 487);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(52, 23);
+ this.cmdOK.Size = new System.Drawing.Size(69, 29);
this.cmdOK.TabIndex = 15;
this.cmdOK.Text = "淇� 瀛�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -736,9 +801,10 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(88, 349);
+ this.chkHStopflag.Location = new System.Drawing.Point(103, 437);
+ this.chkHStopflag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHStopflag.Name = "chkHStopflag";
- this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
+ this.chkHStopflag.Size = new System.Drawing.Size(89, 19);
this.chkHStopflag.TabIndex = 12;
this.chkHStopflag.Text = "绂佺敤鏍囧織";
this.chkHStopflag.UseVisualStyleBackColor = true;
@@ -746,35 +812,39 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(88, 198);
+ this.txtHRemark.Location = new System.Drawing.Point(103, 249);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(431, 60);
+ this.txtHRemark.Size = new System.Drawing.Size(573, 74);
this.txtHRemark.TabIndex = 10;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(29, 198);
+ this.label5.Location = new System.Drawing.Point(25, 249);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.Size = new System.Drawing.Size(69, 15);
this.label5.TabIndex = 9;
this.label5.Text = "澶� 娉�";
//
// txtHHelpCode
//
this.txtHHelpCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHHelpCode.Location = new System.Drawing.Point(88, 86);
+ this.txtHHelpCode.Location = new System.Drawing.Point(103, 83);
+ this.txtHHelpCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHHelpCode.Name = "txtHHelpCode";
- this.txtHHelpCode.Size = new System.Drawing.Size(166, 21);
+ this.txtHHelpCode.Size = new System.Drawing.Size(220, 25);
this.txtHHelpCode.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(29, 62);
+ this.label2.Location = new System.Drawing.Point(25, 53);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(69, 15);
this.label2.TabIndex = 2;
this.label2.Text = "宸� 搴�";
//
@@ -782,17 +852,19 @@
//
this.txtHNumber.BackColor = System.Drawing.Color.Beige;
this.txtHNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHNumber.Location = new System.Drawing.Point(88, 30);
+ this.txtHNumber.Location = new System.Drawing.Point(103, 13);
+ this.txtHNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHNumber.Name = "txtHNumber";
- this.txtHNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHNumber.Size = new System.Drawing.Size(220, 25);
this.txtHNumber.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(29, 34);
+ this.label1.Location = new System.Drawing.Point(25, 17);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 0;
this.label1.Text = "宸ュ簭浠ｇ爜";
//
@@ -804,7 +876,8 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 50);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 62);
+ this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -815,8 +888,9 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(877, 495);
- this.splitContainer1.SplitterDistance = 137;
+ this.splitContainer1.Size = new System.Drawing.Size(1169, 619);
+ this.splitContainer1.SplitterDistance = 182;
+ this.splitContainer1.SplitterWidth = 5;
this.splitContainer1.TabIndex = 16;
//
// tv
@@ -829,7 +903,8 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 23);
+ this.tv.Location = new System.Drawing.Point(0, 28);
+ this.tv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tv.Name = "tv";
treeNode1.ForeColor = System.Drawing.Color.Black;
treeNode1.Name = "tjbb";
@@ -839,7 +914,7 @@
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode1});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(137, 472);
+ this.tv.Size = new System.Drawing.Size(182, 591);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -850,16 +925,18 @@
this.panel1.Controls.Add(this.label3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(137, 23);
+ this.panel1.Size = new System.Drawing.Size(182, 28);
this.panel1.TabIndex = 15;
//
// cmdLoadTree
//
this.cmdLoadTree.Dock = System.Windows.Forms.DockStyle.Right;
- this.cmdLoadTree.Location = new System.Drawing.Point(93, 0);
+ this.cmdLoadTree.Location = new System.Drawing.Point(125, 0);
+ this.cmdLoadTree.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdLoadTree.Name = "cmdLoadTree";
- this.cmdLoadTree.Size = new System.Drawing.Size(40, 19);
+ this.cmdLoadTree.Size = new System.Drawing.Size(53, 24);
this.cmdLoadTree.TabIndex = 1;
this.cmdLoadTree.Text = "鍒锋柊";
this.cmdLoadTree.UseVisualStyleBackColor = true;
@@ -868,38 +945,94 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(0, 3);
+ this.label3.Location = new System.Drawing.Point(0, 4);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(107, 12);
+ this.label3.Size = new System.Drawing.Size(135, 15);
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // label14
+ // cmdHBadWHID
//
- this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(29, 269);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(53, 36);
- this.label14.TabIndex = 217;
- this.label14.Text = "鏈� 宸� 搴廫r\n\r\n纭璁板綍";
+ this.cmdHBadWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadWHID.Image")));
+ this.cmdHBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHBadWHID.Location = new System.Drawing.Point(295, 215);
+ this.cmdHBadWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHBadWHID.Name = "cmdHBadWHID";
+ this.cmdHBadWHID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHBadWHID.TabIndex = 221;
+ this.cmdHBadWHID.UseVisualStyleBackColor = false;
+ this.cmdHBadWHID.Click += new System.EventHandler(this.cmdHBadWHID_Click);
//
- // txtHProcCheckNote
+ // label15
//
- this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcCheckNote.Location = new System.Drawing.Point(88, 266);
- this.txtHProcCheckNote.Multiline = true;
- this.txtHProcCheckNote.Name = "txtHProcCheckNote";
- this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
- this.txtHProcCheckNote.TabIndex = 218;
+ this.label15.AutoSize = true;
+ this.label15.ForeColor = System.Drawing.Color.Black;
+ this.label15.Location = new System.Drawing.Point(25, 222);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.TabIndex = 219;
+ this.label15.Text = "涓嶈壇鍝佷粨";
+ //
+ // txtHBadWHID
+ //
+ this.txtHBadWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadWHID.Location = new System.Drawing.Point(103, 218);
+ this.txtHBadWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBadWHID.Name = "txtHBadWHID";
+ this.txtHBadWHID.Size = new System.Drawing.Size(191, 25);
+ this.txtHBadWHID.TabIndex = 220;
+ this.txtHBadWHID.Tag = "0";
+ this.txtHBadWHID.TextChanged += new System.EventHandler(this.txtHBadWHID_TextChanged);
+ //
+ // cmdHWasterWHID
+ //
+ this.cmdHWasterWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWasterWHID.Image")));
+ this.cmdHWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWasterWHID.Location = new System.Drawing.Point(649, 217);
+ this.cmdHWasterWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHWasterWHID.Name = "cmdHWasterWHID";
+ this.cmdHWasterWHID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHWasterWHID.TabIndex = 224;
+ this.cmdHWasterWHID.UseVisualStyleBackColor = false;
+ this.cmdHWasterWHID.Click += new System.EventHandler(this.cmdHWasterWHID_Click);
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.ForeColor = System.Drawing.Color.Black;
+ this.label16.Location = new System.Drawing.Point(379, 224);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(52, 15);
+ this.label16.TabIndex = 222;
+ this.label16.Text = "鎶ュ簾浠�";
+ //
+ // txtHWasterWHID
+ //
+ this.txtHWasterWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWasterWHID.Location = new System.Drawing.Point(457, 220);
+ this.txtHWasterWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWasterWHID.Name = "txtHWasterWHID";
+ this.txtHWasterWHID.Size = new System.Drawing.Size(191, 25);
+ this.txtHWasterWHID.TabIndex = 223;
+ this.txtHWasterWHID.Tag = "0";
+ this.txtHWasterWHID.TextChanged += new System.EventHandler(this.txtHWasterWHID_TextChanged);
//
// Gy_Process
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(877, 545);
+ this.ClientSize = new System.Drawing.Size(1169, 681);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_Process";
this.Text = "宸ュ簭璁剧疆";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -994,5 +1127,11 @@
private System.Windows.Forms.ToolStripButton dc;
private System.Windows.Forms.TextBox txtHProcCheckNote;
private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.Button cmdHWasterWHID;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.TextBox txtHWasterWHID;
+ private System.Windows.Forms.Button cmdHBadWHID;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.TextBox txtHBadWHID;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
index e1a47b0..f78163c 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
@@ -253,7 +253,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -263,7 +263,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -276,7 +276,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -290,7 +290,7 @@
<data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
USCIQiyti2iuMYoQS8n+IMLUi/07kq4L03WzLiTvahvVGghtujFashLLzNqEiTCNGfT0ve/OOufICPSB
h3P4zu/3nu98HKHPoNOHYdc4XJ5xuL3G0tqwcwLEqLgxA44x/Cr+hjUCCJesZ1flmj36hxliVU3L3UEn
NvKbsAYLmMqiYm2hLWaIVTUtPfdHkF/PQYwCT1eBttfAoSn5Zrda2oUTzBCralpu9Q8hu/adoa4oUD8t
@@ -304,7 +304,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
@@ -317,7 +317,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -329,7 +329,7 @@
<data name="xs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -342,7 +342,7 @@
<data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
@@ -353,7 +353,7 @@
<data name="jc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -364,7 +364,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -379,7 +379,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -394,7 +394,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -409,51 +409,81 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAWQBAQFkAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAWwBAQFsAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAToBigH/AQUBkAG5Af8BBQGQAbkB/wEFAZABuQH/AQUBkAG5Af8BBQGQ
- AbkB/wEFAZABuQH/AQUBkAG5Af8BBQGQAbkB/wEFAZABuQH/AQUBkAG5Af8BBQGQAbkB/wEFAZABuQH/
- AQUBkAG5Af8DAAn/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/
- AQABOgGKAf8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/AwAB/wMAAf+AAAT/
- AQABOgGKAf8B0QH2Av8BTAHaAfQB/wFBAdMB8QH/ATYBywHvAf8BLAHEAe0B/wEiAb4B6wH/ARgBuAHo
- Af8BDAGwAecB/wECAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQUBkAG5Af8DAAn/AQABOgGK
- Af8B0QH2Av8BIQG+AesB/wEbAbkB6QH/ARMBtAHnAf8BCwGwAeYB/wEEAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQUBkAG5Af8BAAE6AYoB/wMAAf8DAAH/gAAE/wEAAToBigH/AdEB9gL/AVIB3gH1
- Af8BRwHWAfMB/wE9AdAB8QH/ATIByQHuAf8BKAHCAewB/wEdAbwB6gH/ARMBtAHnAf8BCAGtAeUB/wEA
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEFAZABuQH/AwAF/wEAAToBigH/AdEB9gL/ASwBxQHuAf8BJgHB
- AesB/wEfAbwB6wH/ARcBtwHoAf8BEAGyAecB/wEIAa4B5QH/AQEBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQUBkAG5Af8DAAH/AQABOgGKAf8DAAH/gAAE/wEAAToBigH/AdEB9gL/AYEB4QH3Af8BTgHaAfQB/wFD
- AdQB8gH/ATgBzAHvAf8BLgHGAe4B/wEkAcAB6wH/ARkBuQHpAf8BDwGyAeYB/wEEAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEFAZABuQH/AwAF/wEAAToBigH/AdEB9gL/ATEByAHuAf8BKgHEAewB/wEjAb8B6wH/
- ARwBuwHqAf8BFQG2AegB/wENAbAB5wH/AQYBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOgGKAf8DAAH/
- AQABOgGKAf8DAAH/gAAE/wEAAToBigH/AdEB9gL/AYYB5QH3Af8BVAHfAfUB/wFJAdgB8wH/AT8B0QHx
- Af8BNAHKAe8B/wEqAcQB7QH/ASABvQHqAf8BFQG2AegB/wEKAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEF
- AZABuQH/AwAB/wEAAToBigH/AdEB9gL/AT0BzwHxAf8BNgHLAe8B/wEuAccB7gH/ASgBwgHsAf8BIQG9
- AeoB/wEZAbkB6QH/ARIBtAHnAf8BCwGwAeYB/wEDAaoB5QH/AQUBkAG5Af8DAAH/AQUBkAG5Af8BBQGQ
- AbkB/wMAAf+AAAT/AQABOgGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVAB3AH1Af8BRgHVAfIB/wE6
- Ac4B8AH/ATAByAHuAf8BJgHBAewB/wEcAboB6gH/ARABswHnAf8BBgGsAeUB/wEAAaYB4wH/AQUBkAG5
- Af8DAAH/AQABOgGKAf8B0QH2Av8BQgHTAfIB/wE6Ac4B8AH/ATMBygHuAf8BLAHFAe0B/wEmAcEB6wH/
- AR4BvAHqAf8BFwG3AegB/wEPAbIB5gH/AQgBrgHlAf8BBQGQAbkB/wMAAf8BBQGQAbkB/wEFAZABuQH/
- AwAB/4AABP8BAAE6AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVgHgAfYB/wFMAdkB8wH/AUEB0wHy
- Af8BNgHLAe8B/wEsAcUB7QH/ASIBvgHrAf8BGAG4AekB/wEMAbAB5gH/AQEBqQHkAf8BBQGQAbkB/wMA
- Af8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEA
- AToBigH/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BBQGQAbkB/wEzAckB7gH/AQUBkAG5
- Af8DAAH/gAAE/wEAAToBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVMB3gH1Af8BRwHW
- AfMB/wE9Ac8B8QH/ATIByQHvAf8BKAHCAewB/wEeAbsB6QH/ARMBtQHnAf8BCAGtAeYB/wEFAZABuQH/
- AwAF/wEAAToBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFT
- Ad0B9QH/AU0B2gHzAf8BRwHXAfMB/wFCAdMB8QH/ATwBzwHxAf8BNgHLAe8B/wEFAZABuQH/AwAB/4AA
- BP8BAAE6AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEFAZABuQH/AwAF/wEAAToBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFWAeAB9gH/AVEB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BBQGQAbkB/wMAAf+AAAT/AQABOgGKAf8BGAGoAdMB/wEYAagB0wH/ARgBqAHTAf8BGAGo
- AdMB/wEYAagB0wH/ARgBqAHTAf8BGAGoAdMB/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/
- AQABOgGKAf8BAAE6AYoJ/wEAAToBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BAAE6
- AYoF/4AACP8BAAE6AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAToBigH/AwAh/wEAAToBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOgGKHf+AAAz/AQABOgGKAf8BAAE6AYoB/wEA
- AToBigH/AQABOgGKAf8BAAE6AYoB/wMAKf8BAAE6AYoB/wEAAToBigH/AQABOgGKAf8BAAE6AYoB/wEA
- AToBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATkBigH/AQQBkAG5Af8BBAGQAbkB/wEEAZABuQH/AQQBkAG5Af8BBAGQ
+ AbkB/wEEAZABuQH/AQQBkAG5Af8BBAGQAbkB/wEEAZABuQH/AQQBkAG5Af8BBAGQAbkB/wEEAZABuQH/
+ AQQBkAG5Af8DAAn/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/
+ AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AwAB/wMAAf+AAAT/
+ AQABOQGKAf8B0QH2Av8BSwHaAfQB/wFAAdMB8QH/ATUBywHvAf8BKwHEAe0B/wEhAb4B6wH/ARcBuAHo
+ Af8BCwGwAecB/wEBAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQQBkAG5Af8DAAn/AQABOQGK
+ Af8B0QH2Av8BIAG+AesB/wEaAbkB6QH/ARIBtAHnAf8BCgGwAeYB/wEDAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQQBkAG5Af8BAAE5AYoB/wMAAf8DAAH/gAAE/wEAATkBigH/AdEB9gL/AVEB3gH1
+ Af8BRgHWAfMB/wE8AdAB8QH/ATEByQHuAf8BJwHCAewB/wEcAbwB6gH/ARIBtAHnAf8BBwGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEEAZABuQH/AwAF/wEAATkBigH/AdEB9gL/ASsBxQHuAf8BJQHB
+ AesB/wEeAbwB6wH/ARYBtwHoAf8BDwGyAecB/wEHAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQQBkAG5Af8DAAH/AQABOQGKAf8DAAH/gAAE/wEAATkBigH/AdEB9gL/AYEB4QH3Af8BTQHaAfQB/wFC
+ AdQB8gH/ATcBzAHvAf8BLQHGAe4B/wEjAcAB6wH/ARgBuQHpAf8BDgGyAeYB/wEDAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEEAZABuQH/AwAF/wEAATkBigH/AdEB9gL/ATAByAHuAf8BKQHEAewB/wEiAb8B6wH/
+ ARsBuwHqAf8BFAG2AegB/wEMAbAB5wH/AQUBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOQGKAf8DAAH/
+ AQABOQGKAf8DAAH/gAAE/wEAATkBigH/AdEB9gL/AYYB5QH3Af8BUwHfAfUB/wFIAdgB8wH/AT4B0QHx
+ Af8BMwHKAe8B/wEpAcQB7QH/AR8BvQHqAf8BFAG2AegB/wEJAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEE
+ AZABuQH/AwAB/wEAATkBigH/AdEB9gL/ATwBzwHxAf8BNQHLAe8B/wEtAccB7gH/AScBwgHsAf8BIAG9
+ AeoB/wEYAbkB6QH/AREBtAHnAf8BCgGwAeYB/wECAaoB5QH/AQQBkAG5Af8DAAH/AQQBkAG5Af8BBAGQ
+ AbkB/wMAAf+AAAT/AQABOQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU8B3AH1Af8BRQHVAfIB/wE5
+ Ac4B8AH/AS8ByAHuAf8BJQHBAewB/wEbAboB6gH/AQ8BswHnAf8BBQGsAeUB/wEAAaYB4wH/AQQBkAG5
+ Af8DAAH/AQABOQGKAf8B0QH2Av8BQQHTAfIB/wE5Ac4B8AH/ATIBygHuAf8BKwHFAe0B/wElAcEB6wH/
+ AR0BvAHqAf8BFgG3AegB/wEOAbIB5gH/AQcBrgHlAf8BBAGQAbkB/wMAAf8BBAGQAbkB/wEEAZABuQH/
+ AwAB/4AABP8BAAE5AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVQHgAfYB/wFLAdkB8wH/AUAB0wHy
+ Af8BNQHLAe8B/wErAcUB7QH/ASEBvgHrAf8BFwG4AekB/wELAbAB5gH/AQABqQHkAf8BBAGQAbkB/wMA
+ Af8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEA
+ ATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BBAGQAbkB/wEyAckB7gH/AQQBkAG5
+ Af8DAAH/gAAE/wEAATkBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVIB3gH1Af8BRgHW
+ AfMB/wE8Ac8B8QH/ATEByQHvAf8BJwHCAewB/wEdAbsB6QH/ARIBtQHnAf8BBwGtAeYB/wEEAZABuQH/
+ AwAF/wEAATkBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFS
+ Ad0B9QH/AUwB2gHzAf8BRgHXAfMB/wFBAdMB8QH/ATsBzwHxAf8BNQHLAe8B/wEEAZABuQH/AwAB/4AA
+ BP8BAAE5AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEEAZABuQH/AwAF/wEAATkBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFVAeAB9gH/AVAB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BBAGQAbkB/wMAAf+AAAT/AQABOQGKAf8BFwGoAdMB/wEXAagB0wH/ARcBqAHTAf8BFwGo
+ AdMB/wEXAagB0wH/ARcBqAHTAf8BFwGoAdMB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/
+ AQABOQGKAf8BAAE5AYoJ/wEAATkBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5
+ AYoF/4AACP8BAAE5AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATkBigH/AwAh/wEAATkBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOQGKHf+AAAz/AQABOQGKAf8BAAE5AYoB/wEA
+ ATkBigH/AQABOQGKAf8BAAE5AYoB/wMAKf8BAAE5AYoB/wEAATkBigH/AQABOQGKAf8BAAE5AYoB/wEA
+ ATkBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <data name="cmdHWasterWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHBadWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
</value>
</data>
<data name="cmdHProcMulID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
index 430f0a6..7a5f8d2 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Ctl.cs"
@@ -20,11 +20,11 @@
oCn.BeginTran();
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
+ ",HTypeFlow,HTypeCount,HDeptNumber,HSNo,HBadWHID,HWasterWHID" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
- "," + Convert.ToString(oModel.HTypeFlow ? 1 : 0) + "," + Convert.ToString(oModel.HTypeCount ? 1 : 0) + ",'" + oModel.HDeptNumber + "'," + oModel.HSNo.ToString() +
+ "," + Convert.ToString(oModel.HTypeFlow ? 1 : 0) + "," + Convert.ToString(oModel.HTypeCount ? 1 : 0) + ",'" + oModel.HDeptNumber + "'," + oModel.HSNo.ToString() + "," + oModel.HBadWHID.ToString() + "," + oModel.HWasterWHID.ToString() +
"," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HDeptID +
",'" + oModel.HBarCode + "'," + oModel.HProcessID_K3 + ",'" + oModel.HBillSubType + "'," + Convert.ToString(oModel.HAutoTrunFlag ? 1 : 0) +
"," + oModel.HFixPrice.ToString() + "," + oModel.HOverFixPrice.ToString() + "," + oModel.HProcMulID.ToString() +",'"+ oModel.HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -54,8 +54,10 @@
",HLevel=" + oModel.HLevel +
",HParentID=" + oModel.HParentID +
",HSNo=" + oModel.HSNo +
- ",HDeptID=" + oModel.HDeptID +
- ",HProcessID_K3="+oModel.HProcessID_K3+
+ ",HDeptID=" + oModel.HDeptID.ToString() +
+ ",HBadWHID=" + oModel.HBadWHID.ToString() +
+ ",HWasterWHID=" + oModel.HWasterWHID.ToString() +
+ ",HProcessID_K3=" +oModel.HProcessID_K3+
",HBillSubType='" + oModel.HBillSubType + "'" +
",HDeptNumber='" + oModel.HDeptNumber + "'" +
",HBarCodeForBase='" + oModel.HBarCode + "'" +
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
index a3a33ac..a0efff7 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_View.cs"
@@ -121,6 +121,8 @@
omodel.HOverFixPrice = DBUtility.ClsPub.isDoule(DS.Tables[0].Rows[0]["HOverFixPrice"]);
omodel.HProcMulID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HProcMulID"]);
omodel.HProcCheckNote = DS.Tables[0].Rows[0]["HProcCheckNote"].ToString().Trim();
+ omodel.HBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadWHID"]);
+ omodel.HWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWasterWHID"]);
return true;
}
catch (Exception e)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 41b473c..158fe12 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -6607,7 +6607,7 @@
return;
try
{
- MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
+ //MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
switch (gnsy.ToLower())
{
case "gy_dotcheck"://点检项目
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
index c40a4f0..8c2d14e 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
@@ -21,5 +21,7 @@
public Int64 HProcMulID;//New
public Int64 HWorkCenterID;
public string HProcCheckNote = "";//本工序确认记录
+ public Int64 HBadWHID;//New
+ public Int64 HWasterWHID;//New
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 0b42066..d453cfa 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -2482,7 +2482,7 @@
if (HMaterID != 0)
{
- DataSet oDs = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_GetBatchNo " + HMaterID.ToString() + ",'" + HBatchNo + "','" + dtpHDate.Value.ToShortDateString()+ "','" + CampanyName+"'", "h_p_Gy_BarCodeBill_GetBatchNo");
+ DataSet oDs = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_GetBatchNo " + HMaterID.ToString() + ",'" + HBatchNo + "','" + dtpHDate.Value.ToShortDateString() + "','" + CampanyName + "'", "h_p_Gy_BarCodeBill_GetBatchNo");
//
if (oDs == null && oDs.Tables[0].Rows.Count == 0)
{
@@ -2503,8 +2503,6 @@
return;
}
}
-
-
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index 9e37bdf..c63493e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill));
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -91,7 +92,7 @@
this.label11 = new System.Windows.Forms.Label();
this.txtHMaker = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
- this.timer1 = new System.Windows.Forms.Timer();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.grdMain = new System.Windows.Forms.DataGridView();
@@ -972,7 +973,7 @@
this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
this.BatchNo.Name = "BatchNo";
- this.BatchNo.Size = new System.Drawing.Size(35, 47);
+ this.BatchNo.Size = new System.Drawing.Size(36, 47);
this.BatchNo.Text = "鎵规";
this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
index 4e46692..ac5da5a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
@@ -1,4 +1,4 @@
-锘縰sing DBUtility;
+using DBUtility;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -8,17 +8,17 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
-
+
namespace WebAPI.Controllers.BaseSet
{
public class Gy_OrderBackInfoController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
+
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
+
#region 璁㈠崟鍙嶉鐘舵�佸垪琛ㄦ暟鎹�
/// <summary>
/// 杩斿洖璁㈠崟鍙嶉鐘舵�佸垪琛�
@@ -68,7 +68,7 @@
}
}
#endregion
-
+
#region 璁㈠崟鍙嶉鐘舵�佹牴鎹爲鍨婭D鏌ヨ鎵�鏈夊眰绾у垪琛ㄦ暟鎹�
/// <summary>
/// 鏍规嵁鏍戝瀷ID 鏌ユ壘璁板綍
@@ -81,7 +81,7 @@
{
try
{
-
+
//ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_Gy_OrderBackInfoList WHERE HitemID=" + HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_Gy_OrderBackInfoList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_Gy_OrderBackInfoList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -111,7 +111,7 @@
}
}
#endregion
-
+
#region 鍒犻櫎璁㈠崟鍙嶉鐘舵��
/// <summary>
/// 璁㈠崟鍙嶉鐘舵�佸垪琛ㄥ垹闄ゆ寜閽�
@@ -122,11 +122,11 @@
[HttpGet]
public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
{
-
+
try
{
ds = oCN.RunProcReturn("delete from Gy_OrderBackInfo where HItemID = " + HItemID, "Gy_OrderBackInfo");
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛";
@@ -143,7 +143,7 @@
}
}
#endregion
-
+
#region 璁㈠崟鍙嶉鐘舵�佹柊澧炰繚瀛�
/// <summary>
/// 璁㈠崟鍙嶉鐘舵��-淇濆瓨鎸夐挳
@@ -160,9 +160,9 @@
string msg1 = _value.ToString();
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
-
+
List<Gy_OrderBackInfo> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderBackInfo>>(msg1);
-
+
long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -172,7 +172,7 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
-
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -181,7 +181,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -213,7 +213,7 @@
}
}
#endregion
-
+
#region 璁㈠崟鍙嶉鐘舵�佷慨鏀逛繚瀛�
/// <summary>
/// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
@@ -224,10 +224,10 @@
[HttpPost]
public object EditBill([FromBody] JObject oMain)
{
-
+
try
{
-
+
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -235,11 +235,11 @@
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
string msg5 = sArray[3].ToString();
-
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Gy_OrderBackInfo> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderBackInfo>>(msg2);
-
+
long HItemID = int.Parse(msg3);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -249,8 +249,8 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
-
-
+
+
//鍒ゆ柇鏉冮檺
if (!ClsPub.Security_Log(msg5, 1, true, msg4))
{
@@ -260,8 +260,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
+
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -270,7 +270,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
//if (oDept.HavSameNumber(HItemID, HNumber))
//{
// objJsonResult.code = "0";
@@ -279,8 +279,8 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
-
-
+
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -315,7 +315,7 @@
}
}
#endregion
-
+
#region 璁㈠崟鍙嶉鐘舵�佷慨鏀硅幏鍙栫粦瀹氭暟鎹�
/// <summary>
/// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
@@ -329,7 +329,7 @@
try
{
ds = oCN.RunProcReturn("select * from Gy_OrderBackInfo where HItemID=" + HInterID, "Gy_OrderBackInfo");
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
@@ -346,7 +346,7 @@
}
}
#endregion
-
+
#region 璁㈠崟鍙嶉鐘舵�佽幏鍙栨爲鍨嬪垪琛ㄦ暟鎹�
[Route("Gy_OrderBackInfo/LoadTree")]
[HttpGet]
@@ -354,9 +354,9 @@
{
SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
//ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
-
+
ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoLoadTree", "h_v_Gy_OrderBackInfoLoadTree");
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
index d68528f..814dedf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
@@ -1,4 +1,4 @@
-锘縰sing DBUtility;
+using DBUtility;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -8,17 +8,17 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
-
+
namespace WebAPI.Controllers.BaseSet
{
public class Gy_OrderLevController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
+
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
+
#region 璁㈠崟绛夌骇鍒楄〃鏁版嵁
/// <summary>
/// 杩斿洖璁㈠崟绛夌骇鍒楄〃
@@ -68,7 +68,7 @@
}
}
#endregion
-
+
#region 璁㈠崟绛夌骇鏍规嵁鏍戝瀷ID鏌ヨ鎵�鏈夊眰绾у垪琛ㄦ暟鎹�
/// <summary>
/// 鏍规嵁鏍戝瀷ID 鏌ユ壘璁板綍
@@ -81,7 +81,7 @@
{
try
{
-
+
//ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_Gy_OrderLevList WHERE HitemID=" + HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_Gy_OrderLevList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_Gy_OrderLevList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -111,7 +111,7 @@
}
}
#endregion
-
+
#region 鍒犻櫎璁㈠崟绛夌骇
/// <summary>
/// 璁㈠崟绛夌骇鍒楄〃鍒犻櫎鎸夐挳
@@ -175,7 +175,7 @@
}
}
//ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛";
@@ -192,7 +192,7 @@
}
}
#endregion
-
+
#region 璁㈠崟绛夌骇鏂板淇濆瓨
/// <summary>
/// 璁㈠崟绛夌骇-淇濆瓨鎸夐挳
@@ -209,14 +209,14 @@
string msg1 = _value.ToString();
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
-
+
DAL.ClsGy_OrderLev_Ctl oDept = new DAL.ClsGy_OrderLev_Ctl();
DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
-
-
-
+
+
+
List<Gy_OrderLevList> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderLevList>>(msg1);
-
+
long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -227,7 +227,7 @@
string HYX = list[0].HYX;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
-
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -236,7 +236,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -268,7 +268,7 @@
}
}
#endregion
-
+
#region 璁㈠崟绛夌骇淇敼淇濆瓨
/// <summary>
/// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
@@ -279,12 +279,12 @@
[HttpPost]
public object EditBill([FromBody] JObject oMain)
{
-
+
try
{
DAL.ClsGy_OrderLev_Ctl oDept = new DAL.ClsGy_OrderLev_Ctl();
DAL.ClsGy_OrderLev_View oDeptHlp = new DAL.ClsGy_OrderLev_View();
-
+
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -292,11 +292,11 @@
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
string msg5 = sArray[3].ToString();
-
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Gy_OrderLevList> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_OrderLevList>>(msg2);
-
+
long HItemID = int.Parse(msg3);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -307,8 +307,8 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
-
-
+
+
//鍒ゆ柇鏉冮檺
if (!ClsPub.Security_Log(msg5, 1, true, msg4))
{
@@ -318,8 +318,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
+
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -328,7 +328,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
if (oDept.HavSameNumber(HItemID, HNumber))
{
objJsonResult.code = "0";
@@ -337,8 +337,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
+
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -374,7 +374,7 @@
}
}
#endregion
-
+
#region 璁㈠崟绛夌骇淇敼鑾峰彇缁戝畾鏁版嵁
/// <summary>
/// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
@@ -388,7 +388,7 @@
try
{
ds = oCN.RunProcReturn("select * from Gy_OrderLev where HItemID=" + HInterID, "Gy_OrderLev");
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
@@ -405,7 +405,7 @@
}
}
#endregion
-
+
#region 璁㈠崟绛夌骇鑾峰彇鏍戝瀷鍒楄〃鏁版嵁
[Route("Gy_OrderLev/LoadTree")]
[HttpGet]
@@ -413,9 +413,9 @@
{
SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
//ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
-
+
ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevLoadTree", "h_v_Gy_OrderLevLoadTree");
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -424,4 +424,4 @@
}
#endregion
}
-}
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
index ab78ee7..98d001b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkPayTypeController.cs
@@ -215,7 +215,7 @@
bool HStopflag = list[0].HStopflag;
bool HEndFlag = list[0].HEndFlag;
string HUseFlag = list[0].HUseFlag;
-
+
//淇濆瓨
@@ -270,7 +270,7 @@
return objJsonResult;
}
}
-
+
/// <summary>
/// 鍒犻櫎鍔熻兘
/// </summary>
@@ -361,6 +361,6 @@
return objJsonResult;
}
}
-
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
index 45cc718..f1cc28a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs
@@ -275,7 +275,7 @@
return objJsonResult;
}
}
-
+
/// <summary>
/// 鍒犻櫎鍔熻兘
/// </summary>
@@ -366,6 +366,6 @@
return objJsonResult;
}
}
-
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index b3d3f89..6315e17 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -1442,13 +1442,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_EquipMent where HStopflag=0 Order by HItemID", "Gy_EquipMent");
+ ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain Order by HInterID", "Gy_EquipFileBillMain");
}
else
{
- string sql1 = "Select HItemID,HParentID,HNumber,HName from Gy_EquipMent where 1 = 1 ";
+ string sql1 = "Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Gy_EquipMent");
+ ds = oCN.RunProcReturn(sql, "HEquipFileNumber");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
new file mode 100644
index 0000000..30db31b
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -0,0 +1,356 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SBGL
+{
+ public class Gy_EquipFileMainController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
+ public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();
+
+ #region 璁惧妗ｆ鍒楄〃
+
+ [Route("Gy_EquipFileMain/GetList")]
+ [HttpGet]
+ public object GetList(string sWhere)
+ {
+ try
+ {
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select *from h_v_Gy_EquipFileMainList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_EquipFileMainList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_EquipFileMainList where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region [璁惧妗ｆ鍒犻櫎鍔熻兘]
+ [Route("Gy_EquipFileMain/Delete_EquipFile")]
+ [HttpGet]
+ public object Delete_EquipFile(string HItemID)
+ {
+ string s = "";
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HItemID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region[璁惧妗ｆ缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("Gy_EquipFileMain/Gy_EquipFileCheckDetai")]
+ [HttpGet]
+ public object Gy_EquipFileCheckDetai(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMainList where hmainid=" + HInterID, "h_v_Gy_EquipFileMainList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧妗ｆ鏂板淇濆瓨
+ /// <summary>
+ /// 妯℃不鍏峰垎绫�-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_EquipFileMain/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+
+ List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
+
+ string hbillno= list[0].HBillNo;
+ DateTime HDate = list[0].HDate;
+ long HInterID = list[0].HInterID;
+ string HEquipFileNumber = list[0].HEquipFileNumber;
+ string HEquipFileNo = list[0].HEquipFileNo; // varchar(50) //璁惧缂栫爜(鍞竴)
+ string HName = list[0].HName; // 鈭� varchar(100) //璁惧鍚嶇О
+ string HModel = list[0].HModel; // 鈭� varchar(100) //璁惧瑙勬牸
+ string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
+ int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
+ int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅
+ DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
+ int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
+ int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
+ int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
+ string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
+ DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
+ int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
+ string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
+ string HBarCode = list[0].HBarCode; //鈭� varchar(100) //鏉″舰鐮�(鏆傛椂淇濆瓨姝ゅ瓧娈�)
+ string HWorkArea = list[0].HWorkArea; //鈭� varchar(50) //浜у湴
+ string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
+ int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
+ int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+
+ if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert into Gy_EquipFileBillMain " +
+ " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
+ ",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
+ "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate) " +
+ " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
+ ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
+ "','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +
+ "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧妗ｆ淇敼淇濆瓨
+
+ [Route("Gy_EquipFileMain/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
+
+ long HInterID = list[0].HInterID;
+ string HEquipFileNumber = list[0].HEquipFileNumber;
+ string HEquipFileNo = list[0].HEquipFileNo; // varchar(50) //璁惧缂栫爜(鍞竴)
+ string HName = list[0].HName; // 鈭� varchar(100) //璁惧鍚嶇О
+ string HModel = list[0].HModel; // 鈭� varchar(100) //璁惧瑙勬牸
+ string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
+ int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
+ int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅
+ DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
+ int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
+ int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
+ int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
+ string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
+ DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
+ int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
+ string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
+ string HBarCode = list[0].HBarCode; //鈭� varchar(100) //鏉″舰鐮�(鏆傛椂淇濆瓨姝ゅ瓧娈�)
+ string HWorkArea = list[0].HWorkArea; //鈭� varchar(50) //浜у湴
+ string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
+ int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
+ int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+
+ if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DataSet DS = oCN.RunProcReturn("Select * from Gy_EquipFileBillMain Where HEquipFileNumber='" + HEquipFileNumber + "' and HInterID<>" + HInterID, "Gy_EquipFileBillMain", ref Pub_Class.ClsPub.sExeReturnInfo);
+
+ if (DS.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_EquipFileBillMain set " +
+ " HEquipFileNumber='" + HEquipFileNumber + "'" +
+ " HEquipFileNo='" + HEquipFileNo + "'" +
+ " HName='" + HName + "'" +
+ " HModel='" + HModel + "'" +
+ " HModel2='" + HModel2 + "'" +
+ " HMaterID=" + HMaterID +
+ " HUnitID=" + HUnitID +
+ " HOutComDate='" + HOutComDate + "'" +
+ " HOutComNo='" + HOutComNo + "'" +
+ " HDeptID=" + HDeptID +
+ " HUseEmpID=" + HUseEmpID +
+ " HRepairEmpID=" + HRepairEmpID +
+ " HAddress='" + HAddress + "'" +
+ " HSetupDate='" + HSetupDate + "'" +
+ " HStartupDate='" + HStartupDate + "'" +
+ " HStatus='" + HStatus + "'" +
+ " HEquipFileTypeID=" + HEquipFileTypeID +
+ ",HProNum='" + HProNum + "'" +
+ ",HBarCode='" + HBarCode + "'" +
+ ",HWorkArea='" + HWorkArea + "'" +
+ ",HLogo=" + HLogo +
+ ",HSellSupID=" + HSellSupID +
+ ",HMakeSupID= " + HMakeSupID +
+ " Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
index fde83d0..ec34e58 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -17,8 +17,8 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- public DLL.ClsGy_EquipTypeBill BillNew0 = new DLL.ClsGy_EquipTypeBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
- public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
+ public DLL.ClsGy_EquipTypeBill BillNew0 = new DLL.ClsGy_EquipTypeBill();
+ public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill();
#region 璁惧鍒嗙被鍒楄〃
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index 00db2c6..ed7c21c 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -162,39 +162,36 @@
}
//閰嶄欢琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- if (msg4 != "undefined" && msg4 != "" && msg4 != "[]")
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipMaintainBillSub> ls1 = new List<Model.ClsSb_EquipMaintainBillSub>();
+ ls1 = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg4);
+ int j = 0;
+ foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls1)
{
- msg4 = msg4.Substring(1, msg4.Length - 2);
- msg4 = msg4.Replace("\\", "");
- msg4 = msg4.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSb_EquipMaintainBillSub> ls1 = new List<Model.ClsSb_EquipMaintainBillSub>();
- ls1 = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg4);
- int j = 0;
- foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls1)
- {
- j++;
- oItemSub.HEntryID = i;
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
- oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+ j++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
- oBill.DetailColl.Add(oItemSub);
+ oBill.DetailColl.Add(oItemSub);
- }
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -485,7 +482,7 @@
try
{
DLL.ClsSb_EquipMaintainBill oBill = new DLL.ClsSb_EquipMaintainBill();
- List<Models.ClsSb_EquipMaintainBillMain > lsmain = new List<Models.ClsSb_EquipMaintainBillMain>();
+ List<Models.ClsSb_EquipMaintainBillMain> lsmain = new List<Models.ClsSb_EquipMaintainBillMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Sb_EquipMaintainBillMainPDA(msg2);
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index 636bc84..03df50f 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -157,39 +157,36 @@
}
//閰嶄欢椤硅〃浣撴暟鎹�
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- if (msg4 != "undefined" && msg4 != "" && msg4 != "[]")
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipMaintainPlanBillSub> ls1 = new List<Model.ClsSb_EquipMaintainPlanBillSub>();
+ ls1 = oListModels.getObjectByJson_Sb_EquipMaintainPlanBillSub(msg4);
+ int j = 0;
+ foreach (Model.ClsSb_EquipMaintainPlanBillSub oItemSub in ls1)
{
- msg4 = msg4.Substring(1, msg4.Length - 2);
- msg4 = msg4.Replace("\\", "");
- msg4 = msg4.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSb_EquipMaintainPlanBillSub> ls1 = new List<Model.ClsSb_EquipMaintainPlanBillSub>();
- ls1 = oListModels.getObjectByJson_Sb_EquipMaintainPlanBillSub(msg4);
- int j = 0;
- foreach (Model.ClsSb_EquipMaintainPlanBillSub oItemSub in ls1)
- {
- j++;
- oItemSub.HEntryID = j;
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
- oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+ j++;
+ oItemSub.HEntryID = j;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
- oBill.DetailColl.Add(oItemSub);
+ oBill.DetailColl.Add(oItemSub);
- }
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -378,7 +375,7 @@
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + "";
ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");
-
+
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 29b5852..990976b 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -63,12 +63,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere, "h_v_Sb_EquipRepairWorkBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairWorkBillList");
}
else
{
string sql1 = "select * from h_v_Sb_EquipRepairWorkBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairWorkBillList");
}
@@ -113,12 +113,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere, "h_v_Sb_EquipRepairCheckBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
}
else
{
string sql1 = "select * from h_v_Sb_EquipRepairCheckBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList");
}
@@ -163,12 +163,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList" + sWhere, "h_v_Sb_EquipConkBookBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList order by hmainid desc" + sWhere, "h_v_Sb_EquipConkBookBillList");
}
else
{
string sql1 = "select * from h_v_Sb_EquipConkBookBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList");
}
}
diff --git a/WebAPI/DLL/ClsGy_EquipFileMain.cs b/WebAPI/DLL/ClsGy_EquipFileMain.cs
new file mode 100644
index 0000000..abc61a5
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_EquipFileMain.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_EquipFileMain : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsGy_EquipFileMain omodel = new Models.ClsGy_EquipFileMain();
+ public ClsGy_EquipFileMain()
+ {
+ base.MvarItemKeySub = "";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_EquipFileMain";
+ base.MvarReportTitle = "璁惧妗ｆ";
+ base.BillType = "";
+ base.HBillSubType = "";
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsGy_EquipFileMain.cs b/WebAPI/Models/ClsGy_EquipFileMain.cs
new file mode 100644
index 0000000..6338f00
--- /dev/null
+++ b/WebAPI/Models/ClsGy_EquipFileMain.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_EquipFileMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public string HEquipFileNumber; //varchar(50) //璁惧浠ｇ爜
+ public string HEquipFileNo; // varchar(50) //璁惧缂栫爜(鍞竴)
+ public string HName; // 鈭� varchar(100) //璁惧鍚嶇О
+ public string HModel; // 鈭� varchar(100) //璁惧瑙勬牸
+ public string HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
+ public int HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
+ public int HUnitID; // 鈭� int //鍗曚綅
+ public DateTime HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ public string HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
+ public int HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
+ public int HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
+ public int HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
+ public string HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
+ public DateTime HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ public DateTime HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ public string HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
+ public int HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
+ public string HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
+ public string HBarCode; //鈭� varchar(100) //鏉″舰鐮�(鏆傛椂淇濆瓨姝ゅ瓧娈�)
+ public string HWorkArea; //鈭� varchar(50) //浜у湴
+ public string HLogo; //鈭� varchar(50) //鍝佺墝
+ public int HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
+ public int HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_OrderBackInfo.cs b/WebAPI/Models/Gy_OrderBackInfo.cs
index 9c6b05c..ff6a493 100644
--- a/WebAPI/Models/Gy_OrderBackInfo.cs
+++ b/WebAPI/Models/Gy_OrderBackInfo.cs
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
+=======
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
namespace WebAPI.Models
{
public class Gy_OrderBackInfo
@@ -14,6 +22,7 @@
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
public long HEndFlag { get; set; } //
+<<<<<<< HEAD
public string HHelpCode { get; set; } // 鍔╄鐮�
@@ -23,5 +32,16 @@
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+=======
+
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+
+ public string HRemark { get; set; } //澶囨敞
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
index e5f326b..82f4f07 100644
--- a/WebAPI/Models/Gy_OrderLevList.cs
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
+=======
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
namespace WebAPI.Models
{
public class Gy_OrderLevList
@@ -10,6 +18,7 @@
public long HItemID { get; set; } //ID
public string HNumber { get; set; } //浠ｇ爜
public string HName { get; set; } //鍚嶇О
+<<<<<<< HEAD
public string HShortNumber { get; set; } //鐭唬鐮�
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
@@ -23,6 +32,21 @@
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+=======
+ public string HShortNumber { get; set; } // 鐭唬鐮�
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HLevel { get; set; } //灞傜骇
+ public long HEndFlag { get; set; }
+
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+
+ public string HRemark { get; set; } // 澶囨敞
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
public string HYX { get; set; }//浼樺厛绾�
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
index b8d7204..8d9cb07 100644
--- a/WebAPI/Models/Gy_WorkPayType.cs
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -16,11 +16,20 @@
public long HLevel { get; set; }
public bool HEndFlag { get; set; } //鏈骇鏍囧織
public bool HStopflag { get; set; } //绂佺敤鏍囧織
+<<<<<<< HEAD
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
+=======
+
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+
+
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_WorkType.cs b/WebAPI/Models/Gy_WorkType.cs
index 77d0eb1..34a1a24 100644
--- a/WebAPI/Models/Gy_WorkType.cs
+++ b/WebAPI/Models/Gy_WorkType.cs
@@ -21,8 +21,14 @@
public string HForEmp { get; set; } //鐭唬鐮�
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 77d6983..b9a1b09 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -281,8 +281,9 @@
<Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
@@ -306,6 +307,7 @@
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
<Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
<Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
<Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -346,6 +348,7 @@
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
+ <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
<Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
@@ -386,6 +389,7 @@
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
<Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
+ <Compile Include="DLL\ClsGy_EquipFileMain.cs" />
<Compile Include="DLL\ClsGy_EquipTypeBill.cs" />
<Compile Include="DLL\ClsGy_Material_Ctl.cs" />
<Compile Include="DLL\ClsGy_Source_Ctl.cs" />
@@ -433,6 +437,7 @@
<Compile Include="Models\CheckItem.cs" />
<Compile Include="Models\Gy_OrderBackInfo.cs" />
<Compile Include="Models\Gy_OrderLevList.cs" />
+ <Compile Include="Models\ClsGy_EquipFileMain.cs" />
<Compile Include="Models\ClsGy_EquipFileType.cs" />
<Compile Include="Models\ClsGy_Material_Model.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
@@ -449,13 +454,13 @@
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
<Compile Include="Models\ClsGy_ProcPrice.cs" />
+ <Compile Include="Models\Gy_WorkType.cs" />
+ <Compile Include="Models\Gy_WorkPayType.cs" />
<Compile Include="Models\Xt_DataDictionary_Proc.cs" />
<Compile Include="Models\Xt_DataDictionary_View.cs" />
<Compile Include="Models\Xt_DataDictionary_Table.cs" />
<Compile Include="Models\Gy_User.cs" />
<Compile Include="Models\Gy_UserSupper.cs" />
- <Compile Include="Models\Gy_WorkPayType.cs" />
- <Compile Include="Models\Gy_WorkType.cs" />
<Compile Include="Models\Menu.cs" />
<Compile Include="Models\ModelConvertHelper.cs" />
<Compile Include="Models\Pay_OtherBalBill.cs" />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
index 4f6fe63..d54dea7 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
@@ -1576,10 +1576,10 @@
oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
- oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
+ oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
- oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
+ oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
oBF.ShowDialog();
if (oBF.BillChange)
{
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs"
index c6c059a..6443a51 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.designer.cs"
@@ -64,53 +64,63 @@
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.txtHSourceNameList = new System.Windows.Forms.TextBox();
- this.label40 = new System.Windows.Forms.Label();
this.txtHGroupName = new System.Windows.Forms.TextBox();
- this.label39 = new System.Windows.Forms.Label();
this.txtHQCCheckName = new System.Windows.Forms.TextBox();
this.txtHQCCheckID = new System.Windows.Forms.TextBox();
this.txtHSourceName = new System.Windows.Forms.TextBox();
this.cmdHQCCheckID = new System.Windows.Forms.Button();
this.txtHWorkTimes = new System.Windows.Forms.TextBox();
- this.label38 = new System.Windows.Forms.Label();
this.txtHMouldNum = new System.Windows.Forms.TextBox();
- this.label37 = new System.Windows.Forms.Label();
- this.label13 = new System.Windows.Forms.Label();
this.txtHEmpName5 = new System.Windows.Forms.TextBox();
this.txtHEmpName4 = new System.Windows.Forms.TextBox();
this.txtHEmpName3 = new System.Windows.Forms.TextBox();
this.txtHEmpName2 = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
this.txtHBillNo = new System.Windows.Forms.TextBox();
this.cmdHEmpID5 = new System.Windows.Forms.Button();
this.txtHCenterID = new System.Windows.Forms.TextBox();
this.cmdHEmpID4 = new System.Windows.Forms.Button();
- this.label20 = new System.Windows.Forms.Label();
this.cmdHEmpID3 = new System.Windows.Forms.Button();
this.txtHProcNo = new System.Windows.Forms.TextBox();
this.cmdHEmpID2 = new System.Windows.Forms.Button();
- this.label23 = new System.Windows.Forms.Label();
this.txtHRemark = new System.Windows.Forms.TextBox();
- this.label29 = new System.Windows.Forms.Label();
- this.label24 = new System.Windows.Forms.Label();
this.txtHEmpID5 = new System.Windows.Forms.TextBox();
- this.label30 = new System.Windows.Forms.Label();
this.txtHOrderProcNO = new System.Windows.Forms.TextBox();
- this.label28 = new System.Windows.Forms.Label();
this.txtHEmpID4 = new System.Windows.Forms.TextBox();
- this.label27 = new System.Windows.Forms.Label();
this.txtHEmpID3 = new System.Windows.Forms.TextBox();
this.txtHEmpName = new System.Windows.Forms.TextBox();
- this.label26 = new System.Windows.Forms.Label();
this.txtHEmpID2 = new System.Windows.Forms.TextBox();
this.txtHStationOutTime = new System.Windows.Forms.TextBox();
this.txtHQty = new System.Windows.Forms.TextBox();
this.txtHWasterQty = new System.Windows.Forms.TextBox();
- this.label18 = new System.Windows.Forms.Label();
- this.label25 = new System.Windows.Forms.Label();
this.txtHPayProcID = new System.Windows.Forms.TextBox();
this.chkHLastSubProc = new System.Windows.Forms.CheckBox();
+ this.label40 = new System.Windows.Forms.Label();
+ this.label39 = new System.Windows.Forms.Label();
+ this.label38 = new System.Windows.Forms.Label();
+ this.label37 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label29 = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.label30 = new System.Windows.Forms.Label();
+ this.label28 = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.label26 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.txtHDSQty = new System.Windows.Forms.TextBox();
+ this.txtHPriceRate = new System.Windows.Forms.TextBox();
+ this.txtHBadCount = new System.Windows.Forms.TextBox();
+ this.txtHWWWorkOrderBillNo = new System.Windows.Forms.TextBox();
+ this.txtHPlanPieceQty = new System.Windows.Forms.TextBox();
+ this.txtHUnitChongQty = new System.Windows.Forms.TextBox();
+ this.txtHBadPNL = new System.Windows.Forms.TextBox();
+ this.txtHPieceQty = new System.Windows.Forms.TextBox();
+ this.txtHChongQty = new System.Windows.Forms.TextBox();
+ this.txtHChecker = new System.Windows.Forms.TextBox();
this.label41 = new System.Windows.Forms.Label();
this.txtHSourceName5 = new System.Windows.Forms.TextBox();
this.txtHSourceID5 = new System.Windows.Forms.TextBox();
@@ -127,26 +137,16 @@
this.txtHSourceName2 = new System.Windows.Forms.TextBox();
this.txtHSourceID2 = new System.Windows.Forms.TextBox();
this.cmdHSourceID2 = new System.Windows.Forms.Button();
- this.txtHDSQty = new System.Windows.Forms.TextBox();
this.label31 = new System.Windows.Forms.Label();
- this.txtHPriceRate = new System.Windows.Forms.TextBox();
- this.txtHBadCount = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
- this.txtHWWWorkOrderBillNo = new System.Windows.Forms.TextBox();
this.label19 = new System.Windows.Forms.Label();
this.label35 = new System.Windows.Forms.Label();
- this.txtHPlanPieceQty = new System.Windows.Forms.TextBox();
- this.txtHUnitChongQty = new System.Windows.Forms.TextBox();
this.label34 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label();
- this.txtHBadPNL = new System.Windows.Forms.TextBox();
- this.txtHPieceQty = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.label32 = new System.Windows.Forms.Label();
this.label33 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
- this.txtHChongQty = new System.Windows.Forms.TextBox();
- this.txtHChecker = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1 = new System.Windows.Forms.Panel();
@@ -202,9 +202,10 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Enabled = false;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(308, 124);
+ this.cmdHMaterID.Location = new System.Drawing.Point(404, 151);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHMaterID.Size = new System.Drawing.Size(35, 35);
this.cmdHMaterID.TabIndex = 86;
this.cmdHMaterID.TabStop = false;
this.cmdHMaterID.UseVisualStyleBackColor = false;
@@ -217,10 +218,11 @@
this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(120, 124);
+ this.txtHMaterID.Location = new System.Drawing.Point(153, 151);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(188, 28);
+ this.txtHMaterID.Size = new System.Drawing.Size(249, 34);
this.txtHMaterID.TabIndex = 85;
this.txtHMaterID.TabStop = false;
this.txtHMaterID.Tag = "0";
@@ -232,9 +234,10 @@
this.label16.BackColor = System.Drawing.Color.Gray;
this.label16.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.ForeColor = System.Drawing.Color.Yellow;
- this.label16.Location = new System.Drawing.Point(17, 128);
+ this.label16.Location = new System.Drawing.Point(16, 156);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(90, 21);
+ this.label16.Size = new System.Drawing.Size(112, 27);
this.label16.TabIndex = 84;
this.label16.Text = "浜у搧浠ｇ爜锛�";
//
@@ -244,9 +247,10 @@
this.label9.BackColor = System.Drawing.Color.Gray;
this.label9.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Yellow;
- this.label9.Location = new System.Drawing.Point(345, 41);
+ this.label9.Location = new System.Drawing.Point(453, 47);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(90, 21);
+ this.label9.Size = new System.Drawing.Size(112, 27);
this.label9.TabIndex = 82;
this.label9.Text = "姹囨姤鏃堕棿锛�";
//
@@ -255,9 +259,10 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Yellow;
- this.label2.Location = new System.Drawing.Point(17, 302);
+ this.label2.Location = new System.Drawing.Point(16, 374);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(84, 21);
+ this.label2.Size = new System.Drawing.Size(104, 27);
this.label2.TabIndex = 80;
this.label2.Text = "浠� 鍔� 鍗曪細";
//
@@ -266,10 +271,11 @@
this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(120, 298);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(153, 368);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(249, 34);
this.txtHICMOBillNo.TabIndex = 81;
this.txtHICMOBillNo.TabStop = false;
//
@@ -278,10 +284,11 @@
this.txtHProcExchBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcExchBillNo.Location = new System.Drawing.Point(120, 8);
+ this.txtHProcExchBillNo.Location = new System.Drawing.Point(153, 6);
+ this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
this.txtHProcExchBillNo.ReadOnly = true;
- this.txtHProcExchBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHProcExchBillNo.Size = new System.Drawing.Size(249, 34);
this.txtHProcExchBillNo.TabIndex = 1;
this.txtHProcExchBillNo.TabStop = false;
this.txtHProcExchBillNo.Tag = "0";
@@ -293,9 +300,10 @@
this.label1.BackColor = System.Drawing.Color.Gray;
this.label1.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Yellow;
- this.label1.Location = new System.Drawing.Point(17, 12);
+ this.label1.Location = new System.Drawing.Point(16, 11);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(74, 21);
+ this.label1.Size = new System.Drawing.Size(92, 27);
this.label1.TabIndex = 87;
this.label1.Text = "娴佽浆鍗★細";
//
@@ -305,10 +313,11 @@
this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterModel.Location = new System.Drawing.Point(120, 182);
+ this.txtHMaterModel.Location = new System.Drawing.Point(153, 224);
+ this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterModel.Name = "txtHMaterModel";
this.txtHMaterModel.ReadOnly = true;
- this.txtHMaterModel.Size = new System.Drawing.Size(188, 28);
+ this.txtHMaterModel.Size = new System.Drawing.Size(249, 34);
this.txtHMaterModel.TabIndex = 90;
this.txtHMaterModel.TabStop = false;
this.txtHMaterModel.Tag = "0";
@@ -319,9 +328,10 @@
this.label3.BackColor = System.Drawing.Color.Gray;
this.label3.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Yellow;
- this.label3.Location = new System.Drawing.Point(17, 186);
+ this.label3.Location = new System.Drawing.Point(16, 228);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(90, 21);
+ this.label3.Size = new System.Drawing.Size(112, 27);
this.label3.TabIndex = 89;
this.label3.Text = "瑙勬牸鍨嬪彿锛�";
//
@@ -329,9 +339,10 @@
//
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(619, 124);
+ this.cmdHEmpID.Location = new System.Drawing.Point(818, 151);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID.Size = new System.Drawing.Size(35, 35);
this.cmdHEmpID.TabIndex = 93;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -341,9 +352,10 @@
this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(431, 124);
+ this.txtHEmpID.Location = new System.Drawing.Point(568, 151);
+ this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID.Name = "txtHEmpID";
- this.txtHEmpID.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID.Size = new System.Drawing.Size(111, 34);
this.txtHEmpID.TabIndex = 2;
this.txtHEmpID.Tag = "0";
this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -355,9 +367,10 @@
this.label4.BackColor = System.Drawing.Color.Gray;
this.label4.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(345, 128);
+ this.label4.Location = new System.Drawing.Point(453, 156);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(84, 21);
+ this.label4.Size = new System.Drawing.Size(104, 27);
this.label4.TabIndex = 91;
this.label4.Text = "鎿� 浣� 鍛橈細";
//
@@ -365,9 +378,10 @@
//
this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(306, 327);
+ this.cmdHSourceID.Location = new System.Drawing.Point(401, 405);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHSourceID.Size = new System.Drawing.Size(35, 35);
this.cmdHSourceID.TabIndex = 96;
this.cmdHSourceID.TabStop = false;
this.cmdHSourceID.UseVisualStyleBackColor = false;
@@ -378,9 +392,10 @@
this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(120, 327);
+ this.txtHSourceID.Location = new System.Drawing.Point(153, 405);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID.Name = "txtHSourceID";
- this.txtHSourceID.Size = new System.Drawing.Size(92, 28);
+ this.txtHSourceID.Size = new System.Drawing.Size(121, 34);
this.txtHSourceID.TabIndex = 95;
this.txtHSourceID.TabStop = false;
this.txtHSourceID.Tag = "0";
@@ -392,9 +407,10 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Yellow;
- this.label5.Location = new System.Drawing.Point(17, 331);
+ this.label5.Location = new System.Drawing.Point(16, 410);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(90, 21);
+ this.label5.Size = new System.Drawing.Size(112, 27);
this.label5.TabIndex = 94;
this.label5.Text = "鐢熶骇璧勬簮锛�";
//
@@ -403,10 +419,11 @@
this.txtHICMOQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOQty.Location = new System.Drawing.Point(120, 269);
+ this.txtHICMOQty.Location = new System.Drawing.Point(153, 332);
+ this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOQty.Name = "txtHICMOQty";
this.txtHICMOQty.ReadOnly = true;
- this.txtHICMOQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHICMOQty.Size = new System.Drawing.Size(249, 34);
this.txtHICMOQty.TabIndex = 98;
this.txtHICMOQty.TabStop = false;
this.txtHICMOQty.Tag = "0";
@@ -417,9 +434,10 @@
this.label6.BackColor = System.Drawing.Color.Gray;
this.label6.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Yellow;
- this.label6.Location = new System.Drawing.Point(364, 35);
+ this.label6.Location = new System.Drawing.Point(485, 44);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(109, 21);
+ this.label6.Size = new System.Drawing.Size(135, 27);
this.label6.TabIndex = 97;
this.label6.Text = "杩涚珯 PCS鏁帮細";
//
@@ -428,10 +446,11 @@
this.txtHPlanQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(126, 149);
+ this.txtHPlanQty.Location = new System.Drawing.Point(168, 186);
+ this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
- this.txtHPlanQty.Size = new System.Drawing.Size(187, 28);
+ this.txtHPlanQty.Size = new System.Drawing.Size(248, 34);
this.txtHPlanQty.TabIndex = 100;
this.txtHPlanQty.TabStop = false;
this.txtHPlanQty.Tag = "0";
@@ -442,9 +461,10 @@
this.label7.BackColor = System.Drawing.Color.Gray;
this.label7.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Yellow;
- this.label7.Location = new System.Drawing.Point(345, 157);
+ this.label7.Location = new System.Drawing.Point(453, 192);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(90, 21);
+ this.label7.Size = new System.Drawing.Size(112, 27);
this.label7.TabIndex = 99;
this.label7.Text = "鍚堟牸鏁伴噺锛�";
//
@@ -452,9 +472,10 @@
//
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
- this.cmdHGroupID.Location = new System.Drawing.Point(619, 8);
+ this.cmdHGroupID.Location = new System.Drawing.Point(818, 6);
+ this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHGroupID.Size = new System.Drawing.Size(35, 35);
this.cmdHGroupID.TabIndex = 103;
this.cmdHGroupID.UseVisualStyleBackColor = false;
this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
@@ -465,9 +486,10 @@
this.txtHGroupID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupID.Location = new System.Drawing.Point(431, 8);
+ this.txtHGroupID.Location = new System.Drawing.Point(568, 6);
+ this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHGroupID.Name = "txtHGroupID";
- this.txtHGroupID.Size = new System.Drawing.Size(84, 28);
+ this.txtHGroupID.Size = new System.Drawing.Size(111, 34);
this.txtHGroupID.TabIndex = 102;
this.txtHGroupID.TabStop = false;
this.txtHGroupID.Tag = "0";
@@ -479,9 +501,10 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Yellow;
- this.label8.Location = new System.Drawing.Point(345, 12);
+ this.label8.Location = new System.Drawing.Point(453, 11);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(90, 21);
+ this.label8.Size = new System.Drawing.Size(112, 27);
this.label8.TabIndex = 101;
this.label8.Text = "鐢熶骇鐝粍锛�";
//
@@ -490,9 +513,10 @@
this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcID.Enabled = false;
this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
- this.cmdHProcID.Location = new System.Drawing.Point(308, 95);
+ this.cmdHProcID.Location = new System.Drawing.Point(404, 115);
+ this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHProcID.Name = "cmdHProcID";
- this.cmdHProcID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHProcID.Size = new System.Drawing.Size(35, 35);
this.cmdHProcID.TabIndex = 106;
this.cmdHProcID.TabStop = false;
this.cmdHProcID.UseVisualStyleBackColor = false;
@@ -505,10 +529,11 @@
this.txtHProcID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcID.ForeColor = System.Drawing.Color.Green;
this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcID.Location = new System.Drawing.Point(120, 95);
+ this.txtHProcID.Location = new System.Drawing.Point(153, 115);
+ this.txtHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcID.Name = "txtHProcID";
this.txtHProcID.ReadOnly = true;
- this.txtHProcID.Size = new System.Drawing.Size(188, 28);
+ this.txtHProcID.Size = new System.Drawing.Size(249, 34);
this.txtHProcID.TabIndex = 105;
this.txtHProcID.TabStop = false;
this.txtHProcID.Tag = "0";
@@ -521,9 +546,10 @@
this.label10.BackColor = System.Drawing.Color.Gray;
this.label10.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Yellow;
- this.label10.Location = new System.Drawing.Point(17, 99);
+ this.label10.Location = new System.Drawing.Point(16, 120);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(90, 21);
+ this.label10.Size = new System.Drawing.Size(112, 27);
this.label10.TabIndex = 104;
this.label10.Text = "褰撳墠宸ュ簭锛�";
//
@@ -533,10 +559,11 @@
this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterName.Location = new System.Drawing.Point(120, 153);
+ this.txtHMaterName.Location = new System.Drawing.Point(153, 187);
+ this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterName.Name = "txtHMaterName";
this.txtHMaterName.ReadOnly = true;
- this.txtHMaterName.Size = new System.Drawing.Size(188, 28);
+ this.txtHMaterName.Size = new System.Drawing.Size(249, 34);
this.txtHMaterName.TabIndex = 108;
this.txtHMaterName.TabStop = false;
this.txtHMaterName.Tag = "0";
@@ -547,9 +574,10 @@
this.label11.BackColor = System.Drawing.Color.Gray;
this.label11.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Yellow;
- this.label11.Location = new System.Drawing.Point(17, 157);
+ this.label11.Location = new System.Drawing.Point(16, 192);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(90, 21);
+ this.label11.Size = new System.Drawing.Size(112, 27);
this.label11.TabIndex = 107;
this.label11.Text = "浜у搧鍚嶇О锛�";
//
@@ -560,8 +588,10 @@
this.gbUp.Controls.Add(this.tabControl2);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
this.gbUp.Location = new System.Drawing.Point(0, 0);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(935, 485);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(935, 606);
this.gbUp.TabIndex = 114;
this.gbUp.TabStop = false;
//
@@ -571,11 +601,11 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
- this.groupBox1.Location = new System.Drawing.Point(677, 17);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Location = new System.Drawing.Point(903, 22);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.groupBox1.Size = new System.Drawing.Size(255, 465);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.groupBox1.Size = new System.Drawing.Size(28, 580);
this.groupBox1.TabIndex = 181;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "鏈珯宸ュ崟";
@@ -584,12 +614,12 @@
//
this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdCardList.Location = new System.Drawing.Point(2, 21);
- this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.grdCardList.Location = new System.Drawing.Point(3, 25);
+ this.grdCardList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.grdCardList.Name = "grdCardList";
this.grdCardList.RowHeadersWidth = 51;
this.grdCardList.RowTemplate.Height = 27;
- this.grdCardList.Size = new System.Drawing.Size(251, 442);
+ this.grdCardList.Size = new System.Drawing.Size(22, 553);
this.grdCardList.TabIndex = 150;
//
// tabControl2
@@ -597,11 +627,11 @@
this.tabControl2.Controls.Add(this.tabPage2);
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Left;
- this.tabControl2.Location = new System.Drawing.Point(3, 17);
- this.tabControl2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabControl2.Location = new System.Drawing.Point(4, 22);
+ this.tabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(674, 465);
+ this.tabControl2.Size = new System.Drawing.Size(899, 580);
this.tabControl2.TabIndex = 180;
//
// tabPage2
@@ -609,7 +639,9 @@
this.tabPage2.BackColor = System.Drawing.Color.Gray;
this.tabPage2.Controls.Add(this.txtHSourceNameList);
this.tabPage2.Controls.Add(this.txtHGroupName);
+ this.tabPage2.Controls.Add(this.txtHBadCount);
this.tabPage2.Controls.Add(this.txtHQCCheckName);
+ this.tabPage2.Controls.Add(this.label17);
this.tabPage2.Controls.Add(this.txtHQCCheckID);
this.tabPage2.Controls.Add(this.txtHSourceName);
this.tabPage2.Controls.Add(this.cmdHQCCheckID);
@@ -680,11 +712,11 @@
this.tabPage2.Controls.Add(this.label8);
this.tabPage2.Controls.Add(this.label18);
this.tabPage2.Controls.Add(this.label25);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.tabPage2.Size = new System.Drawing.Size(666, 439);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage2.Size = new System.Drawing.Size(891, 551);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "鍩烘湰淇℃伅";
//
@@ -693,23 +725,13 @@
this.txtHSourceNameList.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceNameList.ForeColor = System.Drawing.Color.Green;
this.txtHSourceNameList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceNameList.Location = new System.Drawing.Point(120, 356);
+ this.txtHSourceNameList.Location = new System.Drawing.Point(153, 441);
+ this.txtHSourceNameList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceNameList.Name = "txtHSourceNameList";
- this.txtHSourceNameList.Size = new System.Drawing.Size(188, 28);
+ this.txtHSourceNameList.Size = new System.Drawing.Size(249, 34);
this.txtHSourceNameList.TabIndex = 180;
this.txtHSourceNameList.TabStop = false;
this.txtHSourceNameList.Tag = "0";
- //
- // label40
- //
- this.label40.AutoSize = true;
- this.label40.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label40.ForeColor = System.Drawing.Color.Yellow;
- this.label40.Location = new System.Drawing.Point(16, 360);
- this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(90, 21);
- this.label40.TabIndex = 179;
- this.label40.Text = "璁惧娓呭崟锛�";
//
// txtHGroupName
//
@@ -717,26 +739,14 @@
this.txtHGroupName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHGroupName.ForeColor = System.Drawing.Color.Green;
this.txtHGroupName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupName.Location = new System.Drawing.Point(515, 8);
+ this.txtHGroupName.Location = new System.Drawing.Point(680, 6);
+ this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHGroupName.Name = "txtHGroupName";
this.txtHGroupName.ReadOnly = true;
- this.txtHGroupName.Size = new System.Drawing.Size(104, 28);
+ this.txtHGroupName.Size = new System.Drawing.Size(137, 34);
this.txtHGroupName.TabIndex = 178;
this.txtHGroupName.TabStop = false;
this.txtHGroupName.Tag = "0";
- //
- // label39
- //
- this.label39.AutoSize = true;
- this.label39.BackColor = System.Drawing.Color.Gray;
- this.label39.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label39.ForeColor = System.Drawing.Color.Yellow;
- this.label39.Location = new System.Drawing.Point(345, 186);
- this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(89, 21);
- this.label39.TabIndex = 175;
- this.label39.Text = "妫� 楠� 鍛橈細";
- this.label39.Click += new System.EventHandler(this.label39_Click);
//
// txtHQCCheckName
//
@@ -744,10 +754,11 @@
this.txtHQCCheckName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQCCheckName.ForeColor = System.Drawing.Color.Green;
this.txtHQCCheckName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQCCheckName.Location = new System.Drawing.Point(516, 180);
+ this.txtHQCCheckName.Location = new System.Drawing.Point(681, 221);
+ this.txtHQCCheckName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHQCCheckName.Name = "txtHQCCheckName";
this.txtHQCCheckName.ReadOnly = true;
- this.txtHQCCheckName.Size = new System.Drawing.Size(104, 32);
+ this.txtHQCCheckName.Size = new System.Drawing.Size(137, 38);
this.txtHQCCheckName.TabIndex = 177;
this.txtHQCCheckName.TabStop = false;
//
@@ -756,9 +767,10 @@
this.txtHQCCheckID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQCCheckID.ForeColor = System.Drawing.Color.Green;
this.txtHQCCheckID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQCCheckID.Location = new System.Drawing.Point(431, 182);
+ this.txtHQCCheckID.Location = new System.Drawing.Point(568, 224);
+ this.txtHQCCheckID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHQCCheckID.Name = "txtHQCCheckID";
- this.txtHQCCheckID.Size = new System.Drawing.Size(84, 28);
+ this.txtHQCCheckID.Size = new System.Drawing.Size(111, 34);
this.txtHQCCheckID.TabIndex = 174;
this.txtHQCCheckID.Tag = "0";
this.txtHQCCheckID.TextChanged += new System.EventHandler(this.txtHQCCheckID_TextChanged);
@@ -769,10 +781,11 @@
this.txtHSourceName.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName.Location = new System.Drawing.Point(213, 327);
+ this.txtHSourceName.Location = new System.Drawing.Point(277, 405);
+ this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceName.Name = "txtHSourceName";
this.txtHSourceName.ReadOnly = true;
- this.txtHSourceName.Size = new System.Drawing.Size(95, 28);
+ this.txtHSourceName.Size = new System.Drawing.Size(125, 34);
this.txtHSourceName.TabIndex = 1;
this.txtHSourceName.Tag = "0";
this.txtHSourceName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHSourceName_KeyDown);
@@ -781,9 +794,10 @@
//
this.cmdHQCCheckID.BackColor = System.Drawing.Color.Transparent;
this.cmdHQCCheckID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHQCCheckID.Image")));
- this.cmdHQCCheckID.Location = new System.Drawing.Point(619, 182);
+ this.cmdHQCCheckID.Location = new System.Drawing.Point(818, 224);
+ this.cmdHQCCheckID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHQCCheckID.Name = "cmdHQCCheckID";
- this.cmdHQCCheckID.Size = new System.Drawing.Size(26, 28);
+ this.cmdHQCCheckID.Size = new System.Drawing.Size(35, 35);
this.cmdHQCCheckID.TabIndex = 176;
this.cmdHQCCheckID.UseVisualStyleBackColor = false;
this.cmdHQCCheckID.Visible = false;
@@ -795,58 +809,25 @@
this.txtHWorkTimes.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWorkTimes.ForeColor = System.Drawing.Color.Green;
this.txtHWorkTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkTimes.Location = new System.Drawing.Point(431, 240);
+ this.txtHWorkTimes.Location = new System.Drawing.Point(568, 296);
+ this.txtHWorkTimes.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWorkTimes.Name = "txtHWorkTimes";
- this.txtHWorkTimes.Size = new System.Drawing.Size(188, 28);
+ this.txtHWorkTimes.Size = new System.Drawing.Size(249, 34);
this.txtHWorkTimes.TabIndex = 172;
this.txtHWorkTimes.Tag = "0";
- //
- // label38
- //
- this.label38.AutoSize = true;
- this.label38.BackColor = System.Drawing.Color.Gray;
- this.label38.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label38.ForeColor = System.Drawing.Color.Yellow;
- this.label38.Location = new System.Drawing.Point(345, 244);
- this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(58, 21);
- this.label38.TabIndex = 173;
- this.label38.Text = "宸ユ椂锛�";
//
// txtHMouldNum
//
this.txtHMouldNum.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMouldNum.ForeColor = System.Drawing.Color.Green;
this.txtHMouldNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMouldNum.Location = new System.Drawing.Point(120, 385);
+ this.txtHMouldNum.Location = new System.Drawing.Point(153, 477);
+ this.txtHMouldNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMouldNum.Name = "txtHMouldNum";
- this.txtHMouldNum.Size = new System.Drawing.Size(188, 28);
+ this.txtHMouldNum.Size = new System.Drawing.Size(249, 34);
this.txtHMouldNum.TabIndex = 171;
this.txtHMouldNum.TabStop = false;
this.txtHMouldNum.Tag = "0";
- //
- // label37
- //
- this.label37.AutoSize = true;
- this.label37.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label37.ForeColor = System.Drawing.Color.Yellow;
- this.label37.Location = new System.Drawing.Point(17, 390);
- this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(74, 21);
- this.label37.TabIndex = 170;
- this.label37.Text = "妯＄┐鍙凤細";
- //
- // label13
- //
- this.label13.AutoSize = true;
- this.label13.BackColor = System.Drawing.Color.Gray;
- this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label13.ForeColor = System.Drawing.Color.Yellow;
- this.label13.Location = new System.Drawing.Point(17, 273);
- this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(106, 21);
- this.label13.TabIndex = 119;
- this.label13.Text = "浠诲姟鍗曟暟閲忥細";
//
// txtHEmpName5
//
@@ -854,10 +835,11 @@
this.txtHEmpName5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName5.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName5.Location = new System.Drawing.Point(515, 354);
+ this.txtHEmpName5.Location = new System.Drawing.Point(680, 438);
+ this.txtHEmpName5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpName5.Name = "txtHEmpName5";
this.txtHEmpName5.ReadOnly = true;
- this.txtHEmpName5.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName5.Size = new System.Drawing.Size(137, 38);
this.txtHEmpName5.TabIndex = 167;
this.txtHEmpName5.TabStop = false;
//
@@ -867,10 +849,11 @@
this.txtHEmpName4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName4.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName4.Location = new System.Drawing.Point(515, 325);
+ this.txtHEmpName4.Location = new System.Drawing.Point(680, 402);
+ this.txtHEmpName4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpName4.Name = "txtHEmpName4";
this.txtHEmpName4.ReadOnly = true;
- this.txtHEmpName4.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName4.Size = new System.Drawing.Size(137, 38);
this.txtHEmpName4.TabIndex = 166;
this.txtHEmpName4.TabStop = false;
//
@@ -880,10 +863,11 @@
this.txtHEmpName3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName3.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName3.Location = new System.Drawing.Point(515, 296);
+ this.txtHEmpName3.Location = new System.Drawing.Point(680, 366);
+ this.txtHEmpName3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpName3.Name = "txtHEmpName3";
this.txtHEmpName3.ReadOnly = true;
- this.txtHEmpName3.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName3.Size = new System.Drawing.Size(137, 38);
this.txtHEmpName3.TabIndex = 165;
this.txtHEmpName3.TabStop = false;
//
@@ -893,24 +877,13 @@
this.txtHEmpName2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName2.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName2.Location = new System.Drawing.Point(515, 267);
+ this.txtHEmpName2.Location = new System.Drawing.Point(680, 330);
+ this.txtHEmpName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpName2.Name = "txtHEmpName2";
this.txtHEmpName2.ReadOnly = true;
- this.txtHEmpName2.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName2.Size = new System.Drawing.Size(137, 38);
this.txtHEmpName2.TabIndex = 164;
this.txtHEmpName2.TabStop = false;
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.BackColor = System.Drawing.Color.Gray;
- this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label12.ForeColor = System.Drawing.Color.Yellow;
- this.label12.Location = new System.Drawing.Point(17, 215);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(84, 21);
- this.label12.TabIndex = 116;
- this.label12.Text = "鍗� 鎹� 鍙凤細";
//
// txtHBillNo
//
@@ -918,10 +891,11 @@
this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(120, 211);
+ this.txtHBillNo.Location = new System.Drawing.Point(153, 260);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.ReadOnly = true;
- this.txtHBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHBillNo.Size = new System.Drawing.Size(249, 34);
this.txtHBillNo.TabIndex = 117;
this.txtHBillNo.TabStop = false;
//
@@ -929,9 +903,10 @@
//
this.cmdHEmpID5.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID5.Image")));
- this.cmdHEmpID5.Location = new System.Drawing.Point(619, 356);
+ this.cmdHEmpID5.Location = new System.Drawing.Point(818, 441);
+ this.cmdHEmpID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID5.Name = "cmdHEmpID5";
- this.cmdHEmpID5.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID5.Size = new System.Drawing.Size(35, 35);
this.cmdHEmpID5.TabIndex = 162;
this.cmdHEmpID5.UseVisualStyleBackColor = false;
this.cmdHEmpID5.Click += new System.EventHandler(this.cmdHEmpID5_Click);
@@ -942,10 +917,11 @@
this.txtHCenterID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHCenterID.ForeColor = System.Drawing.Color.Green;
this.txtHCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCenterID.Location = new System.Drawing.Point(120, 66);
+ this.txtHCenterID.Location = new System.Drawing.Point(153, 78);
+ this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHCenterID.Name = "txtHCenterID";
this.txtHCenterID.ReadOnly = true;
- this.txtHCenterID.Size = new System.Drawing.Size(188, 28);
+ this.txtHCenterID.Size = new System.Drawing.Size(249, 34);
this.txtHCenterID.TabIndex = 141;
this.txtHCenterID.TabStop = false;
//
@@ -953,33 +929,22 @@
//
this.cmdHEmpID4.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID4.Image")));
- this.cmdHEmpID4.Location = new System.Drawing.Point(619, 327);
+ this.cmdHEmpID4.Location = new System.Drawing.Point(818, 405);
+ this.cmdHEmpID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID4.Name = "cmdHEmpID4";
- this.cmdHEmpID4.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID4.Size = new System.Drawing.Size(35, 35);
this.cmdHEmpID4.TabIndex = 159;
this.cmdHEmpID4.UseVisualStyleBackColor = false;
this.cmdHEmpID4.Click += new System.EventHandler(this.cmdHEmpID4_Click);
- //
- // label20
- //
- this.label20.AutoSize = true;
- this.label20.BackColor = System.Drawing.Color.Gray;
- this.label20.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.ForeColor = System.Drawing.Color.Yellow;
- this.label20.Location = new System.Drawing.Point(17, 70);
- this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(90, 21);
- this.label20.TabIndex = 140;
- this.label20.Text = "宸ヤ綔涓績锛�";
- this.label20.Click += new System.EventHandler(this.label20_Click);
//
// cmdHEmpID3
//
this.cmdHEmpID3.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID3.Image")));
- this.cmdHEmpID3.Location = new System.Drawing.Point(619, 298);
+ this.cmdHEmpID3.Location = new System.Drawing.Point(818, 368);
+ this.cmdHEmpID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID3.Name = "cmdHEmpID3";
- this.cmdHEmpID3.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID3.Size = new System.Drawing.Size(35, 35);
this.cmdHEmpID3.TabIndex = 156;
this.cmdHEmpID3.UseVisualStyleBackColor = false;
this.cmdHEmpID3.Click += new System.EventHandler(this.cmdHEmpID3_Click);
@@ -989,9 +954,10 @@
this.txtHProcNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHProcNo.ForeColor = System.Drawing.Color.Green;
this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcNo.Location = new System.Drawing.Point(120, 37);
+ this.txtHProcNo.Location = new System.Drawing.Point(153, 42);
+ this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcNo.Name = "txtHProcNo";
- this.txtHProcNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHProcNo.Size = new System.Drawing.Size(249, 34);
this.txtHProcNo.TabIndex = 145;
this.txtHProcNo.TabStop = false;
this.txtHProcNo.Tag = "0";
@@ -1001,85 +967,40 @@
//
this.cmdHEmpID2.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID2.Image")));
- this.cmdHEmpID2.Location = new System.Drawing.Point(619, 269);
+ this.cmdHEmpID2.Location = new System.Drawing.Point(818, 332);
+ this.cmdHEmpID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID2.Name = "cmdHEmpID2";
- this.cmdHEmpID2.Size = new System.Drawing.Size(26, 28);
+ this.cmdHEmpID2.Size = new System.Drawing.Size(35, 35);
this.cmdHEmpID2.TabIndex = 153;
this.cmdHEmpID2.UseVisualStyleBackColor = false;
this.cmdHEmpID2.Click += new System.EventHandler(this.cmdHEmpID2_Click);
- //
- // label23
- //
- this.label23.AutoSize = true;
- this.label23.BackColor = System.Drawing.Color.Gray;
- this.label23.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label23.ForeColor = System.Drawing.Color.Yellow;
- this.label23.Location = new System.Drawing.Point(17, 41);
- this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(74, 21);
- this.label23.TabIndex = 144;
- this.label23.Text = "娴佹按鍙凤細";
//
// txtHRemark
//
this.txtHRemark.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHRemark.ForeColor = System.Drawing.Color.Green;
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(431, 95);
+ this.txtHRemark.Location = new System.Drawing.Point(568, 115);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(188, 28);
+ this.txtHRemark.Size = new System.Drawing.Size(249, 34);
this.txtHRemark.TabIndex = 169;
this.txtHRemark.TabStop = false;
this.txtHRemark.Tag = "0";
- //
- // label29
- //
- this.label29.AutoSize = true;
- this.label29.BackColor = System.Drawing.Color.Gray;
- this.label29.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label29.ForeColor = System.Drawing.Color.Yellow;
- this.label29.Location = new System.Drawing.Point(345, 360);
- this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(83, 21);
- this.label29.TabIndex = 161;
- this.label29.Text = "鎿嶄綔鍛�5锛�";
- //
- // label24
- //
- this.label24.AutoSize = true;
- this.label24.BackColor = System.Drawing.Color.Gray;
- this.label24.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.ForeColor = System.Drawing.Color.Yellow;
- this.label24.Location = new System.Drawing.Point(17, 244);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(106, 21);
- this.label24.TabIndex = 146;
- this.label24.Text = "璁㈠崟璺熻釜鍙凤細";
//
// txtHEmpID5
//
this.txtHEmpID5.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID5.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID5.Location = new System.Drawing.Point(431, 356);
+ this.txtHEmpID5.Location = new System.Drawing.Point(568, 441);
+ this.txtHEmpID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID5.Name = "txtHEmpID5";
- this.txtHEmpID5.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID5.Size = new System.Drawing.Size(111, 34);
this.txtHEmpID5.TabIndex = 160;
this.txtHEmpID5.Tag = "0";
this.txtHEmpID5.TextChanged += new System.EventHandler(this.txtHEmpID5_TextChanged);
this.txtHEmpID5.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHEmpID5_KeyDown);
- //
- // label30
- //
- this.label30.AutoSize = true;
- this.label30.BackColor = System.Drawing.Color.Gray;
- this.label30.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label30.ForeColor = System.Drawing.Color.Yellow;
- this.label30.Location = new System.Drawing.Point(345, 99);
- this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(58, 21);
- this.label30.TabIndex = 168;
- this.label30.Text = "澶囨敞锛�";
//
// txtHOrderProcNO
//
@@ -1087,59 +1008,38 @@
this.txtHOrderProcNO.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(120, 240);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(153, 296);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(188, 28);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(249, 34);
this.txtHOrderProcNO.TabIndex = 147;
this.txtHOrderProcNO.TabStop = false;
this.txtHOrderProcNO.Tag = "0";
- //
- // label28
- //
- this.label28.AutoSize = true;
- this.label28.BackColor = System.Drawing.Color.Gray;
- this.label28.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label28.ForeColor = System.Drawing.Color.Yellow;
- this.label28.Location = new System.Drawing.Point(345, 331);
- this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(83, 21);
- this.label28.TabIndex = 158;
- this.label28.Text = "鎿嶄綔鍛�4锛�";
//
// txtHEmpID4
//
this.txtHEmpID4.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID4.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID4.Location = new System.Drawing.Point(431, 327);
+ this.txtHEmpID4.Location = new System.Drawing.Point(568, 405);
+ this.txtHEmpID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID4.Name = "txtHEmpID4";
- this.txtHEmpID4.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID4.Size = new System.Drawing.Size(111, 34);
this.txtHEmpID4.TabIndex = 157;
this.txtHEmpID4.Tag = "0";
this.txtHEmpID4.TextChanged += new System.EventHandler(this.txtHEmpID4_TextChanged);
this.txtHEmpID4.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHEmpID4_KeyDown);
- //
- // label27
- //
- this.label27.AutoSize = true;
- this.label27.BackColor = System.Drawing.Color.Gray;
- this.label27.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.ForeColor = System.Drawing.Color.Yellow;
- this.label27.Location = new System.Drawing.Point(345, 302);
- this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(83, 21);
- this.label27.TabIndex = 155;
- this.label27.Text = "鎿嶄綔鍛�3锛�";
//
// txtHEmpID3
//
this.txtHEmpID3.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID3.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID3.Location = new System.Drawing.Point(431, 298);
+ this.txtHEmpID3.Location = new System.Drawing.Point(568, 368);
+ this.txtHEmpID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID3.Name = "txtHEmpID3";
- this.txtHEmpID3.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID3.Size = new System.Drawing.Size(111, 34);
this.txtHEmpID3.TabIndex = 154;
this.txtHEmpID3.Tag = "0";
this.txtHEmpID3.TextChanged += new System.EventHandler(this.txtHEmpID3_TextChanged);
@@ -1151,34 +1051,23 @@
this.txtHEmpName.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpName.ForeColor = System.Drawing.Color.Green;
this.txtHEmpName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpName.Location = new System.Drawing.Point(516, 122);
+ this.txtHEmpName.Location = new System.Drawing.Point(681, 148);
+ this.txtHEmpName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpName.Name = "txtHEmpName";
this.txtHEmpName.ReadOnly = true;
- this.txtHEmpName.Size = new System.Drawing.Size(104, 32);
+ this.txtHEmpName.Size = new System.Drawing.Size(137, 38);
this.txtHEmpName.TabIndex = 163;
this.txtHEmpName.TabStop = false;
- //
- // label26
- //
- this.label26.AutoSize = true;
- this.label26.BackColor = System.Drawing.Color.Gray;
- this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label26.ForeColor = System.Drawing.Color.Yellow;
- this.label26.Location = new System.Drawing.Point(345, 273);
- this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(83, 21);
- this.label26.TabIndex = 152;
- this.label26.Text = "鎿嶄綔鍛�2锛�";
- this.label26.Click += new System.EventHandler(this.label26_Click);
//
// txtHEmpID2
//
this.txtHEmpID2.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID2.ForeColor = System.Drawing.Color.Green;
this.txtHEmpID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID2.Location = new System.Drawing.Point(431, 269);
+ this.txtHEmpID2.Location = new System.Drawing.Point(568, 332);
+ this.txtHEmpID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID2.Name = "txtHEmpID2";
- this.txtHEmpID2.Size = new System.Drawing.Size(84, 28);
+ this.txtHEmpID2.Size = new System.Drawing.Size(111, 34);
this.txtHEmpID2.TabIndex = 151;
this.txtHEmpID2.Tag = "0";
this.txtHEmpID2.TextChanged += new System.EventHandler(this.txtHEmpID2_TextChanged);
@@ -1190,10 +1079,11 @@
this.txtHStationOutTime.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHStationOutTime.ForeColor = System.Drawing.Color.Green;
this.txtHStationOutTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHStationOutTime.Location = new System.Drawing.Point(431, 37);
+ this.txtHStationOutTime.Location = new System.Drawing.Point(568, 42);
+ this.txtHStationOutTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHStationOutTime.Name = "txtHStationOutTime";
this.txtHStationOutTime.ReadOnly = true;
- this.txtHStationOutTime.Size = new System.Drawing.Size(188, 28);
+ this.txtHStationOutTime.Size = new System.Drawing.Size(249, 34);
this.txtHStationOutTime.TabIndex = 112;
this.txtHStationOutTime.TabStop = false;
this.txtHStationOutTime.Tag = "0";
@@ -1203,9 +1093,10 @@
this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHQty.ForeColor = System.Drawing.Color.Green;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(431, 153);
+ this.txtHQty.Location = new System.Drawing.Point(568, 187);
+ this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHQty.Size = new System.Drawing.Size(249, 34);
this.txtHQty.TabIndex = 4;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -1219,47 +1110,25 @@
this.txtHWasterQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWasterQty.ForeColor = System.Drawing.Color.Green;
this.txtHWasterQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWasterQty.Location = new System.Drawing.Point(431, 211);
+ this.txtHWasterQty.Location = new System.Drawing.Point(568, 477);
+ this.txtHWasterQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWasterQty.Name = "txtHWasterQty";
- this.txtHWasterQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHWasterQty.Size = new System.Drawing.Size(249, 34);
this.txtHWasterQty.TabIndex = 5;
this.txtHWasterQty.Tag = "0";
this.txtHWasterQty.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWasterQty_KeyDown);
this.txtHWasterQty.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHWasterQty_KeyPress);
this.txtHWasterQty.Leave += new System.EventHandler(this.txtHWasterQty_Leave);
//
- // label18
- //
- this.label18.AutoSize = true;
- this.label18.BackColor = System.Drawing.Color.Gray;
- this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.ForeColor = System.Drawing.Color.Yellow;
- this.label18.Location = new System.Drawing.Point(345, 215);
- this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(90, 21);
- this.label18.TabIndex = 124;
- this.label18.Text = "鎶ュ簾鏁伴噺锛�";
- //
- // label25
- //
- this.label25.AutoSize = true;
- this.label25.BackColor = System.Drawing.Color.Gray;
- this.label25.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.ForeColor = System.Drawing.Color.Yellow;
- this.label25.Location = new System.Drawing.Point(345, 70);
- this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(90, 21);
- this.label25.TabIndex = 148;
- this.label25.Text = "鏍哥畻宸ュ簭锛�";
- //
// txtHPayProcID
//
this.txtHPayProcID.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPayProcID.ForeColor = System.Drawing.Color.Green;
this.txtHPayProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPayProcID.Location = new System.Drawing.Point(431, 66);
+ this.txtHPayProcID.Location = new System.Drawing.Point(568, 78);
+ this.txtHPayProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPayProcID.Name = "txtHPayProcID";
- this.txtHPayProcID.Size = new System.Drawing.Size(126, 28);
+ this.txtHPayProcID.Size = new System.Drawing.Size(167, 34);
this.txtHPayProcID.TabIndex = 149;
this.txtHPayProcID.TabStop = false;
this.txtHPayProcID.Tag = "0";
@@ -1274,20 +1143,228 @@
this.chkHLastSubProc.Enabled = false;
this.chkHLastSubProc.Font = new System.Drawing.Font("瀹嬩綋", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkHLastSubProc.ForeColor = System.Drawing.Color.Yellow;
- this.chkHLastSubProc.Location = new System.Drawing.Point(562, 71);
- this.chkHLastSubProc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.chkHLastSubProc.Location = new System.Drawing.Point(742, 85);
+ this.chkHLastSubProc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.chkHLastSubProc.Name = "chkHLastSubProc";
- this.chkHLastSubProc.Size = new System.Drawing.Size(90, 19);
+ this.chkHLastSubProc.Size = new System.Drawing.Size(111, 23);
this.chkHLastSubProc.TabIndex = 150;
this.chkHLastSubProc.Text = "杞笅宸ュ簭";
this.chkHLastSubProc.UseVisualStyleBackColor = true;
+ //
+ // label40
+ //
+ this.label40.AutoSize = true;
+ this.label40.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label40.ForeColor = System.Drawing.Color.Yellow;
+ this.label40.Location = new System.Drawing.Point(14, 446);
+ this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label40.Name = "label40";
+ this.label40.Size = new System.Drawing.Size(112, 27);
+ this.label40.TabIndex = 179;
+ this.label40.Text = "璁惧娓呭崟锛�";
+ //
+ // label39
+ //
+ this.label39.AutoSize = true;
+ this.label39.BackColor = System.Drawing.Color.Gray;
+ this.label39.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label39.ForeColor = System.Drawing.Color.Yellow;
+ this.label39.Location = new System.Drawing.Point(453, 228);
+ this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label39.Name = "label39";
+ this.label39.Size = new System.Drawing.Size(110, 27);
+ this.label39.TabIndex = 175;
+ this.label39.Text = "妫� 楠� 鍛橈細";
+ this.label39.Click += new System.EventHandler(this.label39_Click);
+ //
+ // label38
+ //
+ this.label38.AutoSize = true;
+ this.label38.BackColor = System.Drawing.Color.Gray;
+ this.label38.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label38.ForeColor = System.Drawing.Color.Yellow;
+ this.label38.Location = new System.Drawing.Point(453, 301);
+ this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(72, 27);
+ this.label38.TabIndex = 173;
+ this.label38.Text = "宸ユ椂锛�";
+ //
+ // label37
+ //
+ this.label37.AutoSize = true;
+ this.label37.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label37.ForeColor = System.Drawing.Color.Yellow;
+ this.label37.Location = new System.Drawing.Point(16, 484);
+ this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label37.Name = "label37";
+ this.label37.Size = new System.Drawing.Size(92, 27);
+ this.label37.TabIndex = 170;
+ this.label37.Text = "妯＄┐鍙凤細";
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.BackColor = System.Drawing.Color.Gray;
+ this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label13.ForeColor = System.Drawing.Color.Yellow;
+ this.label13.Location = new System.Drawing.Point(16, 337);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(132, 27);
+ this.label13.TabIndex = 119;
+ this.label13.Text = "浠诲姟鍗曟暟閲忥細";
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.BackColor = System.Drawing.Color.Gray;
+ this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label12.ForeColor = System.Drawing.Color.Yellow;
+ this.label12.Location = new System.Drawing.Point(16, 265);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(104, 27);
+ this.label12.TabIndex = 116;
+ this.label12.Text = "鍗� 鎹� 鍙凤細";
+ //
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.BackColor = System.Drawing.Color.Gray;
+ this.label20.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label20.ForeColor = System.Drawing.Color.Yellow;
+ this.label20.Location = new System.Drawing.Point(16, 84);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(112, 27);
+ this.label20.TabIndex = 140;
+ this.label20.Text = "宸ヤ綔涓績锛�";
+ this.label20.Click += new System.EventHandler(this.label20_Click);
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.BackColor = System.Drawing.Color.Gray;
+ this.label23.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label23.ForeColor = System.Drawing.Color.Yellow;
+ this.label23.Location = new System.Drawing.Point(16, 47);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(92, 27);
+ this.label23.TabIndex = 144;
+ this.label23.Text = "娴佹按鍙凤細";
+ //
+ // label29
+ //
+ this.label29.AutoSize = true;
+ this.label29.BackColor = System.Drawing.Color.Gray;
+ this.label29.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label29.ForeColor = System.Drawing.Color.Yellow;
+ this.label29.Location = new System.Drawing.Point(453, 446);
+ this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(104, 27);
+ this.label29.TabIndex = 161;
+ this.label29.Text = "鎿嶄綔鍛�5锛�";
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.BackColor = System.Drawing.Color.Gray;
+ this.label24.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label24.ForeColor = System.Drawing.Color.Yellow;
+ this.label24.Location = new System.Drawing.Point(16, 301);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(132, 27);
+ this.label24.TabIndex = 146;
+ this.label24.Text = "璁㈠崟璺熻釜鍙凤細";
+ //
+ // label30
+ //
+ this.label30.AutoSize = true;
+ this.label30.BackColor = System.Drawing.Color.Gray;
+ this.label30.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label30.ForeColor = System.Drawing.Color.Yellow;
+ this.label30.Location = new System.Drawing.Point(453, 120);
+ this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(72, 27);
+ this.label30.TabIndex = 168;
+ this.label30.Text = "澶囨敞锛�";
+ //
+ // label28
+ //
+ this.label28.AutoSize = true;
+ this.label28.BackColor = System.Drawing.Color.Gray;
+ this.label28.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label28.ForeColor = System.Drawing.Color.Yellow;
+ this.label28.Location = new System.Drawing.Point(453, 410);
+ this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label28.Name = "label28";
+ this.label28.Size = new System.Drawing.Size(104, 27);
+ this.label28.TabIndex = 158;
+ this.label28.Text = "鎿嶄綔鍛�4锛�";
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.BackColor = System.Drawing.Color.Gray;
+ this.label27.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label27.ForeColor = System.Drawing.Color.Yellow;
+ this.label27.Location = new System.Drawing.Point(453, 374);
+ this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(104, 27);
+ this.label27.TabIndex = 155;
+ this.label27.Text = "鎿嶄綔鍛�3锛�";
+ //
+ // label26
+ //
+ this.label26.AutoSize = true;
+ this.label26.BackColor = System.Drawing.Color.Gray;
+ this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label26.ForeColor = System.Drawing.Color.Yellow;
+ this.label26.Location = new System.Drawing.Point(453, 337);
+ this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label26.Name = "label26";
+ this.label26.Size = new System.Drawing.Size(104, 27);
+ this.label26.TabIndex = 152;
+ this.label26.Text = "鎿嶄綔鍛�2锛�";
+ this.label26.Click += new System.EventHandler(this.label26_Click);
+ //
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.BackColor = System.Drawing.Color.Gray;
+ this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label18.ForeColor = System.Drawing.Color.Yellow;
+ this.label18.Location = new System.Drawing.Point(450, 482);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(112, 27);
+ this.label18.TabIndex = 124;
+ this.label18.Text = "鎶ュ簾鏁伴噺锛�";
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.BackColor = System.Drawing.Color.Gray;
+ this.label25.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label25.ForeColor = System.Drawing.Color.Yellow;
+ this.label25.Location = new System.Drawing.Point(453, 84);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(112, 27);
+ this.label25.TabIndex = 148;
+ this.label25.Text = "鏍哥畻宸ュ簭锛�";
//
// tabPage3
//
this.tabPage3.BackColor = System.Drawing.Color.Gray;
this.tabPage3.Controls.Add(this.txtHDSQty);
this.tabPage3.Controls.Add(this.txtHPriceRate);
- this.tabPage3.Controls.Add(this.txtHBadCount);
this.tabPage3.Controls.Add(this.txtHWWWorkOrderBillNo);
this.tabPage3.Controls.Add(this.txtHPlanPieceQty);
this.tabPage3.Controls.Add(this.txtHUnitChongQty);
@@ -1313,7 +1390,6 @@
this.tabPage3.Controls.Add(this.txtHSourceID2);
this.tabPage3.Controls.Add(this.cmdHSourceID2);
this.tabPage3.Controls.Add(this.label31);
- this.tabPage3.Controls.Add(this.label17);
this.tabPage3.Controls.Add(this.label19);
this.tabPage3.Controls.Add(this.label35);
this.tabPage3.Controls.Add(this.label34);
@@ -1324,231 +1400,37 @@
this.tabPage3.Controls.Add(this.label6);
this.tabPage3.Controls.Add(this.label15);
this.tabPage3.Controls.Add(this.label22);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPage3.Location = new System.Drawing.Point(4, 25);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.tabPage3.Size = new System.Drawing.Size(666, 439);
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage3.Size = new System.Drawing.Size(891, 551);
this.tabPage3.TabIndex = 1;
this.tabPage3.Text = "鍏朵粬淇℃伅";
- //
- // label41
- //
- this.label41.AutoSize = true;
- this.label41.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label41.ForeColor = System.Drawing.Color.Yellow;
- this.label41.Location = new System.Drawing.Point(23, 314);
- this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(99, 21);
- this.label41.TabIndex = 192;
- this.label41.Text = "鐢熶骇璧勬簮5锛�";
- //
- // txtHSourceName5
- //
- this.txtHSourceName5.BackColor = System.Drawing.Color.DarkGray;
- this.txtHSourceName5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceName5.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName5.Location = new System.Drawing.Point(204, 313);
- this.txtHSourceName5.Name = "txtHSourceName5";
- this.txtHSourceName5.ReadOnly = true;
- this.txtHSourceName5.Size = new System.Drawing.Size(114, 32);
- this.txtHSourceName5.TabIndex = 195;
- this.txtHSourceName5.Tag = "0";
- //
- // txtHSourceID5
- //
- this.txtHSourceID5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceID5.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID5.Location = new System.Drawing.Point(124, 313);
- this.txtHSourceID5.Name = "txtHSourceID5";
- this.txtHSourceID5.Size = new System.Drawing.Size(79, 32);
- this.txtHSourceID5.TabIndex = 193;
- this.txtHSourceID5.Tag = "0";
- //
- // cmdHSourceID5
- //
- this.cmdHSourceID5.BackColor = System.Drawing.Color.Transparent;
- this.cmdHSourceID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID5.Image")));
- this.cmdHSourceID5.Location = new System.Drawing.Point(318, 313);
- this.cmdHSourceID5.Name = "cmdHSourceID5";
- this.cmdHSourceID5.Size = new System.Drawing.Size(30, 32);
- this.cmdHSourceID5.TabIndex = 194;
- this.cmdHSourceID5.UseVisualStyleBackColor = false;
- this.cmdHSourceID5.Click += new System.EventHandler(this.cmdHSourceID5_Click);
- //
- // label42
- //
- this.label42.AutoSize = true;
- this.label42.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label42.ForeColor = System.Drawing.Color.Yellow;
- this.label42.Location = new System.Drawing.Point(23, 282);
- this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(99, 21);
- this.label42.TabIndex = 188;
- this.label42.Text = "鐢熶骇璧勬簮4锛�";
- //
- // txtHSourceName4
- //
- this.txtHSourceName4.BackColor = System.Drawing.Color.DarkGray;
- this.txtHSourceName4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceName4.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName4.Location = new System.Drawing.Point(204, 282);
- this.txtHSourceName4.Name = "txtHSourceName4";
- this.txtHSourceName4.ReadOnly = true;
- this.txtHSourceName4.Size = new System.Drawing.Size(114, 32);
- this.txtHSourceName4.TabIndex = 191;
- this.txtHSourceName4.Tag = "0";
- //
- // txtHSourceID4
- //
- this.txtHSourceID4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceID4.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID4.Location = new System.Drawing.Point(124, 282);
- this.txtHSourceID4.Name = "txtHSourceID4";
- this.txtHSourceID4.Size = new System.Drawing.Size(79, 32);
- this.txtHSourceID4.TabIndex = 189;
- this.txtHSourceID4.Tag = "0";
- //
- // cmdHSourceID4
- //
- this.cmdHSourceID4.BackColor = System.Drawing.Color.Transparent;
- this.cmdHSourceID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID4.Image")));
- this.cmdHSourceID4.Location = new System.Drawing.Point(318, 282);
- this.cmdHSourceID4.Name = "cmdHSourceID4";
- this.cmdHSourceID4.Size = new System.Drawing.Size(30, 32);
- this.cmdHSourceID4.TabIndex = 190;
- this.cmdHSourceID4.UseVisualStyleBackColor = false;
- this.cmdHSourceID4.Click += new System.EventHandler(this.cmdHSourceID4_Click);
- //
- // label43
- //
- this.label43.AutoSize = true;
- this.label43.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label43.ForeColor = System.Drawing.Color.Yellow;
- this.label43.Location = new System.Drawing.Point(23, 251);
- this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(99, 21);
- this.label43.TabIndex = 184;
- this.label43.Text = "鐢熶骇璧勬簮3锛�";
- //
- // txtHSourceName3
- //
- this.txtHSourceName3.BackColor = System.Drawing.Color.DarkGray;
- this.txtHSourceName3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceName3.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName3.Location = new System.Drawing.Point(204, 250);
- this.txtHSourceName3.Name = "txtHSourceName3";
- this.txtHSourceName3.ReadOnly = true;
- this.txtHSourceName3.Size = new System.Drawing.Size(114, 32);
- this.txtHSourceName3.TabIndex = 187;
- this.txtHSourceName3.Tag = "0";
- //
- // txtHSourceID3
- //
- this.txtHSourceID3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceID3.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID3.Location = new System.Drawing.Point(124, 250);
- this.txtHSourceID3.Name = "txtHSourceID3";
- this.txtHSourceID3.Size = new System.Drawing.Size(79, 32);
- this.txtHSourceID3.TabIndex = 185;
- this.txtHSourceID3.Tag = "0";
- //
- // cmdHSourceID3
- //
- this.cmdHSourceID3.BackColor = System.Drawing.Color.Transparent;
- this.cmdHSourceID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID3.Image")));
- this.cmdHSourceID3.Location = new System.Drawing.Point(318, 250);
- this.cmdHSourceID3.Name = "cmdHSourceID3";
- this.cmdHSourceID3.Size = new System.Drawing.Size(30, 32);
- this.cmdHSourceID3.TabIndex = 186;
- this.cmdHSourceID3.UseVisualStyleBackColor = false;
- this.cmdHSourceID3.Click += new System.EventHandler(this.cmdHSourceID3_Click);
- //
- // label44
- //
- this.label44.AutoSize = true;
- this.label44.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label44.ForeColor = System.Drawing.Color.Yellow;
- this.label44.Location = new System.Drawing.Point(23, 220);
- this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(99, 21);
- this.label44.TabIndex = 180;
- this.label44.Text = "鐢熶骇璧勬簮2锛�";
- //
- // txtHSourceName2
- //
- this.txtHSourceName2.BackColor = System.Drawing.Color.DarkGray;
- this.txtHSourceName2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceName2.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceName2.Location = new System.Drawing.Point(204, 219);
- this.txtHSourceName2.Name = "txtHSourceName2";
- this.txtHSourceName2.ReadOnly = true;
- this.txtHSourceName2.Size = new System.Drawing.Size(114, 32);
- this.txtHSourceName2.TabIndex = 183;
- this.txtHSourceName2.Tag = "0";
- //
- // txtHSourceID2
- //
- this.txtHSourceID2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
- this.txtHSourceID2.ForeColor = System.Drawing.Color.Green;
- this.txtHSourceID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID2.Location = new System.Drawing.Point(124, 219);
- this.txtHSourceID2.Name = "txtHSourceID2";
- this.txtHSourceID2.Size = new System.Drawing.Size(79, 32);
- this.txtHSourceID2.TabIndex = 181;
- this.txtHSourceID2.Tag = "0";
- //
- // cmdHSourceID2
- //
- this.cmdHSourceID2.BackColor = System.Drawing.Color.Transparent;
- this.cmdHSourceID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID2.Image")));
- this.cmdHSourceID2.Location = new System.Drawing.Point(318, 219);
- this.cmdHSourceID2.Name = "cmdHSourceID2";
- this.cmdHSourceID2.Size = new System.Drawing.Size(30, 32);
- this.cmdHSourceID2.TabIndex = 182;
- this.cmdHSourceID2.UseVisualStyleBackColor = false;
- this.cmdHSourceID2.Click += new System.EventHandler(this.cmdHSourceID2_Click);
//
// txtHDSQty
//
this.txtHDSQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHDSQty.ForeColor = System.Drawing.Color.Green;
this.txtHDSQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHDSQty.Location = new System.Drawing.Point(126, 91);
+ this.txtHDSQty.Location = new System.Drawing.Point(168, 114);
+ this.txtHDSQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDSQty.Name = "txtHDSQty";
- this.txtHDSQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHDSQty.Size = new System.Drawing.Size(249, 34);
this.txtHDSQty.TabIndex = 172;
this.txtHDSQty.Tag = "0";
this.txtHDSQty.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHDSQty_KeyDown);
- //
- // label31
- //
- this.label31.AutoSize = true;
- this.label31.BackColor = System.Drawing.Color.Gray;
- this.label31.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label31.ForeColor = System.Drawing.Color.Yellow;
- this.label31.Location = new System.Drawing.Point(23, 174);
- this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(106, 21);
- this.label31.TabIndex = 170;
- this.label31.Text = "濮斿宸ュ崟鍙凤細";
//
// txtHPriceRate
//
this.txtHPriceRate.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPriceRate.ForeColor = System.Drawing.Color.Green;
this.txtHPriceRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPriceRate.Location = new System.Drawing.Point(464, 148);
+ this.txtHPriceRate.Location = new System.Drawing.Point(619, 185);
+ this.txtHPriceRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPriceRate.Name = "txtHPriceRate";
this.txtHPriceRate.ReadOnly = true;
- this.txtHPriceRate.Size = new System.Drawing.Size(188, 28);
+ this.txtHPriceRate.Size = new System.Drawing.Size(249, 34);
this.txtHPriceRate.TabIndex = 178;
this.txtHPriceRate.Tag = "0";
//
@@ -1558,68 +1440,36 @@
this.txtHBadCount.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBadCount.ForeColor = System.Drawing.Color.Green;
this.txtHBadCount.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadCount.Location = new System.Drawing.Point(464, 182);
+ this.txtHBadCount.Location = new System.Drawing.Point(568, 260);
+ this.txtHBadCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBadCount.Name = "txtHBadCount";
- this.txtHBadCount.Size = new System.Drawing.Size(187, 28);
+ this.txtHBadCount.Size = new System.Drawing.Size(248, 34);
this.txtHBadCount.TabIndex = 114;
this.txtHBadCount.TabStop = false;
this.txtHBadCount.Tag = "0";
- //
- // label17
- //
- this.label17.AutoSize = true;
- this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.ForeColor = System.Drawing.Color.Yellow;
- this.label17.Location = new System.Drawing.Point(365, 182);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(90, 21);
- this.label17.TabIndex = 113;
- this.label17.Text = "涓嶈壇鏁伴噺锛�";
//
// txtHWWWorkOrderBillNo
//
this.txtHWWWorkOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHWWWorkOrderBillNo.ForeColor = System.Drawing.Color.Green;
this.txtHWWWorkOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWWorkOrderBillNo.Location = new System.Drawing.Point(125, 178);
+ this.txtHWWWorkOrderBillNo.Location = new System.Drawing.Point(167, 222);
+ this.txtHWWWorkOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHWWWorkOrderBillNo.Name = "txtHWWWorkOrderBillNo";
- this.txtHWWWorkOrderBillNo.Size = new System.Drawing.Size(188, 28);
+ this.txtHWWWorkOrderBillNo.Size = new System.Drawing.Size(249, 34);
this.txtHWWWorkOrderBillNo.TabIndex = 171;
this.txtHWWWorkOrderBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHWWWorkOrderBillNo_KeyDown);
- //
- // label19
- //
- this.label19.AutoSize = true;
- this.label19.BackColor = System.Drawing.Color.Gray;
- this.label19.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.ForeColor = System.Drawing.Color.Yellow;
- this.label19.Location = new System.Drawing.Point(23, 38);
- this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(110, 21);
- this.label19.TabIndex = 126;
- this.label19.Text = "杩涚珯 PNL鏁帮細";
- //
- // label35
- //
- this.label35.AutoSize = true;
- this.label35.BackColor = System.Drawing.Color.Gray;
- this.label35.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label35.ForeColor = System.Drawing.Color.Yellow;
- this.label35.Location = new System.Drawing.Point(364, 154);
- this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(88, 21);
- this.label35.TabIndex = 179;
- this.label35.Text = "绯� 鏁帮細";
//
// txtHPlanPieceQty
//
this.txtHPlanPieceQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPlanPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPlanPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanPieceQty.Location = new System.Drawing.Point(127, 34);
+ this.txtHPlanPieceQty.Location = new System.Drawing.Point(169, 42);
+ this.txtHPlanPieceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPlanPieceQty.Name = "txtHPlanPieceQty";
this.txtHPlanPieceQty.ReadOnly = true;
- this.txtHPlanPieceQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHPlanPieceQty.Size = new System.Drawing.Size(249, 34);
this.txtHPlanPieceQty.TabIndex = 127;
this.txtHPlanPieceQty.TabStop = false;
this.txtHPlanPieceQty.Tag = "0";
@@ -1629,45 +1479,23 @@
this.txtHUnitChongQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHUnitChongQty.ForeColor = System.Drawing.Color.Green;
this.txtHUnitChongQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitChongQty.Location = new System.Drawing.Point(464, 119);
+ this.txtHUnitChongQty.Location = new System.Drawing.Point(619, 149);
+ this.txtHUnitChongQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHUnitChongQty.Name = "txtHUnitChongQty";
this.txtHUnitChongQty.ReadOnly = true;
- this.txtHUnitChongQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHUnitChongQty.Size = new System.Drawing.Size(249, 34);
this.txtHUnitChongQty.TabIndex = 176;
this.txtHUnitChongQty.Tag = "0";
- //
- // label34
- //
- this.label34.AutoSize = true;
- this.label34.BackColor = System.Drawing.Color.Gray;
- this.label34.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label34.ForeColor = System.Drawing.Color.Yellow;
- this.label34.Location = new System.Drawing.Point(364, 124);
- this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(91, 21);
- this.label34.TabIndex = 177;
- this.label34.Text = "NCT鍗曟锛�";
- //
- // label21
- //
- this.label21.AutoSize = true;
- this.label21.BackColor = System.Drawing.Color.Gray;
- this.label21.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.ForeColor = System.Drawing.Color.Yellow;
- this.label21.Location = new System.Drawing.Point(23, 65);
- this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(105, 21);
- this.label21.TabIndex = 139;
- this.label21.Text = "鎶ュ簾PNL鏁帮細";
//
// txtHBadPNL
//
this.txtHBadPNL.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBadPNL.ForeColor = System.Drawing.Color.Green;
this.txtHBadPNL.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadPNL.Location = new System.Drawing.Point(127, 62);
+ this.txtHBadPNL.Location = new System.Drawing.Point(169, 78);
+ this.txtHBadPNL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBadPNL.Name = "txtHBadPNL";
- this.txtHBadPNL.Size = new System.Drawing.Size(188, 28);
+ this.txtHBadPNL.Size = new System.Drawing.Size(249, 34);
this.txtHBadPNL.TabIndex = 6;
this.txtHBadPNL.Tag = "0";
this.txtHBadPNL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBadPNL_KeyDown);
@@ -1678,70 +1506,24 @@
this.txtHPieceQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPieceQty.Location = new System.Drawing.Point(464, 33);
+ this.txtHPieceQty.Location = new System.Drawing.Point(619, 41);
+ this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPieceQty.Name = "txtHPieceQty";
- this.txtHPieceQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHPieceQty.Size = new System.Drawing.Size(249, 34);
this.txtHPieceQty.TabIndex = 3;
this.txtHPieceQty.Tag = "0";
this.txtHPieceQty.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHPieceQty_KeyDown);
this.txtHPieceQty.Leave += new System.EventHandler(this.txtHPieceQty_Leave);
- //
- // label14
- //
- this.label14.AutoSize = true;
- this.label14.BackColor = System.Drawing.Color.Gray;
- this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label14.ForeColor = System.Drawing.Color.Yellow;
- this.label14.Location = new System.Drawing.Point(364, 65);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(88, 21);
- this.label14.TabIndex = 120;
- this.label14.Text = "鏈� 鍙帮細";
- //
- // label32
- //
- this.label32.AutoSize = true;
- this.label32.BackColor = System.Drawing.Color.Gray;
- this.label32.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label32.ForeColor = System.Drawing.Color.Yellow;
- this.label32.Location = new System.Drawing.Point(23, 92);
- this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(90, 21);
- this.label32.TabIndex = 173;
- this.label32.Text = "鎶樺集鍒�鏁帮細";
- //
- // label33
- //
- this.label33.AutoSize = true;
- this.label33.BackColor = System.Drawing.Color.Gray;
- this.label33.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label33.ForeColor = System.Drawing.Color.Yellow;
- this.label33.Location = new System.Drawing.Point(23, 119);
- this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(107, 21);
- this.label33.TabIndex = 175;
- this.label33.Text = "NCT鍐叉鏁帮細";
- //
- // label15
- //
- this.label15.AutoSize = true;
- this.label15.BackColor = System.Drawing.Color.Gray;
- this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label15.ForeColor = System.Drawing.Color.Yellow;
- this.label15.Location = new System.Drawing.Point(23, 146);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(105, 21);
- this.label15.TabIndex = 122;
- this.label15.Text = "绉讳氦PNL鏁帮細";
//
// txtHChongQty
//
this.txtHChongQty.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHChongQty.ForeColor = System.Drawing.Color.Green;
this.txtHChongQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHChongQty.Location = new System.Drawing.Point(126, 120);
+ this.txtHChongQty.Location = new System.Drawing.Point(168, 150);
+ this.txtHChongQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHChongQty.Name = "txtHChongQty";
- this.txtHChongQty.Size = new System.Drawing.Size(188, 28);
+ this.txtHChongQty.Size = new System.Drawing.Size(249, 34);
this.txtHChongQty.TabIndex = 174;
this.txtHChongQty.Tag = "0";
//
@@ -1751,11 +1533,341 @@
this.txtHChecker.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHChecker.ForeColor = System.Drawing.Color.Green;
this.txtHChecker.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHChecker.Location = new System.Drawing.Point(464, 90);
+ this.txtHChecker.Location = new System.Drawing.Point(619, 112);
+ this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(188, 28);
+ this.txtHChecker.Size = new System.Drawing.Size(249, 34);
this.txtHChecker.TabIndex = 142;
this.txtHChecker.Tag = "0";
+ //
+ // label41
+ //
+ this.label41.AutoSize = true;
+ this.label41.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label41.ForeColor = System.Drawing.Color.Yellow;
+ this.label41.Location = new System.Drawing.Point(31, 392);
+ this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label41.Name = "label41";
+ this.label41.Size = new System.Drawing.Size(124, 27);
+ this.label41.TabIndex = 192;
+ this.label41.Text = "鐢熶骇璧勬簮5锛�";
+ //
+ // txtHSourceName5
+ //
+ this.txtHSourceName5.BackColor = System.Drawing.Color.DarkGray;
+ this.txtHSourceName5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceName5.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceName5.Location = new System.Drawing.Point(272, 391);
+ this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName5.Name = "txtHSourceName5";
+ this.txtHSourceName5.ReadOnly = true;
+ this.txtHSourceName5.Size = new System.Drawing.Size(151, 38);
+ this.txtHSourceName5.TabIndex = 195;
+ this.txtHSourceName5.Tag = "0";
+ //
+ // txtHSourceID5
+ //
+ this.txtHSourceID5.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceID5.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceID5.Location = new System.Drawing.Point(165, 391);
+ this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID5.Name = "txtHSourceID5";
+ this.txtHSourceID5.Size = new System.Drawing.Size(104, 38);
+ this.txtHSourceID5.TabIndex = 193;
+ this.txtHSourceID5.Tag = "0";
+ //
+ // cmdHSourceID5
+ //
+ this.cmdHSourceID5.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHSourceID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID5.Image")));
+ this.cmdHSourceID5.Location = new System.Drawing.Point(424, 391);
+ this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID5.Name = "cmdHSourceID5";
+ this.cmdHSourceID5.Size = new System.Drawing.Size(40, 40);
+ this.cmdHSourceID5.TabIndex = 194;
+ this.cmdHSourceID5.UseVisualStyleBackColor = false;
+ this.cmdHSourceID5.Click += new System.EventHandler(this.cmdHSourceID5_Click);
+ //
+ // label42
+ //
+ this.label42.AutoSize = true;
+ this.label42.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label42.ForeColor = System.Drawing.Color.Yellow;
+ this.label42.Location = new System.Drawing.Point(31, 352);
+ this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label42.Name = "label42";
+ this.label42.Size = new System.Drawing.Size(124, 27);
+ this.label42.TabIndex = 188;
+ this.label42.Text = "鐢熶骇璧勬簮4锛�";
+ //
+ // txtHSourceName4
+ //
+ this.txtHSourceName4.BackColor = System.Drawing.Color.DarkGray;
+ this.txtHSourceName4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceName4.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceName4.Location = new System.Drawing.Point(272, 352);
+ this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName4.Name = "txtHSourceName4";
+ this.txtHSourceName4.ReadOnly = true;
+ this.txtHSourceName4.Size = new System.Drawing.Size(151, 38);
+ this.txtHSourceName4.TabIndex = 191;
+ this.txtHSourceName4.Tag = "0";
+ //
+ // txtHSourceID4
+ //
+ this.txtHSourceID4.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceID4.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceID4.Location = new System.Drawing.Point(165, 352);
+ this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID4.Name = "txtHSourceID4";
+ this.txtHSourceID4.Size = new System.Drawing.Size(104, 38);
+ this.txtHSourceID4.TabIndex = 189;
+ this.txtHSourceID4.Tag = "0";
+ //
+ // cmdHSourceID4
+ //
+ this.cmdHSourceID4.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHSourceID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID4.Image")));
+ this.cmdHSourceID4.Location = new System.Drawing.Point(424, 352);
+ this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID4.Name = "cmdHSourceID4";
+ this.cmdHSourceID4.Size = new System.Drawing.Size(40, 40);
+ this.cmdHSourceID4.TabIndex = 190;
+ this.cmdHSourceID4.UseVisualStyleBackColor = false;
+ this.cmdHSourceID4.Click += new System.EventHandler(this.cmdHSourceID4_Click);
+ //
+ // label43
+ //
+ this.label43.AutoSize = true;
+ this.label43.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label43.ForeColor = System.Drawing.Color.Yellow;
+ this.label43.Location = new System.Drawing.Point(31, 314);
+ this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label43.Name = "label43";
+ this.label43.Size = new System.Drawing.Size(124, 27);
+ this.label43.TabIndex = 184;
+ this.label43.Text = "鐢熶骇璧勬簮3锛�";
+ //
+ // txtHSourceName3
+ //
+ this.txtHSourceName3.BackColor = System.Drawing.Color.DarkGray;
+ this.txtHSourceName3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceName3.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceName3.Location = new System.Drawing.Point(272, 312);
+ this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName3.Name = "txtHSourceName3";
+ this.txtHSourceName3.ReadOnly = true;
+ this.txtHSourceName3.Size = new System.Drawing.Size(151, 38);
+ this.txtHSourceName3.TabIndex = 187;
+ this.txtHSourceName3.Tag = "0";
+ //
+ // txtHSourceID3
+ //
+ this.txtHSourceID3.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceID3.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceID3.Location = new System.Drawing.Point(165, 312);
+ this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID3.Name = "txtHSourceID3";
+ this.txtHSourceID3.Size = new System.Drawing.Size(104, 38);
+ this.txtHSourceID3.TabIndex = 185;
+ this.txtHSourceID3.Tag = "0";
+ //
+ // cmdHSourceID3
+ //
+ this.cmdHSourceID3.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHSourceID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID3.Image")));
+ this.cmdHSourceID3.Location = new System.Drawing.Point(424, 312);
+ this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID3.Name = "cmdHSourceID3";
+ this.cmdHSourceID3.Size = new System.Drawing.Size(40, 40);
+ this.cmdHSourceID3.TabIndex = 186;
+ this.cmdHSourceID3.UseVisualStyleBackColor = false;
+ this.cmdHSourceID3.Click += new System.EventHandler(this.cmdHSourceID3_Click);
+ //
+ // label44
+ //
+ this.label44.AutoSize = true;
+ this.label44.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label44.ForeColor = System.Drawing.Color.Yellow;
+ this.label44.Location = new System.Drawing.Point(31, 275);
+ this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label44.Name = "label44";
+ this.label44.Size = new System.Drawing.Size(124, 27);
+ this.label44.TabIndex = 180;
+ this.label44.Text = "鐢熶骇璧勬簮2锛�";
+ //
+ // txtHSourceName2
+ //
+ this.txtHSourceName2.BackColor = System.Drawing.Color.DarkGray;
+ this.txtHSourceName2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceName2.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceName2.Location = new System.Drawing.Point(272, 274);
+ this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceName2.Name = "txtHSourceName2";
+ this.txtHSourceName2.ReadOnly = true;
+ this.txtHSourceName2.Size = new System.Drawing.Size(151, 38);
+ this.txtHSourceName2.TabIndex = 183;
+ this.txtHSourceName2.Tag = "0";
+ //
+ // txtHSourceID2
+ //
+ this.txtHSourceID2.Font = new System.Drawing.Font("寰蒋闆呴粦", 13.8F);
+ this.txtHSourceID2.ForeColor = System.Drawing.Color.Green;
+ this.txtHSourceID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceID2.Location = new System.Drawing.Point(165, 274);
+ this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceID2.Name = "txtHSourceID2";
+ this.txtHSourceID2.Size = new System.Drawing.Size(104, 38);
+ this.txtHSourceID2.TabIndex = 181;
+ this.txtHSourceID2.Tag = "0";
+ //
+ // cmdHSourceID2
+ //
+ this.cmdHSourceID2.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHSourceID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID2.Image")));
+ this.cmdHSourceID2.Location = new System.Drawing.Point(424, 274);
+ this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSourceID2.Name = "cmdHSourceID2";
+ this.cmdHSourceID2.Size = new System.Drawing.Size(40, 40);
+ this.cmdHSourceID2.TabIndex = 182;
+ this.cmdHSourceID2.UseVisualStyleBackColor = false;
+ this.cmdHSourceID2.Click += new System.EventHandler(this.cmdHSourceID2_Click);
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.BackColor = System.Drawing.Color.Gray;
+ this.label31.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label31.ForeColor = System.Drawing.Color.Yellow;
+ this.label31.Location = new System.Drawing.Point(31, 218);
+ this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(132, 27);
+ this.label31.TabIndex = 170;
+ this.label31.Text = "濮斿宸ュ崟鍙凤細";
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.Yellow;
+ this.label17.Location = new System.Drawing.Point(453, 265);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(112, 27);
+ this.label17.TabIndex = 113;
+ this.label17.Text = "涓嶈壇鏁伴噺锛�";
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.BackColor = System.Drawing.Color.Gray;
+ this.label19.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label19.ForeColor = System.Drawing.Color.Yellow;
+ this.label19.Location = new System.Drawing.Point(31, 48);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(136, 27);
+ this.label19.TabIndex = 126;
+ this.label19.Text = "杩涚珯 PNL鏁帮細";
+ //
+ // label35
+ //
+ this.label35.AutoSize = true;
+ this.label35.BackColor = System.Drawing.Color.Gray;
+ this.label35.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label35.ForeColor = System.Drawing.Color.Yellow;
+ this.label35.Location = new System.Drawing.Point(485, 192);
+ this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(108, 27);
+ this.label35.TabIndex = 179;
+ this.label35.Text = "绯� 鏁帮細";
+ //
+ // label34
+ //
+ this.label34.AutoSize = true;
+ this.label34.BackColor = System.Drawing.Color.Gray;
+ this.label34.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label34.ForeColor = System.Drawing.Color.Yellow;
+ this.label34.Location = new System.Drawing.Point(485, 155);
+ this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(112, 27);
+ this.label34.TabIndex = 177;
+ this.label34.Text = "NCT鍗曟锛�";
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.BackColor = System.Drawing.Color.Gray;
+ this.label21.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label21.ForeColor = System.Drawing.Color.Yellow;
+ this.label21.Location = new System.Drawing.Point(31, 81);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(130, 27);
+ this.label21.TabIndex = 139;
+ this.label21.Text = "鎶ュ簾PNL鏁帮細";
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.BackColor = System.Drawing.Color.Gray;
+ this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label14.ForeColor = System.Drawing.Color.Yellow;
+ this.label14.Location = new System.Drawing.Point(485, 81);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(108, 27);
+ this.label14.TabIndex = 120;
+ this.label14.Text = "鏈� 鍙帮細";
+ //
+ // label32
+ //
+ this.label32.AutoSize = true;
+ this.label32.BackColor = System.Drawing.Color.Gray;
+ this.label32.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label32.ForeColor = System.Drawing.Color.Yellow;
+ this.label32.Location = new System.Drawing.Point(31, 115);
+ this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(112, 27);
+ this.label32.TabIndex = 173;
+ this.label32.Text = "鎶樺集鍒�鏁帮細";
+ //
+ // label33
+ //
+ this.label33.AutoSize = true;
+ this.label33.BackColor = System.Drawing.Color.Gray;
+ this.label33.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label33.ForeColor = System.Drawing.Color.Yellow;
+ this.label33.Location = new System.Drawing.Point(31, 149);
+ this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label33.Name = "label33";
+ this.label33.Size = new System.Drawing.Size(132, 27);
+ this.label33.TabIndex = 175;
+ this.label33.Text = "NCT鍐叉鏁帮細";
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.BackColor = System.Drawing.Color.Gray;
+ this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label15.ForeColor = System.Drawing.Color.Yellow;
+ this.label15.Location = new System.Drawing.Point(31, 182);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(130, 27);
+ this.label15.TabIndex = 122;
+ this.label15.Text = "绉讳氦PNL鏁帮細";
//
// label22
//
@@ -1763,9 +1875,10 @@
this.label22.BackColor = System.Drawing.Color.Gray;
this.label22.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.ForeColor = System.Drawing.Color.Yellow;
- this.label22.Location = new System.Drawing.Point(364, 94);
+ this.label22.Location = new System.Drawing.Point(485, 118);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(106, 21);
+ this.label22.Size = new System.Drawing.Size(132, 27);
this.label22.TabIndex = 143;
this.label22.Text = "鍝佽川纭浜猴細";
//
@@ -1790,16 +1903,18 @@
this.panel1.Controls.Add(this.cmdCancel);
this.panel1.Controls.Add(this.cmdOK);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(43, 584);
+ this.panel1.Location = new System.Drawing.Point(57, 730);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(964, 78);
+ this.panel1.Size = new System.Drawing.Size(1286, 98);
this.panel1.TabIndex = 116;
//
// cmdXZ
//
- this.cmdXZ.Location = new System.Drawing.Point(16, 4);
+ this.cmdXZ.Location = new System.Drawing.Point(21, 5);
+ this.cmdXZ.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdXZ.Name = "cmdXZ";
- this.cmdXZ.Size = new System.Drawing.Size(70, 40);
+ this.cmdXZ.Size = new System.Drawing.Size(93, 50);
this.cmdXZ.TabIndex = 150;
this.cmdXZ.Text = "鏂� 澧�";
this.cmdXZ.UseVisualStyleBackColor = true;
@@ -1807,9 +1922,10 @@
//
// cmdHPrintCusCard
//
- this.cmdHPrintCusCard.Location = new System.Drawing.Point(826, 4);
+ this.cmdHPrintCusCard.Location = new System.Drawing.Point(1101, 5);
+ this.cmdHPrintCusCard.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHPrintCusCard.Name = "cmdHPrintCusCard";
- this.cmdHPrintCusCard.Size = new System.Drawing.Size(70, 40);
+ this.cmdHPrintCusCard.Size = new System.Drawing.Size(93, 50);
this.cmdHPrintCusCard.TabIndex = 149;
this.cmdHPrintCusCard.Text = "鎵撳嵃瀹㈡埛鐮�";
this.cmdHPrintCusCard.UseVisualStyleBackColor = true;
@@ -1818,9 +1934,10 @@
//
// cmdHPrint
//
- this.cmdHPrint.Location = new System.Drawing.Point(745, 4);
+ this.cmdHPrint.Location = new System.Drawing.Point(993, 5);
+ this.cmdHPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHPrint.Name = "cmdHPrint";
- this.cmdHPrint.Size = new System.Drawing.Size(70, 40);
+ this.cmdHPrint.Size = new System.Drawing.Size(93, 50);
this.cmdHPrint.TabIndex = 148;
this.cmdHPrint.Text = "鎵撳嵃鏍囪瘑鍗�";
this.cmdHPrint.UseVisualStyleBackColor = true;
@@ -1830,9 +1947,10 @@
// button2
//
this.button2.Enabled = false;
- this.button2.Location = new System.Drawing.Point(583, 4);
+ this.button2.Location = new System.Drawing.Point(777, 5);
+ this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(70, 40);
+ this.button2.Size = new System.Drawing.Size(93, 50);
this.button2.TabIndex = 147;
this.button2.Text = "鍙嶅鏍�";
this.button2.UseVisualStyleBackColor = true;
@@ -1840,9 +1958,10 @@
//
// cmdAddNew
//
- this.cmdAddNew.Location = new System.Drawing.Point(664, 4);
+ this.cmdAddNew.Location = new System.Drawing.Point(885, 5);
+ this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdAddNew.Name = "cmdAddNew";
- this.cmdAddNew.Size = new System.Drawing.Size(70, 40);
+ this.cmdAddNew.Size = new System.Drawing.Size(93, 50);
this.cmdAddNew.TabIndex = 115;
this.cmdAddNew.Text = "娓� 绌�";
this.cmdAddNew.UseVisualStyleBackColor = true;
@@ -1852,9 +1971,10 @@
// button1
//
this.button1.Enabled = false;
- this.button1.Location = new System.Drawing.Point(502, 4);
+ this.button1.Location = new System.Drawing.Point(669, 5);
+ this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(70, 40);
+ this.button1.Size = new System.Drawing.Size(93, 50);
this.button1.TabIndex = 146;
this.button1.Text = "瀹� 鏍�";
this.button1.UseVisualStyleBackColor = true;
@@ -1862,9 +1982,10 @@
//
// cmdDelBill
//
- this.cmdDelBill.Location = new System.Drawing.Point(178, 4);
+ this.cmdDelBill.Location = new System.Drawing.Point(237, 5);
+ this.cmdDelBill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdDelBill.Name = "cmdDelBill";
- this.cmdDelBill.Size = new System.Drawing.Size(70, 40);
+ this.cmdDelBill.Size = new System.Drawing.Size(93, 50);
this.cmdDelBill.TabIndex = 145;
this.cmdDelBill.Text = "鍒犻櫎鍏ュ簱鍗�";
this.cmdDelBill.UseVisualStyleBackColor = true;
@@ -1873,9 +1994,10 @@
//
// cmdChecker
//
- this.cmdChecker.Location = new System.Drawing.Point(259, 4);
+ this.cmdChecker.Location = new System.Drawing.Point(345, 5);
+ this.cmdChecker.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdChecker.Name = "cmdChecker";
- this.cmdChecker.Size = new System.Drawing.Size(70, 40);
+ this.cmdChecker.Size = new System.Drawing.Size(93, 50);
this.cmdChecker.TabIndex = 144;
this.cmdChecker.Text = "鍝佽川纭";
this.cmdChecker.UseVisualStyleBackColor = true;
@@ -1883,9 +2005,10 @@
//
// cmdXG
//
- this.cmdXG.Location = new System.Drawing.Point(97, 4);
+ this.cmdXG.Location = new System.Drawing.Point(129, 5);
+ this.cmdXG.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdXG.Name = "cmdXG";
- this.cmdXG.Size = new System.Drawing.Size(70, 40);
+ this.cmdXG.Size = new System.Drawing.Size(93, 50);
this.cmdXG.TabIndex = 119;
this.cmdXG.Text = "淇� 鏀�";
this.cmdXG.UseVisualStyleBackColor = true;
@@ -1893,9 +2016,10 @@
//
// cmdBF
//
- this.cmdBF.Location = new System.Drawing.Point(1000, 3);
+ this.cmdBF.Location = new System.Drawing.Point(1333, 4);
+ this.cmdBF.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdBF.Name = "cmdBF";
- this.cmdBF.Size = new System.Drawing.Size(64, 42);
+ this.cmdBF.Size = new System.Drawing.Size(85, 52);
this.cmdBF.TabIndex = 118;
this.cmdBF.Text = "鎶� 搴�";
this.cmdBF.UseVisualStyleBackColor = true;
@@ -1904,9 +2028,10 @@
//
// bclk
//
- this.bclk.Location = new System.Drawing.Point(907, 4);
+ this.bclk.Location = new System.Drawing.Point(1209, 5);
+ this.bclk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(70, 40);
+ this.bclk.Size = new System.Drawing.Size(93, 50);
this.bclk.TabIndex = 116;
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.UseVisualStyleBackColor = true;
@@ -1915,9 +2040,10 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(421, 4);
+ this.cmdCancel.Location = new System.Drawing.Point(561, 5);
+ this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(70, 40);
+ this.cmdCancel.Size = new System.Drawing.Size(93, 50);
this.cmdCancel.TabIndex = 110;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -1925,9 +2051,10 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(340, 4);
+ this.cmdOK.Location = new System.Drawing.Point(453, 5);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(70, 40);
+ this.cmdOK.Size = new System.Drawing.Size(93, 50);
this.cmdOK.TabIndex = 109;
this.cmdOK.Text = "姹� 鎶�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -1937,9 +2064,10 @@
//
this.panel2.Controls.Add(this.tabControl1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel2.Location = new System.Drawing.Point(0, 485);
+ this.panel2.Location = new System.Drawing.Point(0, 606);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(935, 148);
+ this.panel2.Size = new System.Drawing.Size(935, 0);
this.panel2.TabIndex = 117;
//
// tabControl1
@@ -1947,9 +2075,10 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(935, 148);
+ this.tabControl1.Size = new System.Drawing.Size(935, 0);
this.tabControl1.TabIndex = 24;
this.tabControl1.Visible = false;
//
@@ -1957,10 +2086,11 @@
//
this.tabPage1.BackColor = System.Drawing.SystemColors.GrayText;
this.tabPage1.Controls.Add(this.grdSub);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
- this.tabPage1.Size = new System.Drawing.Size(927, 122);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(927, 0);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鑱屽憳娓呭崟";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1972,12 +2102,13 @@
this.grdSub.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdSub.Location = new System.Drawing.Point(3, 3);
+ this.grdSub.Location = new System.Drawing.Point(4, 4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(921, 116);
+ this.grdSub.Size = new System.Drawing.Size(919, 0);
this.grdSub.TabIndex = 20;
this.grdSub.RowHeadersWidthChanged += new System.EventHandler(this.grdSub_RowHeadersWidthChanged);
this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
@@ -1994,9 +2125,10 @@
this.panel4.Controls.Add(this.label36);
this.panel4.Controls.Add(this.lblCaption);
this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel4.Location = new System.Drawing.Point(43, 0);
+ this.panel4.Location = new System.Drawing.Point(57, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(964, 52);
+ this.panel4.Size = new System.Drawing.Size(1286, 65);
this.panel4.TabIndex = 119;
//
// txtHBarCode
@@ -2004,10 +2136,11 @@
this.txtHBarCode.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(244, 12);
+ this.txtHBarCode.Location = new System.Drawing.Point(325, 15);
+ this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBarCode.Multiline = true;
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(229, 33);
+ this.txtHBarCode.Size = new System.Drawing.Size(304, 40);
this.txtHBarCode.TabIndex = 115;
this.txtHBarCode.Tag = "0";
this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
@@ -2018,9 +2151,10 @@
this.label36.BackColor = System.Drawing.Color.Gray;
this.label36.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label36.ForeColor = System.Drawing.Color.Yellow;
- this.label36.Location = new System.Drawing.Point(170, 15);
+ this.label36.Location = new System.Drawing.Point(227, 19);
+ this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(74, 21);
+ this.label36.Size = new System.Drawing.Size(92, 27);
this.label36.TabIndex = 114;
this.label36.Text = "鏉″舰鐮侊細";
//
@@ -2029,9 +2163,10 @@
this.lblCaption.AutoSize = true;
this.lblCaption.Font = new System.Drawing.Font("寰蒋闆呴粦", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCaption.ForeColor = System.Drawing.Color.LimeGreen;
- this.lblCaption.Location = new System.Drawing.Point(6, 7);
+ this.lblCaption.Location = new System.Drawing.Point(8, 9);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(107, 26);
+ this.lblCaption.Size = new System.Drawing.Size(134, 31);
this.lblCaption.TabIndex = 112;
this.lblCaption.Text = "鍑虹珯姹囨姤鍗�";
//
@@ -2039,16 +2174,18 @@
//
this.panel5.Dock = System.Windows.Forms.DockStyle.Left;
this.panel5.Location = new System.Drawing.Point(0, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(43, 662);
+ this.panel5.Size = new System.Drawing.Size(57, 828);
this.panel5.TabIndex = 120;
//
// panel6
//
this.panel6.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel6.Location = new System.Drawing.Point(1007, 0);
+ this.panel6.Location = new System.Drawing.Point(1343, 0);
+ this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(21, 662);
+ this.panel6.Size = new System.Drawing.Size(28, 828);
this.panel6.TabIndex = 125;
//
// panel7
@@ -2057,15 +2194,17 @@
this.panel7.Controls.Add(this.gbUp);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Location = new System.Drawing.Point(0, 0);
+ this.panel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(935, 633);
+ this.panel7.Size = new System.Drawing.Size(935, 602);
this.panel7.TabIndex = 126;
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
- this.splitContainer1.Location = new System.Drawing.Point(43, 52);
+ this.splitContainer1.Location = new System.Drawing.Point(57, 65);
+ this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
@@ -2076,8 +2215,9 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.splitContainer1_Panel2_Paint);
- this.splitContainer1.Size = new System.Drawing.Size(964, 532);
- this.splitContainer1.SplitterDistance = 633;
+ this.splitContainer1.Size = new System.Drawing.Size(1286, 665);
+ this.splitContainer1.SplitterDistance = 602;
+ this.splitContainer1.SplitterWidth = 5;
this.splitContainer1.TabIndex = 127;
//
// splitContainer2
@@ -2085,21 +2225,23 @@
this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainer2.Name = "splitContainer2";
//
// splitContainer2.Panel1
//
this.splitContainer2.Panel1.Controls.Add(this.panel7);
- this.splitContainer2.Size = new System.Drawing.Size(964, 633);
+ this.splitContainer2.Size = new System.Drawing.Size(1286, 602);
this.splitContainer2.SplitterDistance = 935;
+ this.splitContainer2.SplitterWidth = 5;
this.splitContainer2.TabIndex = 0;
//
// MES_StationOutBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Gray;
- this.ClientSize = new System.Drawing.Size(1028, 662);
+ this.ClientSize = new System.Drawing.Size(1371, 828);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.panel4);
this.Controls.Add(this.panel1);
@@ -2107,6 +2249,7 @@
this.Controls.Add(this.panel5);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MES_StationOutBill";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "鍑虹珯姹囨姤鍗�";
--
Gitblit v1.9.1