From b2abf37fac8885c23706eee389ccb4be07aceaa4 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 08 一月 2024 14:50:18 +0800
Subject: [PATCH] 看板系统设置模块修改，外购件仓库看板模块修改
---
NETERPNoWin/bin/x86/Debug/grdWidth.wyini | 2
NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/Frm_MESSetIni.resx | 17 ----
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
NETERPNoWin/bin/x86/Debug/HXERP_SY.ini | 3
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache | 2
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 55 +++++++++++++
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
NETERPNoWin/Frm_MESSetIni.cs | 22 +++++
NETERPNoWin/Frm_MESSetIni.Designer.cs | 93 +++++++----------------
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
NETERPNoWin/bin/x86/Debug/stdole.dll | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
Kanban/工位看板/Sc_WGJCKKB.cs | 10 ++
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
45 files changed, 120 insertions(+), 84 deletions(-)
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Sc_WGJCKKB.cs" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Sc_WGJCKKB.cs"
index 7794a2a..4a9fa32 100644
--- "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Sc_WGJCKKB.cs"
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Sc_WGJCKKB.cs"
@@ -8,6 +8,7 @@
using gregn6Lib;
using SQLHelper;
using DBUtility;
+using Pub_Class;
namespace Kanban
{
@@ -72,11 +73,18 @@
ClsCN SubCn = new ClsCN();
string sSql = "";
string sWhere = "";
+ ClsIni oIni = new ClsIni();
+ string sHWhName = ClsIni.ReadIni("Warehouse", "HWhName", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ if (sHWhName == "娌℃湁鎵惧埌锛�")
+ {
+ sHWhName = "";
+ }
//杩囨护鏉′欢
//if (frmCondition.SqlStr.Trim().Length == 0)
// return;
//sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
- sSql = "exec h_p_Sc_WGJCKKB";
+ sSql = "exec h_p_Sc_WGJCKKB_New '" + sHWhName + "'";
+ //sSql = "exec h_p_Sc_WGJCKKB_New " + DBUtility.ClsPub.isLong(sHWhID) + ",'" + sHWhName + "'";
//
DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
diff --git a/NETERPNoWin/Frm_MESSetIni.Designer.cs b/NETERPNoWin/Frm_MESSetIni.Designer.cs
index 5789de7..12dd925 100644
--- a/NETERPNoWin/Frm_MESSetIni.Designer.cs
+++ b/NETERPNoWin/Frm_MESSetIni.Designer.cs
@@ -36,19 +36,16 @@
this.label2 = new System.Windows.Forms.Label();
this.txtHOPWin = new System.Windows.Forms.TextBox();
this.cmdHDeptID = new System.Windows.Forms.Button();
- this.button1 = new System.Windows.Forms.Button();
- this.label3 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.button2 = new System.Windows.Forms.Button();
+ this.cmdHWhID = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
- this.textBox2 = new System.Windows.Forms.TextBox();
+ this.txtHWhID = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// txtHDeptID
//
- this.txtHDeptID.Location = new System.Drawing.Point(98, 86);
+ this.txtHDeptID.Location = new System.Drawing.Point(98, 47);
this.txtHDeptID.Name = "txtHDeptID";
- this.txtHDeptID.Size = new System.Drawing.Size(160, 21);
+ this.txtHDeptID.Size = new System.Drawing.Size(154, 21);
this.txtHDeptID.TabIndex = 0;
//
// cmdOK
@@ -74,7 +71,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(10, 89);
+ this.label1.Location = new System.Drawing.Point(34, 51);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 3;
@@ -83,7 +80,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(10, 115);
+ this.label2.Location = new System.Drawing.Point(10, 80);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(77, 12);
this.label2.TabIndex = 5;
@@ -91,7 +88,7 @@
//
// txtHOPWin
//
- this.txtHOPWin.Location = new System.Drawing.Point(98, 112);
+ this.txtHOPWin.Location = new System.Drawing.Point(98, 76);
this.txtHOPWin.Name = "txtHOPWin";
this.txtHOPWin.Size = new System.Drawing.Size(176, 21);
this.txtHOPWin.TabIndex = 4;
@@ -101,79 +98,50 @@
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(252, 86);
+ this.cmdHDeptID.Location = new System.Drawing.Point(252, 46);
this.cmdHDeptID.Name = "cmdHDeptID";
this.cmdHDeptID.Size = new System.Drawing.Size(22, 22);
this.cmdHDeptID.TabIndex = 78;
this.cmdHDeptID.UseVisualStyleBackColor = false;
this.cmdHDeptID.Click += new System.EventHandler(this.cmdHDeptID_Click);
//
- // button1
+ // cmdHWhID
//
- this.button1.BackColor = System.Drawing.Color.Transparent;
- this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image")));
- this.button1.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.button1.Location = new System.Drawing.Point(252, 25);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(22, 22);
- this.button1.TabIndex = 81;
- this.button1.UseVisualStyleBackColor = false;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(10, 28);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(53, 12);
- this.label3.TabIndex = 80;
- this.label3.Text = "榛樿杞﹂棿";
- //
- // textBox1
- //
- this.textBox1.Location = new System.Drawing.Point(98, 25);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(160, 21);
- this.textBox1.TabIndex = 79;
- //
- // button2
- //
- this.button2.BackColor = System.Drawing.Color.Transparent;
- this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image")));
- this.button2.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.button2.Location = new System.Drawing.Point(252, 54);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(22, 22);
- this.button2.TabIndex = 84;
- this.button2.UseVisualStyleBackColor = false;
+ this.cmdHWhID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWhID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWhID.Image")));
+ this.cmdHWhID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWhID.Location = new System.Drawing.Point(252, 17);
+ this.cmdHWhID.Name = "cmdHWhID";
+ this.cmdHWhID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWhID.TabIndex = 84;
+ this.cmdHWhID.UseVisualStyleBackColor = false;
+ this.cmdHWhID.Click += new System.EventHandler(this.cmdHWhID_Click);
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(10, 57);
+ this.label4.Location = new System.Drawing.Point(34, 22);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 83;
this.label4.Text = "榛樿浠撳簱";
//
- // textBox2
+ // txtHWhID
//
- this.textBox2.Location = new System.Drawing.Point(98, 54);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(160, 21);
- this.textBox2.TabIndex = 82;
+ this.txtHWhID.Location = new System.Drawing.Point(98, 18);
+ this.txtHWhID.Name = "txtHWhID";
+ this.txtHWhID.Size = new System.Drawing.Size(154, 21);
+ this.txtHWhID.TabIndex = 82;
+ this.txtHWhID.TextChanged += new System.EventHandler(this.txtHWhID_TextChanged);
//
// Frm_MESSetIni
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(297, 267);
- this.Controls.Add(this.button2);
+ this.Controls.Add(this.cmdHWhID);
this.Controls.Add(this.label4);
- this.Controls.Add(this.textBox2);
- this.Controls.Add(this.button1);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.textBox1);
+ this.Controls.Add(this.txtHWhID);
this.Controls.Add(this.cmdHDeptID);
this.Controls.Add(this.label2);
this.Controls.Add(this.txtHOPWin);
@@ -200,11 +168,8 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtHOPWin;
private System.Windows.Forms.Button cmdHDeptID;
- private System.Windows.Forms.Button button1;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox textBox1;
- private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Button cmdHWhID;
private System.Windows.Forms.Label label4;
- private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.TextBox txtHWhID;
}
}
\ No newline at end of file
diff --git a/NETERPNoWin/Frm_MESSetIni.cs b/NETERPNoWin/Frm_MESSetIni.cs
index 778ad94..7010172 100644
--- a/NETERPNoWin/Frm_MESSetIni.cs
+++ b/NETERPNoWin/Frm_MESSetIni.cs
@@ -21,6 +21,8 @@
ClsIni oIni = new ClsIni();
ClsIni.WriteIni("Dept", "DeptID", this.txtHDeptID.Tag.ToString(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
ClsIni.WriteIni("Dept", "DeptName", this.txtHDeptID.Text.Trim(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ ClsIni.WriteIni("Warehouse", "HWhID", this.txtHWhID.Tag.ToString(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ ClsIni.WriteIni("Warehouse", "HWhName", this.txtHWhID.Text.Trim(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
ClsIni.WriteIni("OPenWin", "gnmc", this.txtHOPWin.Text.Trim(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
this.Close();
}
@@ -49,15 +51,33 @@
ClsIni oIni = new ClsIni();
string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
string sName = ClsIni.ReadIni("Dept", "DeptName", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ string sHWhID = ClsIni.ReadIni("Warehouse", "HWhID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ string sHWhName = ClsIni.ReadIni("Warehouse", "HWhName", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
string sWinName = ClsIni.ReadIni("OPenWin", "gnmc", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
txtHDeptID.Tag = sID;
txtHDeptID.Text = sName;
+ txtHWhID.Tag = sHWhID;
+ txtHWhID.Text = sHWhName;
txtHOPWin.Text = sWinName;
}
- private void button1_Click(object sender, EventArgs e)
+ private void cmdHWhID_Click(object sender, EventArgs e)
{
+ DAL.ClsGy_Warehouse_View oWarehouse = new DAL.ClsGy_Warehouse_View();
+ if (oWarehouse.RefreshView())
+ {
+ this.txtHWhID.Text = oWarehouse.oModel.HName;
+ this.txtHWhID.Tag = oWarehouse.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWhID.Text = "";
+ }
+ }
+ private void txtHWhID_TextChanged(object sender, EventArgs e)
+ {
+ BLL.ClsPub_BLL.Sub_ClearText(txtHWhID);
}
}
}
\ No newline at end of file
diff --git a/NETERPNoWin/Frm_MESSetIni.resx b/NETERPNoWin/Frm_MESSetIni.resx
index 7c7a0d8..609bf9c 100644
--- a/NETERPNoWin/Frm_MESSetIni.resx
+++ b/NETERPNoWin/Frm_MESSetIni.resx
@@ -133,22 +133,7 @@
FIYcEAA7
</value>
</data>
- <data name="button1.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="button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="cmdHWhID.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
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index f17941a..df02f0e 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index 0448ffe..bbad742 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index 6d30411..e3b57bc 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index 9af796d..8dd2b44 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index 65b6676..7430215 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index f12e5c5..fb936cb 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index f61b4c7..bb37f30 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index 35e5cf4..5e730de 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
index ee4c056..98e9b54 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
@@ -30,3 +30,6 @@
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
gnmc=车间看板
+[Warehouse]
+HWhID=0
+HWhName=
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
index f8761ea..7ceb9e9 100644
--- a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index b1b12e9..8518dbe 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index 4fb0ef9..729cf94 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index a9b4a77..b088253 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 9a14cf1..55a9737 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index 88f769a..77d655f 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index 09838ac..d5efdaa 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index c938e0f..b178844 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index a5f534a..345defb 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index 98fe6be..4162bf7 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index 7ae0e18..4a40c24 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
index 4242f51..8478cd3 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
index d405dfe..ac1a060 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
index dc77cda..bfd1895 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
index 5662ea7..2a912b8 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
index 70a91e0..ea08612 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
index 49b5b22..4cda84e 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index 06636e5..36105f3 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index 7fb4344..5bd2d1b 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index 47b19b5..f6032fc 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index 466ad9a..0caf41d 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
index 871f97d..707ec82 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -57,4 +57,4 @@
Sc_CJKB=
Sc_CGKB=100,100,100,100,100,100,100,100,100,100,100
Sc_QLKB=
-Sc_WGJCKKB=
+Sc_WGJCKKB=5,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
diff --git a/NETERPNoWin/bin/x86/Debug/stdole.dll b/NETERPNoWin/bin/x86/Debug/stdole.dll
new file mode 100644
index 0000000..d0f5217
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/stdole.dll
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
index 3bc1799..7ceb9e9 100644
--- a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources
index 080ce13..2050668 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
index debeb44..efff1c8 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
index 28d49e7..68a9329 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4d465dc42f2318b18641ac13d827424c9f4bd970
+a745b9346fad4036762fb74aefe814be70fc1e71
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index 222a36c..577e027 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -162,3 +162,58 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.gregn6Lib.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.grdes6Lib.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll.config
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.pdb
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\Interop.gregn6Lib.dll
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.ResolveComReference.cache
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Form1.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_MESSetIni.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.OA_MessageBox.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_Show.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MDIMain.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Properties.Resources.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Xt_Wait.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MESMain.resources
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.GenerateResource.cache
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
+D:\GIT浠撳簱\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
index 3a6b06a..07cd5f0 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 60ee215..013df0a 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index 88f769a..77d655f 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
index 09838ac..d5efdaa 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
--
Gitblit v1.9.1