From b49a72d97955e42a4a76a641f3c8b81142999b23 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 01 三月 2022 16:45:21 +0800
Subject: [PATCH] 工序新增界面增加委外不良品仓、委外报废仓
---
BaseSet/公用资料/生产基础资料/Gy_Process.cs | 73 ++++++++++
BaseSet/公用资料/生产基础资料/Gy_Process.resx | 116 ++++++++++------
DAL/基础资料/公用基础资料/ClsGy_Process_Ctl.cs | 6
DAL/基础资料/公用基础资料/ClsGy_Process_View.cs | 2
Model/基础资料/基础资料/ClsGy_Process_Model.cs | 4
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 186 +++++++++++++++++++-------
6 files changed, 290 insertions(+), 97 deletions(-)
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 bc9b30b..85ab8e1 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"
@@ -513,6 +513,26 @@
txtHBadCountDevelopWHID.Text = "";
}
//
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWWBadWHID))
+ {
+ txtHWWBadWHID.Text = oWH.omodel.HName;
+ txtHWWBadWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWWBadWHID.Text = "";
+ }
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWWWasterWHID))
+ {
+ txtHWWWasterWHID.Text = oWH.omodel.HName;
+ txtHWWWasterWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWWWasterWHID.Text = "";
+ }
+ //
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
txtHRemark.Text = oProcHlp.omodel.HRemark;
txtHProcCheckNote.Text = oProcHlp.omodel.HProcCheckNote;
@@ -620,6 +640,8 @@
oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
oProc.oModel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(txtHBadCountDevelopWHID.Tag.ToString());
+ oProc.oModel.HWWBadWHID = DBUtility.ClsPub.isLong(txtHWWBadWHID.Tag.ToString());
+ oProc.oModel.HWWWasterWHID = DBUtility.ClsPub.isLong(txtHWWWasterWHID.Tag.ToString());
oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
oProc.oModel.HTypeCount = chkHTypeCount.Checked;
oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -785,5 +807,56 @@
}
}
+ //濮斿涓嶈壇鍝佷粨
+ private void cmdHWWBadWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWWBadWHID.Text = oWare.oModel.HName;
+ this.txtHWWBadWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWWBadWHID.Text = "";
+ }
+ }
+
+ private void txtHWWBadWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWWBadWHID.Text.Length == 0)
+ {
+ txtHWWBadWHID.Tag = "0";
+ }
+ }
+
+ //濮斿鎶ュ簾浠�
+ private void cmdHWWWasterWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWWWasterWHID.Text = oWare.oModel.HName;
+ this.txtHWWWasterWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWWWasterWHID.Text = "";
+ }
+ }
+
+ private void txtHWWWasterWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWWWasterWHID.Text.Length == 0)
+ {
+ txtHWWWasterWHID.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 9a3c0cb..35b5ee5 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"
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_Process));
- System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
this.ToolBar = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.dc = new System.Windows.Forms.ToolStripButton();
@@ -58,6 +58,9 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
+ this.label17 = new System.Windows.Forms.Label();
this.cmdHWasterWHID = new System.Windows.Forms.Button();
this.label16 = new System.Windows.Forms.Label();
this.txtHWasterWHID = new System.Windows.Forms.TextBox();
@@ -107,9 +110,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
- this.label17 = new System.Windows.Forms.Label();
- this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWWasterWHID = new System.Windows.Forms.Button();
+ this.label18 = new System.Windows.Forms.Label();
+ this.txtHWWWasterWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWBadWHID = new System.Windows.Forms.Button();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHWWBadWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -399,7 +405,7 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(729, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
@@ -425,6 +431,12 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.txtHWWBadWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.label18);
+ this.tabPage2.Controls.Add(this.txtHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWBadWHID);
+ this.tabPage2.Controls.Add(this.label19);
this.tabPage2.Controls.Add(this.txtHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.cmdHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.label17);
@@ -473,10 +485,43 @@
this.tabPage2.Controls.Add(this.label1);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(729, 469);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // txtHBadCountDevelopWHID
+ //
+ this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
+ this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
+ this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHBadCountDevelopWHID.TabIndex = 226;
+ this.txtHBadCountDevelopWHID.Tag = "0";
+ this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ //
+ // cmdHBadCountDevelopWHID
+ //
+ this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
+ this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
+ this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
+ this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBadCountDevelopWHID.TabIndex = 227;
+ this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
+ this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(2, 203);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(77, 12);
+ this.label17.TabIndex = 225;
+ this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
//
// cmdHWasterWHID
//
@@ -494,7 +539,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(284, 176);
+ this.label16.Location = new System.Drawing.Point(296, 176);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(41, 12);
this.label16.TabIndex = 222;
@@ -547,7 +592,7 @@
// txtHProcCheckNote
//
this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 294);
+ this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 321);
this.txtHProcCheckNote.Multiline = true;
this.txtHProcCheckNote.Name = "txtHProcCheckNote";
this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
@@ -556,7 +601,7 @@
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(19, 298);
+ this.label14.Location = new System.Drawing.Point(19, 325);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(53, 36);
this.label14.TabIndex = 217;
@@ -654,7 +699,7 @@
// chkHAutoTrunFlag
//
this.chkHAutoTrunFlag.AutoSize = true;
- this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 361);
+ this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 388);
this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
this.chkHAutoTrunFlag.TabIndex = 205;
@@ -677,7 +722,7 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(284, 149);
+ this.label9.Location = new System.Drawing.Point(278, 149);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 12);
this.label9.TabIndex = 202;
@@ -731,7 +776,7 @@
// chkHTypeCount
//
this.chkHTypeCount.AutoSize = true;
- this.chkHTypeCount.Location = new System.Drawing.Point(250, 361);
+ this.chkHTypeCount.Location = new System.Drawing.Point(250, 388);
this.chkHTypeCount.Name = "chkHTypeCount";
this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
this.chkHTypeCount.TabIndex = 197;
@@ -741,7 +786,7 @@
// chkHTypeFlow
//
this.chkHTypeFlow.AutoSize = true;
- this.chkHTypeFlow.Location = new System.Drawing.Point(164, 361);
+ this.chkHTypeFlow.Location = new System.Drawing.Point(164, 388);
this.chkHTypeFlow.Name = "chkHTypeFlow";
this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
this.chkHTypeFlow.TabIndex = 196;
@@ -818,7 +863,7 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(457, 390);
+ this.cmdCancel.Location = new System.Drawing.Point(457, 417);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(52, 23);
this.cmdCancel.TabIndex = 16;
@@ -828,7 +873,7 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(398, 390);
+ this.cmdOK.Location = new System.Drawing.Point(398, 417);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(52, 23);
this.cmdOK.TabIndex = 15;
@@ -839,7 +884,7 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(77, 361);
+ this.chkHStopflag.Location = new System.Drawing.Point(77, 388);
this.chkHStopflag.Name = "chkHStopflag";
this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
this.chkHStopflag.TabIndex = 12;
@@ -849,7 +894,7 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(77, 227);
+ this.txtHRemark.Location = new System.Drawing.Point(77, 254);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
this.txtHRemark.Size = new System.Drawing.Size(431, 60);
@@ -858,7 +903,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(19, 227);
+ this.label5.Location = new System.Drawing.Point(19, 254);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 9;
@@ -934,13 +979,13 @@
this.tv.LineColor = System.Drawing.Color.Navy;
this.tv.Location = new System.Drawing.Point(0, 23);
this.tv.Name = "tv";
- treeNode2.ForeColor = System.Drawing.Color.Black;
- treeNode2.Name = "tjbb";
- treeNode2.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- treeNode2.StateImageKey = "鏂囦欢澶�1.ico";
- treeNode2.Text = "椤圭洰";
+ treeNode1.ForeColor = System.Drawing.Color.Black;
+ treeNode1.Name = "tjbb";
+ treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
+ treeNode1.Text = "椤圭洰";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode2});
+ treeNode1});
this.tv.SelectedImageIndex = 1;
this.tv.Size = new System.Drawing.Size(136, 472);
this.tv.TabIndex = 16;
@@ -977,38 +1022,71 @@
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // cmdHBadCountDevelopWHID
+ // cmdHWWWasterWHID
//
- this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
- this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
- this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
- this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
- this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
- this.cmdHBadCountDevelopWHID.TabIndex = 227;
- this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
- this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ this.cmdHWWWasterWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWWasterWHID.Image")));
+ this.cmdHWWWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWWasterWHID.Location = new System.Drawing.Point(487, 225);
+ this.cmdHWWWasterWHID.Name = "cmdHWWWasterWHID";
+ this.cmdHWWWasterWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWWasterWHID.TabIndex = 233;
+ this.cmdHWWWasterWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWWasterWHID.Click += new System.EventHandler(this.cmdHWWWasterWHID_Click);
//
- // label17
+ // label18
//
- this.label17.AutoSize = true;
- this.label17.ForeColor = System.Drawing.Color.Black;
- this.label17.Location = new System.Drawing.Point(1, 203);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(77, 12);
- this.label17.TabIndex = 225;
- this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
+ this.label18.AutoSize = true;
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(272, 230);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(65, 12);
+ this.label18.TabIndex = 231;
+ this.label18.Text = "濮斿鎶ュ簾浠�";
//
- // txtHBadCountDevelopWHID
+ // txtHWWWasterWHID
//
- this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
- this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
- this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
- this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
- this.txtHBadCountDevelopWHID.TabIndex = 226;
- this.txtHBadCountDevelopWHID.Tag = "0";
- this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ this.txtHWWWasterWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWWasterWHID.Location = new System.Drawing.Point(343, 226);
+ this.txtHWWWasterWHID.Name = "txtHWWWasterWHID";
+ this.txtHWWWasterWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWWasterWHID.TabIndex = 232;
+ this.txtHWWWasterWHID.Tag = "0";
+ this.txtHWWWasterWHID.TextChanged += new System.EventHandler(this.txtHWWWasterWHID_TextChanged);
+ //
+ // cmdHWWBadWHID
+ //
+ this.cmdHWWBadWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWBadWHID.Image")));
+ this.cmdHWWBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWBadWHID.Location = new System.Drawing.Point(221, 225);
+ this.cmdHWWBadWHID.Name = "cmdHWWBadWHID";
+ this.cmdHWWBadWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWBadWHID.TabIndex = 230;
+ this.cmdHWWBadWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWBadWHID.Click += new System.EventHandler(this.cmdHWWBadWHID_Click);
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.ForeColor = System.Drawing.Color.Black;
+ this.label19.Location = new System.Drawing.Point(2, 230);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(77, 12);
+ this.label19.TabIndex = 228;
+ this.label19.Text = "濮斿涓嶈壇鍝佷粨";
+ //
+ // txtHWWBadWHID
+ //
+ this.txtHWWBadWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWBadWHID.Location = new System.Drawing.Point(77, 226);
+ this.txtHWWBadWHID.Name = "txtHWWBadWHID";
+ this.txtHWWBadWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWBadWHID.TabIndex = 229;
+ this.txtHWWBadWHID.Tag = "0";
+ this.txtHWWBadWHID.TextChanged += new System.EventHandler(this.txtHWWBadWHID_TextChanged);
//
// Gy_Process
//
@@ -1121,5 +1199,11 @@
private System.Windows.Forms.TextBox txtHBadCountDevelopWHID;
private System.Windows.Forms.Button cmdHBadCountDevelopWHID;
private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHWWBadWHID;
+ private System.Windows.Forms.Button cmdHWWWasterWHID;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.TextBox txtHWWWasterWHID;
+ private System.Windows.Forms.Button cmdHWWBadWHID;
+ private System.Windows.Forms.Label label19;
}
}
\ 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 fe1e873..e5d29aa 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"
@@ -409,51 +409,81 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAXQBAQF0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAXwBAQF8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAATgBigH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQ
- AbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/
- AQMBkAG5Af8DAAn/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AwAB/wMAAf+AAAT/
- AQABOAGKAf8B0QH2Av8BSgHaAfQB/wE/AdMB8QH/ATQBywHvAf8BKgHEAe0B/wEgAb4B6wH/ARYBuAHo
- Af8BCgGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQMBkAG5Af8DAAn/AQABOAGK
- Af8B0QH2Av8BHwG+AesB/wEZAbkB6QH/AREBtAHnAf8BCQGwAeYB/wECAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQMBkAG5Af8BAAE4AYoB/wMAAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AVAB3gH1
- Af8BRQHWAfMB/wE7AdAB8QH/ATAByQHuAf8BJgHCAewB/wEbAbwB6gH/AREBtAHnAf8BBgGtAeUB/wEA
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/ASoBxQHuAf8BJAHB
- AesB/wEdAbwB6wH/ARUBtwHoAf8BDgGyAecB/wEGAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQMBkAG5Af8DAAH/AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYEB4QH3Af8BTAHaAfQB/wFB
- AdQB8gH/ATYBzAHvAf8BLAHGAe4B/wEiAcAB6wH/ARcBuQHpAf8BDQGyAeYB/wECAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AS8ByAHuAf8BKAHEAewB/wEhAb8B6wH/
- ARoBuwHqAf8BEwG2AegB/wELAbAB5wH/AQQBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOAGKAf8DAAH/
- AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYYB5QH3Af8BUgHfAfUB/wFHAdgB8wH/AT0B0QHx
- Af8BMgHKAe8B/wEoAcQB7QH/AR4BvQHqAf8BEwG2AegB/wEIAa8B5QH/AQABqAHjAf8BAAGiAeEB/wED
- AZABuQH/AwAB/wEAATgBigH/AdEB9gL/ATsBzwHxAf8BNAHLAe8B/wEsAccB7gH/ASYBwgHsAf8BHwG9
- AeoB/wEXAbkB6QH/ARABtAHnAf8BCQGwAeYB/wEBAaoB5QH/AQMBkAG5Af8DAAH/AQMBkAG5Af8BAwGQ
- AbkB/wMAAf+AAAT/AQABOAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU4B3AH1Af8BRAHVAfIB/wE4
- Ac4B8AH/AS4ByAHuAf8BJAHBAewB/wEaAboB6gH/AQ4BswHnAf8BBAGsAeUB/wEAAaYB4wH/AQMBkAG5
- Af8DAAH/AQABOAGKAf8B0QH2Av8BQAHTAfIB/wE4Ac4B8AH/ATEBygHuAf8BKgHFAe0B/wEkAcEB6wH/
- ARwBvAHqAf8BFQG3AegB/wENAbIB5gH/AQYBrgHlAf8BAwGQAbkB/wMAAf8BAwGQAbkB/wEDAZABuQH/
- AwAB/4AABP8BAAE4AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVAHgAfYB/wFKAdkB8wH/AT8B0wHy
- Af8BNAHLAe8B/wEqAcUB7QH/ASABvgHrAf8BFgG4AekB/wEKAbAB5gH/AQABqQHkAf8BAwGQAbkB/wMA
- Af8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAwGQAbkB/wExAckB7gH/AQMBkAG5
- Af8DAAH/gAAE/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVEB3gH1Af8BRQHW
- AfMB/wE7Ac8B8QH/ATAByQHvAf8BJgHCAewB/wEcAbsB6QH/AREBtQHnAf8BBgGtAeYB/wEDAZABuQH/
- AwAF/wEAATgBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFR
- Ad0B9QH/AUsB2gHzAf8BRQHXAfMB/wFAAdMB8QH/AToBzwHxAf8BNAHLAe8B/wEDAZABuQH/AwAB/4AA
- BP8BAAE4AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFUAeAB9gH/AU8B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BAwGQAbkB/wMAAf+AAAT/AQABOAGKAf8BFgGoAdMB/wEWAagB0wH/ARYBqAHTAf8BFgGo
- AdMB/wEWAagB0wH/ARYBqAHTAf8BFgGoAdMB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoJ/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4
- AYoF/4AACP8BAAE4AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATgBigH/AwAh/wEAATgBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOAGKHf+AAAz/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wMAKf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATcBigH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQ
+ AbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/
+ AQIBkAG5Af8DAAn/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AwAB/wMAAf+AAAT/
+ AQABNwGKAf8B0QH2Av8BSQHaAfQB/wE+AdMB8QH/ATMBywHvAf8BKQHEAe0B/wEfAb4B6wH/ARUBuAHo
+ Af8BCQGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQIBkAG5Af8DAAn/AQABNwGK
+ Af8B0QH2Av8BHgG+AesB/wEYAbkB6QH/ARABtAHnAf8BCAGwAeYB/wEBAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQIBkAG5Af8BAAE3AYoB/wMAAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AU8B3gH1
+ Af8BRAHWAfMB/wE6AdAB8QH/AS8ByQHuAf8BJQHCAewB/wEaAbwB6gH/ARABtAHnAf8BBQGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/ASkBxQHuAf8BIwHB
+ AesB/wEcAbwB6wH/ARQBtwHoAf8BDQGyAecB/wEFAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQIBkAG5Af8DAAH/AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYEB4QH3Af8BSwHaAfQB/wFA
+ AdQB8gH/ATUBzAHvAf8BKwHGAe4B/wEhAcAB6wH/ARYBuQHpAf8BDAGyAeYB/wEBAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AS4ByAHuAf8BJwHEAewB/wEgAb8B6wH/
+ ARkBuwHqAf8BEgG2AegB/wEKAbAB5wH/AQMBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABNwGKAf8DAAH/
+ AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYYB5QH3Af8BUQHfAfUB/wFGAdgB8wH/ATwB0QHx
+ Af8BMQHKAe8B/wEnAcQB7QH/AR0BvQHqAf8BEgG2AegB/wEHAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEC
+ AZABuQH/AwAB/wEAATcBigH/AdEB9gL/AToBzwHxAf8BMwHLAe8B/wErAccB7gH/ASUBwgHsAf8BHgG9
+ AeoB/wEWAbkB6QH/AQ8BtAHnAf8BCAGwAeYB/wEAAaoB5QH/AQIBkAG5Af8DAAH/AQIBkAG5Af8BAgGQ
+ AbkB/wMAAf+AAAT/AQABNwGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU0B3AH1Af8BQwHVAfIB/wE3
+ Ac4B8AH/AS0ByAHuAf8BIwHBAewB/wEZAboB6gH/AQ0BswHnAf8BAwGsAeUB/wEAAaYB4wH/AQIBkAG5
+ Af8DAAH/AQABNwGKAf8B0QH2Av8BPwHTAfIB/wE3Ac4B8AH/ATABygHuAf8BKQHFAe0B/wEjAcEB6wH/
+ ARsBvAHqAf8BFAG3AegB/wEMAbIB5gH/AQUBrgHlAf8BAgGQAbkB/wMAAf8BAgGQAbkB/wECAZABuQH/
+ AwAB/4AABP8BAAE3AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BUwHgAfYB/wFJAdkB8wH/AT4B0wHy
+ Af8BMwHLAe8B/wEpAcUB7QH/AR8BvgHrAf8BFQG4AekB/wEJAbAB5gH/AQABqQHkAf8BAgGQAbkB/wMA
+ Af8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAgGQAbkB/wEwAckB7gH/AQIBkAG5
+ Af8DAAH/gAAE/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVAB3gH1Af8BRAHW
+ AfMB/wE6Ac8B8QH/AS8ByQHvAf8BJQHCAewB/wEbAbsB6QH/ARABtQHnAf8BBQGtAeYB/wECAZABuQH/
+ AwAF/wEAATcBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFQ
+ Ad0B9QH/AUoB2gHzAf8BRAHXAfMB/wE/AdMB8QH/ATkBzwHxAf8BMwHLAe8B/wECAZABuQH/AwAB/4AA
+ BP8BAAE3AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFTAeAB9gH/AU4B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BAgGQAbkB/wMAAf+AAAT/AQABNwGKAf8BFQGoAdMB/wEVAagB0wH/ARUBqAHTAf8BFQGo
+ AdMB/wEVAagB0wH/ARUBqAHTAf8BFQGoAdMB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoJ/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3
+ AYoF/4AACP8BAAE3AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATcBigH/AwAh/wEAATcBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABNwGKHf+AAAz/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wMAKf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <data name="cmdHWWWasterWHID.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="cmdHWWBadWHID.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="cmdHBadCountDevelopWHID.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 723e722..26e5b5d 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"
@@ -21,12 +21,12 @@
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HTypeFlow,HTypeCount,HDeptNumber,HSNo,HBadWHID,HWasterWHID" +
- ",HBadCountDevelopWHID" +
+ ",HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID" +
",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() + "," + oModel.HBadWHID.ToString() + "," + oModel.HWasterWHID.ToString() +
- "," + oModel.HBadCountDevelopWHID.ToString() +
+ "," + oModel.HBadCountDevelopWHID.ToString() + "," + oModel.HWWBadWHID.ToString() + "," + oModel.HWWWasterWHID.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);
@@ -60,6 +60,8 @@
",HBadWHID=" + oModel.HBadWHID.ToString() +
",HWasterWHID=" + oModel.HWasterWHID.ToString() +
",HBadCountDevelopWHID=" + oModel.HBadCountDevelopWHID.ToString() +
+ ",HWWBadWHID=" + oModel.HWWBadWHID.ToString() +
+ ",HWWWasterWHID=" + oModel.HWWWasterWHID.ToString() +
",HProcessID_K3=" +oModel.HProcessID_K3+
",HBillSubType='" + oModel.HBillSubType + "'" +
",HDeptNumber='" + oModel.HDeptNumber + "'" +
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 6f51657..e56d16e 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"
@@ -124,6 +124,8 @@
omodel.HBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadWHID"]);
omodel.HWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWasterWHID"]);
omodel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBadCountDevelopWHID"]);
+ omodel.HWWBadWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWWBadWHID"]);
+ omodel.HWWWasterWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWWWasterWHID"]);
return true;
}
catch (Exception e)
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 fb350d8..e28bbfc 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"
@@ -23,6 +23,8 @@
public string HProcCheckNote = "";//本工序确认记录
public Int64 HBadWHID;//New
public Int64 HWasterWHID;//New
- public Int64 HBadCountDevelopWHID;//研发不良品仓库New
+ public Int64 HBadCountDevelopWHID; //研发不良品仓库New
+ public Int64 HWWBadWHID; //委外不良品仓New
+ public Int64 HWWWasterWHID; //委外报废仓New
}
}
--
Gitblit v1.9.1