From dc2ccab68a88118edbc8cec80b2b8bdcc8afd140 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 30 五月 2025 16:56:22 +0800
Subject: [PATCH] 夏宝添加看板
---
NETERPNoWin/公用/MESMain.Designer.cs | 165 +++---
NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 2
Kanban/Kanban.csproj | 10
NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll | 0
WebAPI/WebAPI.csproj.user | 2
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
NETERPNoWin/bin/Debug/HXERP.ini | 34
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
Kanban/工位看板/Gy_WLKB.designer.cs | 286 +++++++++++
NETERPNoWin/公用/MESMain.resx | 88 +++
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll | 0
NETERPNoWin/bin/x86/Debug/KanbanInfo.ini | 81 +++
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
NETERPNoWin/bin/x86/Debug/NPOI.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
NETERPNoWin/公用/MESMain.cs | 6
NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.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/grdWidth.wyini | 3
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
NETERPNoWin/bin/x86/Debug/OAM.pdb | 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 | 6
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config | 3
NETERPNoWin/bin/x86/Debug/WarM.dll.config | 5
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 2
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
Kanban/工位看板/Gy_WLKB.resx | 156 ++++++
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Kanban/工位看板/Gy_WLKB.cs | 581 +++++++++++++++++++++++
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
NETERPNoWin/NETERPNoWin.csproj.user | 1
NETERPNoWin/NETERPNoWin.csproj | 23
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll | 0
NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll | 0
NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
61 files changed, 1,352 insertions(+), 102 deletions(-)
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index d8b7bf8..4d4704a 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -134,6 +134,12 @@
<Compile Include="Sc_WorkshopKB.designer.cs">
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
</Compile>
+ <Compile Include="宸ヤ綅鐪嬫澘\Gy_WLKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="宸ヤ綅鐪嬫澘\Gy_WLKB.designer.cs">
+ <DependentUpon>Gy_WLKB.cs</DependentUpon>
+ </Compile>
<Compile Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.cs">
<SubType>Form</SubType>
</Compile>
@@ -374,6 +380,10 @@
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="宸ヤ綅鐪嬫澘\Gy_WLKB.resx">
+ <DependentUpon>Gy_WLKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.resx">
<DependentUpon>Sc_WGJCKKB.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.cs" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.cs"
new file mode 100644
index 0000000..b8a8487
--- /dev/null
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.cs"
@@ -0,0 +1,581 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using SQLHelper;
+using DBUtility;
+using Pub_Class;
+
+namespace Kanban
+{
+ public partial class Gy_WLKB : Form
+ {
+ public Gy_WLKB()
+ {
+ InitializeComponent();
+ }
+ public DBUtility.frmBillQueryCondition_New frmCondition;
+ public string ViewName = "h_p_Gy_WLKB";
+ public string ModCaption = "鐗╂枡鐪嬫澘";
+ public const string ModName = "3702";
+ public const string ModRightName = "Gy_WLKB";
+ public const string ModRightNameEdit = ModRightName + "_Edit";
+ public const string ModRightNameCheck = ModRightName + "_Check";
+ public const string ModRightNameClose = ModRightName + "_Close";
+ public const string ModRightNameDelete = ModRightName + "_Delete";
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ public string sDeptID = "0";
+ DataSet DSet;
+
+ int FY = 29;
+ //
+ private void initGrid()
+ {
+ //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ //鍒楁爣棰�
+ //grdMain.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionBackColor = Color.FromArgb(60, 134, 202);
+ //grdMain.ColumnHeadersDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //grdMain.ColumnHeadersHeight = 40;
+ //grdMain.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ ////濂囨暟琛�
+ //grdMain.AlternatingRowsDefaultCellStyle.BackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(104, 97, 118);
+ //grdMain.AlternatingRowsDefaultCellStyle.SelectionForeColor = Color.White;
+ ////缃戞牸鑳屾櫙鑹�
+ //grdMain.BackgroundColor = Color.FromArgb(104, 97, 118);
+ ////鍒楁爣棰樿竟妗嗘牱寮�
+ //grdMain.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; ;
+ ////鏍囬鏍峰紡鏄惁浣跨敤鐢ㄦ埛褰撳墠涓婚鐨勬牱寮�
+ //grdMain.EnableHeadersVisualStyles = false;
+ ////闅愯棌琛屾爣棰�
+ //grdMain.RowHeadersVisible = false;
+ ////鍗曞厓鏍�
+ //grdMain.RowsDefaultCellStyle.BackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.ForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(47, 47, 47);
+ //grdMain.RowsDefaultCellStyle.SelectionForeColor = Color.White;
+ //grdMain.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ //--------------------
+ DBUtility.Xt_BaseBillFun.initKanBan(this.Name, grdMain, Tool, toolStripLabel1, null, ref FY, timer2, timer3);
+ }
+ //
+
+ private void Display()
+ {
+ try
+ {
+ //ClsCN SubCn = new ClsCN();
+ //string sSql = "";
+ //string sWhere = "";
+ ////杩囨护鏉′欢
+ ////if (frmCondition.SqlStr.Trim().Length == 0)
+ //// return;
+ ////sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate ";
+ //sSql = "exec h_p_QLKB ";
+ ////
+ //DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ ////鐢熸垚棣栬鏍囬
+ //if (DSet == null)
+ //{
+ // //MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ // return;
+ //}
+ ////閲婃斁鍐荤粨
+ //DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdMain);
+ ////
+ //grdMain.DataSource = DSet.Tables[0].DefaultView;
+ ////
+
+ ////-----------棰勮鐘舵��
+ ////寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ ////瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ ////int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ ////int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ ////int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ ////DateTime oNow = DateTime.Today.Date;
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ //// }
+ //// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ //// }
+ ////}
+
+ ////璁剧疆鍚堣鍒�
+ //string sTotalCol = "";
+ //sTotalCol = DBUtility.Gy_BaseFun.GetTotalCols(DSet);
+ //string[] sT;
+ //sT = sTotalCol.Split(Convert.ToChar(","));
+ //oSumGrid.BuildTotalCols(sT);
+ ////
+ ////鍐荤粨
+ //int FrCol = 10;
+ //string s = "鏄�";
+ //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ ////鐢荤嚎
+ ////GraphLine();
+
+ ////Total();
+
+ ////for (int i = 0; i < grdMain.Rows.Count; i++)
+ ////{
+ //// if (i % 2 == 0)
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SteelBlue;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ //// else
+ //// {
+ //// grdMain.Rows[i].DefaultCellStyle.BackColor = Color.SlateGray;
+ //// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.White;
+ //// }
+ ////}
+ ////
+ ///
+ //ClsCN clsCN = new ClsCN();
+ //ClsIni clsIni = new ClsIni();
+ //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini");
+ //this.sDeptID = text;
+ string s = "";
+
+ ClsCN SubCn = new ClsCN();
+ string sSql = "";
+ string sWhere = "";
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Warehouse", "HWhID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ sDeptID = sID;
+ string procName = "exec h_p_Gy_WLKB " + this.sDeptID;
+ this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+ bool flag = this.DSet == null;
+ if (!flag)
+ {
+ Xt_BaseBillFun.CancelFrozenCol(this.grdMain);
+ this.grdMain.DataSource = this.DSet.Tables[0].DefaultView;
+ string totalCols = Gy_BaseFun.GetTotalCols(this.DSet);
+ string[] cols = totalCols.Split(new char[]
+ {
+ Convert.ToChar(",")
+ });
+ this.oSumGrid.BuildTotalCols(cols);
+ int frCol = 10;
+ s = "鍚�";
+ Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
+ }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+ //s = "鍚�";
+ //int MainIDCol = Fun_GetCol("hmainid");
+ //int SubIDCol = Fun_GetCol("hsubid");
+ //long n = 0;
+ //DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
+ //Total();
+ }
+ catch (Exception e)
+ {
+ return;
+ }
+ }
+ //
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled=false;
+ initGrid();
+ Display();
+ }
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ this.Close();
+ }
+
+ private void sx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ private void dj_Click(object sender, EventArgs e)
+ {
+ Sub_ShowBill();
+ }
+ //鏄剧ず鍗曟嵁
+ private void Sub_ShowBill()
+ {
+
+ }
+ //
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+ //
+ private void Gy_WLKB_Load(object sender, EventArgs e)
+ {
+ //
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ //lblCaption.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ initGrid();
+
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ if (sID == "娌℃湁鎵惧埌锛�")
+ {
+ sDeptID = "0";
+ }
+ else
+ {
+ sDeptID = sID;
+ }
+ }
+
+ private void grdMain_DblClick(object sender, EventArgs e)
+ {
+ //Sc_WorkBillProcReportKB o = new Sc_WorkBillProcReportKB();
+ //if(grdMain.CurrentRow==null)
+ // return;
+ //o.sICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
+ //o.sDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HDeptID")].Value);
+ //o.ShowDialog();
+ }
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
+
+ private void xz_Click(object sender, EventArgs e)
+ {
+ //
+ }
+
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Sub_DeleteBill();
+ }
+ //鍒犻櫎
+ private void Sub_DeleteBill()
+ {
+
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ //timer2.Enabled = false;
+ //frmCondition = new frmBillQueryCondition_New();
+ //SetCondition(frmCondition, ViewName, this.Name);
+ //frmCondition.ShowDialog();
+ //if (frmCondition.Tag.ToString() == "OK")
+ //{
+ //timer1.Enabled = true;
+ //}
+
+ if (DSet != null && DSet.Tables[0].Rows.Count > FY)
+ {
+ for (int y = 0; y < FY; y++)
+ {
+ DataRow newRow = DSet.Tables[0].NewRow();
+ //鐢ㄧ浉搴斿�煎～鍐欐暟鎹
+ for (int m = 0; m < DSet.Tables[0].Columns.Count; m++)
+ {
+ newRow[m] = DSet.Tables[0].Rows[0][m];
+ }
+ //濉啓瀹屾瘯锛屽皢鏁版嵁琛屾坊鍔犲埌鏁版嵁闆�
+ DSet.Tables[0].Rows.Add(newRow);
+
+ DSet.Tables[0].Rows.Remove(DSet.Tables[0].Rows[0]);
+ }
+
+ grdMain.DataSource = null;
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+
+
+ //int MainIDCol = Fun_GetCol("hmainid");
+ //int SubIDCol = Fun_GetCol("hsubid");
+ //string s = "鍚�";
+ //long n = 0;
+ //DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
+
+
+
+
+ ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
+ //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
+ //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 0)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Red;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) > 0 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) < 7)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Orange;
+ // }
+ // else if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) >= 7 && DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HYJDateCol].Value) <= 14)
+ // {
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.BackColor = Color.Yellow;
+ // grdMain.Rows[i].Cells[HYJDateCol].Style.ForeColor = Color.Black;
+ // }
+ // //================= //------------鏈笅鍗� 澶т簬0 鏄剧ず绾㈣壊
+ // if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HSumUnDownQtyCol].Value) > 0)
+ // {
+ // grdMain.Rows[i].Cells[HSumUnDownQtyCol].Style.BackColor = Color.Red;
+ // }
+ //}
+
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, "", 0);
+ }
+ }
+
+
+
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+ //
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ //鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+ //瀹℃牳
+ private void sh_Click(object sender, EventArgs e)
+ {
+ this.Sub_CheckBill();
+ }
+
+ //瀹℃牳鍗曟嵁
+ private void Sub_CheckBill()
+ {
+
+ }
+ //鍙嶅鍗曟嵁
+ private void Sub_AbandonCheck()
+ {
+
+ }
+ //鍙嶅鏍�
+ private void qsh_Click(object sender, EventArgs e)
+ {
+ Sub_AbandonCheck();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(true);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("HMaterID"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!锛�" + e.Message);
+ }
+ }
+
+ #endregion
+ //
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount>0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+ //寮曞嚭EXCEL
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+ int HQty = 0;
+ private void timer3_Tick(object sender, EventArgs e)
+ {
+ if (HQty < 10)
+ {
+ HQty = HQty + 1;
+ }
+ else
+ {
+ HQty = 0;
+ timer1.Enabled = true;
+ }
+ //int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
+ }
+
+ private void toolStripButton1_Click(object sender, EventArgs e)
+ {
+ if (toolStripButton1.Text == "鏆傚仠")
+ {
+ toolStripButton1.Text = "杩愯";
+ timer2.Enabled = false;
+ }
+ else
+ {
+ toolStripButton1.Text = "鏆傚仠";
+ timer2.Enabled = true;
+ }
+ }
+
+ private void txtHMaterID_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ //Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ //oSZ.HName = this.Name;
+ //oSZ.ShowDialog();
+ timer1.Enabled = true;
+
+
+ Kanban_BaseSet oSZ = new Kanban_BaseSet();
+ oSZ.HName = this.Name;
+ oSZ.ShowDialog();
+ timer1.Enabled = true;
+ }
+
+ private void grdMain_Sorted(object sender, EventArgs e)
+ {
+ //-----------棰勮鐘舵��
+ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
+ //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
+ int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
+ int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
+ int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ DateTime oNow = DateTime.Today.Date;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HBDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Yellow;
+ }
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HStatusCol].Value) == "寰呯敓浜�")
+ {
+ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ }
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.designer.cs" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.designer.cs"
new file mode 100644
index 0000000..2d98fbe
--- /dev/null
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.designer.cs"
@@ -0,0 +1,286 @@
+锘縩amespace Kanban
+{
+ partial class Gy_WLKB
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_WLKB));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackColor = System.Drawing.Color.Black;
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tc,
+ this.toolStripButton1,
+ this.toolStripButton2,
+ this.toolStripSeparator3,
+ this.toolStripSeparator9,
+ this.toolStripSeparator7,
+ this.toolStripLabel1});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(906, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tc.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.tc.ForeColor = System.Drawing.Color.White;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(50, 47);
+ this.tc.Text = "<杩斿洖";
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.AutoSize = false;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton1.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(50, 47);
+ this.toolStripButton1.Text = "鏆傚仠";
+ this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // toolStripButton2
+ //
+ this.toolStripButton2.AutoSize = false;
+ this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripButton2.ForeColor = System.Drawing.Color.White;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(36, 47);
+ this.toolStripButton2.Text = "璁剧疆";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.toolStripLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripLabel1.Font = new System.Drawing.Font("Microsoft YaHei UI", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.toolStripLabel1.ForeColor = System.Drawing.Color.White;
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(92, 47);
+ this.toolStripLabel1.Text = "鐗╂枡鐪嬫澘";
+ this.toolStripLabel1.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 20000;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 8;
+ this.grdPrint.Visible = false;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(906, 19);
+ this.grdSum.TabIndex = 47;
+ this.grdSum.Visible = false;
+ //
+ // timer3
+ //
+ this.timer3.Enabled = true;
+ this.timer3.Interval = 1800000;
+ this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(97)))), ((int)(((byte)(118)))));
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.grdMain.BackgroundColor = System.Drawing.Color.Black;
+ this.grdMain.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(134)))), ((int)(((byte)(202)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.grdMain.ColumnHeadersHeight = 40;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.EnableHeadersVisualStyles = false;
+ this.grdMain.Location = new System.Drawing.Point(0, 50);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.CornflowerBlue;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.grdMain.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ this.grdMain.RowHeadersVisible = false;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(47)))));
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
+ this.grdMain.RowsDefaultCellStyle = dataGridViewCellStyle4;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.grdMain.Size = new System.Drawing.Size(906, 462);
+ this.grdMain.TabIndex = 48;
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Sorted += new System.EventHandler(this.grdMain_Sorted);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
+ //
+ // Gy_WLKB
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(906, 531);
+ this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Name = "Gy_WLKB";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "鍗曟嵁鍒楄〃";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Gy_WLKB_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.DataGridView grdMain;
+ }
+}
\ No newline at end of file
diff --git "a/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.resx" "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.resx"
new file mode 100644
index 0000000..de4031c
--- /dev/null
+++ "b/Kanban/\345\267\245\344\275\215\347\234\213\346\235\277/Gy_WLKB.resx"
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>191, 16</value>
+ </metadata>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>281, 16</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/NETERPNoWin/NETERPNoWin.csproj b/NETERPNoWin/NETERPNoWin.csproj
index e5ced92..85c4fab 100644
--- a/NETERPNoWin/NETERPNoWin.csproj
+++ b/NETERPNoWin/NETERPNoWin.csproj
@@ -15,9 +15,23 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <ApplicationRevision>0</ApplicationRevision>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -235,6 +249,13 @@
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/NETERPNoWin/NETERPNoWin.csproj.user b/NETERPNoWin/NETERPNoWin.csproj.user
index 0167e32..48918e7 100644
--- a/NETERPNoWin/NETERPNoWin.csproj.user
+++ b/NETERPNoWin/NETERPNoWin.csproj.user
@@ -11,5 +11,6 @@
</BootstrapperUrlHistory>
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>true</VerifyUploadedFiles>
+ <ErrorReportUrlHistory />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/NETERPNoWin/bin/Debug/HXERP.ini b/NETERPNoWin/bin/Debug/HXERP.ini
index b4a02fe..b6ac63e 100644
--- a/NETERPNoWin/bin/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/Debug/HXERP.ini
@@ -1,32 +1,38 @@
[po]
-Server=192.168.80.173
+Server=47.96.97.237,15127
[Erp]
-Server=192.168.80.173
-DataBase=HX_APSsys
-DataBaseNumber=
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-ERP供应商协同平台
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
-[ErpZL]
-Server=192.168.80.173
-DataBase=HX_APSsys
-DataBaseNumber=
+[Srm]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-ERP供应商协同平台
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[K3Erp]
-Server=192.168.80.173
-DataBase=AIS20090410141516
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
-Server=192.168.80.173
-DataBase=AIS20090410141516
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
-UserName=admin
-UserPsd=jinghuanzh
+UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章
+UserPsd=1
Remember=1
+[CLOUDINFO]
+
+sCLOUDUrl=http://47.96.97.237/k3cloud/
+sCLOUDAcc=6204a70eba35fc
+sCLOUDUseName=demo
+sCLOUDPsd=888888
diff --git a/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll b/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll
new file mode 100644
index 0000000..fbd0ebf
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll
new file mode 100644
index 0000000..f33f9ae
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
new file mode 100644
index 0000000..2746749
--- /dev/null
+++ 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
new file mode 100644
index 0000000..c4412c2
--- /dev/null
+++ 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
new file mode 100644
index 0000000..fd9f98b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3bd248d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..8e7d408
--- /dev/null
+++ 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
new file mode 100644
index 0000000..6d45edb
--- /dev/null
+++ 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
new file mode 100644
index 0000000..bd1fbdb
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ef476d0
--- /dev/null
+++ 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 98e9b54..7e96675 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
@@ -29,7 +29,7 @@
[OPenWin]
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
-gnmc=车间看板
+gnmc=物料看板
[Warehouse]
-HWhID=0
-HWhName=
+HWhID=101259
+HWhName=平板成品仓
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..a7d1d4f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..5008549
--- /dev/null
+++ 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
new file mode 100644
index 0000000..4044658
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini b/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
index b79b725..8d9b65c 100644
--- a/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
+++ b/NETERPNoWin/bin/x86/Debug/KanbanInfo.ini
@@ -223,6 +223,33 @@
Title-BackColor=
Title-PageRows=
Title-PageDownTimer=
+Title-DisplayTimer=1
+Header-ForeColor=
+Header-FontFamily=
+Header-FontSize=
+Header-FontStyle=
+Header-BackColor=
+Header-Alignment=
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
+[Sc_WGJCKKB]
+Title-Caption=
+Title-ForeColor=
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=
+Title-PageDownTimer=
Title-DisplayTimer=
Header-ForeColor=
Header-FontFamily=
@@ -241,3 +268,57 @@
Cell-RowHeight=
Cell-AlternatingBackColor=
Cell-DefaultBackColor=
+[Gy_WLKB]
+Title-Caption=物料看板
+Title-ForeColor=Lime
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=10
+Title-PageDownTimer=5
+Title-DisplayTimer=1
+Header-ForeColor=#FF0080
+Header-FontFamily=[FontFamily: Name=宋体]
+Header-FontSize=9
+Header-FontStyle=Regular
+Header-BackColor=Black
+Header-Alignment=居中
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=White
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=Black
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
+[Sc_CGKB]
+Title-Caption=
+Title-ForeColor=
+Title-FontFamily=
+Title-FontSize=
+Title-FontStyle=
+Title-BackColor=
+Title-PageRows=
+Title-PageDownTimer=
+Title-DisplayTimer=1
+Header-ForeColor=
+Header-FontFamily=
+Header-FontSize=
+Header-FontStyle=
+Header-BackColor=
+Header-Alignment=
+Header-RowHeight=
+Header-ColWidth=
+Cell-ForeColor=
+Cell-FontFamily=
+Cell-FontSize=
+Cell-FontStyle=
+Cell-BackColor=
+Cell-Alignment=
+Cell-RowHeight=
+Cell-AlternatingBackColor=
+Cell-DefaultBackColor=
diff --git a/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll b/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
new file mode 100644
index 0000000..25dd347
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll
new file mode 100644
index 0000000..154580d
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb
new file mode 100644
index 0000000..5eedfea
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/M2Mqtt.Net.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
new file mode 100644
index 0000000..b5b0f81
--- /dev/null
+++ 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
new file mode 100644
index 0000000..4c44891
--- /dev/null
+++ 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
new file mode 100644
index 0000000..a11b2c4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
new file mode 100644
index 0000000..51278a4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
new file mode 100644
index 0000000..67b1977
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll
new file mode 100644
index 0000000..a200471
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll
new file mode 100644
index 0000000..5034194
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll
new file mode 100644
index 0000000..df8708d
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.dll b/NETERPNoWin/bin/x86/Debug/NPOI.dll
new file mode 100644
index 0000000..907cfb1
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/NPOI.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll b/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll
new file mode 100644
index 0000000..341d08f
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
new file mode 100644
index 0000000..d4c7724
--- /dev/null
+++ 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
new file mode 100644
index 0000000..41606dc
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e89d7c5
--- /dev/null
+++ 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
new file mode 100644
index 0000000..4fe3580
--- /dev/null
+++ 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
new file mode 100644
index 0000000..551ad4d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..06a4d34
--- /dev/null
+++ 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
new file mode 100644
index 0000000..28e5cac
--- /dev/null
+++ 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
new file mode 100644
index 0000000..56424f0
--- /dev/null
+++ 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
new file mode 100644
index 0000000..81be5c4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..5120a5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..5038c94
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll.config b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
new file mode 100644
index 0000000..d9658be
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <configSections>
+ </configSections>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
new file mode 100644
index 0000000..50420b0
--- /dev/null
+++ 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
new file mode 100644
index 0000000..6eee90e
--- /dev/null
+++ 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
new file mode 100644
index 0000000..b5b7c01
--- /dev/null
+++ 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 8258182..383723f 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -54,7 +54,8 @@
Sc_WorkBillProcProdReportKB=193,556,523,112
Sc_HZQLCGKB=
frmDownMenu任务单设置=100,135,100
-Sc_CJKB=
+Sc_CJKB=100,100,100,100,100,100
Sc_CGKB=100,100,100,100,100,100,100,100,100,100,100
Sc_QLKB=100,100,100,100,100,100,100,100,100,100,100
Sc_WGJCKKB=
+Gy_WLKB=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,100,100,100,100,100,100,100,100,100,10,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,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/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index a994c19..3e1c065 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -272,3 +272,5 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
index 0453b8c..573e878 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
@@ -57,16 +57,17 @@
this.Sc_WorkBillProcTestReportKB = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.Sc_WGJCKKB = new System.Windows.Forms.Button();
+ this.Gy_WLKB = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// Sc_ICMOBillList_K3
//
this.Sc_ICMOBillList_K3.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_ICMOBillList_K3.Image = ((System.Drawing.Image)(resources.GetObject("Sc_ICMOBillList_K3.Image")));
- this.Sc_ICMOBillList_K3.Location = new System.Drawing.Point(202, 24);
- this.Sc_ICMOBillList_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_ICMOBillList_K3.Location = new System.Drawing.Point(135, 16);
this.Sc_ICMOBillList_K3.Name = "Sc_ICMOBillList_K3";
- this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(110, 110);
+ this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(73, 73);
this.Sc_ICMOBillList_K3.TabIndex = 1;
this.Sc_ICMOBillList_K3.Tag = "閲囪喘鐪嬫澘";
this.Sc_ICMOBillList_K3.UseVisualStyleBackColor = true;
@@ -76,10 +77,9 @@
//
this.Sc_MESBeginWorkBill_Fast.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_MESBeginWorkBill_Fast.Image = ((System.Drawing.Image)(resources.GetObject("Sc_MESBeginWorkBill_Fast.Image")));
- this.Sc_MESBeginWorkBill_Fast.Location = new System.Drawing.Point(698, 189);
- this.Sc_MESBeginWorkBill_Fast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_MESBeginWorkBill_Fast.Location = new System.Drawing.Point(465, 126);
this.Sc_MESBeginWorkBill_Fast.Name = "Sc_MESBeginWorkBill_Fast";
- this.Sc_MESBeginWorkBill_Fast.Size = new System.Drawing.Size(110, 110);
+ this.Sc_MESBeginWorkBill_Fast.Size = new System.Drawing.Size(73, 73);
this.Sc_MESBeginWorkBill_Fast.TabIndex = 7;
this.Sc_MESBeginWorkBill_Fast.Tag = "寮�宸ュ崟";
this.Sc_MESBeginWorkBill_Fast.UseVisualStyleBackColor = true;
@@ -89,10 +89,9 @@
//
this.Sc_ProcExchReport_Fast.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_ProcExchReport_Fast.Image = ((System.Drawing.Image)(resources.GetObject("Sc_ProcExchReport_Fast.Image")));
- this.Sc_ProcExchReport_Fast.Location = new System.Drawing.Point(949, 189);
- this.Sc_ProcExchReport_Fast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_ProcExchReport_Fast.Location = new System.Drawing.Point(633, 126);
this.Sc_ProcExchReport_Fast.Name = "Sc_ProcExchReport_Fast";
- this.Sc_ProcExchReport_Fast.Size = new System.Drawing.Size(110, 110);
+ this.Sc_ProcExchReport_Fast.Size = new System.Drawing.Size(73, 73);
this.Sc_ProcExchReport_Fast.TabIndex = 8;
this.Sc_ProcExchReport_Fast.Tag = "浜ч噺姹囨姤鍗�";
this.Sc_ProcExchReport_Fast.UseVisualStyleBackColor = true;
@@ -102,10 +101,9 @@
//
this.Sc_WorkBillPlanReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillPlanReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillPlanReportKB.Image")));
- this.Sc_WorkBillPlanReportKB.Location = new System.Drawing.Point(452, 24);
- this.Sc_WorkBillPlanReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillPlanReportKB.Location = new System.Drawing.Point(301, 16);
this.Sc_WorkBillPlanReportKB.Name = "Sc_WorkBillPlanReportKB";
- this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillPlanReportKB.TabIndex = 2;
this.Sc_WorkBillPlanReportKB.Tag = "杞﹂棿鐪嬫澘";
this.Sc_WorkBillPlanReportKB.UseVisualStyleBackColor = true;
@@ -115,10 +113,9 @@
//
this.Sc_WorkBillPlanSumReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillPlanSumReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillPlanSumReportKB.Image")));
- this.Sc_WorkBillPlanSumReportKB.Location = new System.Drawing.Point(698, 24);
- this.Sc_WorkBillPlanSumReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillPlanSumReportKB.Location = new System.Drawing.Point(465, 16);
this.Sc_WorkBillPlanSumReportKB.Name = "Sc_WorkBillPlanSumReportKB";
- this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillPlanSumReportKB.TabIndex = 3;
this.Sc_WorkBillPlanSumReportKB.Tag = "缂烘枡鐪嬫澘";
this.Sc_WorkBillPlanSumReportKB.UseVisualStyleBackColor = true;
@@ -136,10 +133,9 @@
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(187, 138);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(125, 92);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(137, 29);
+ this.label1.Size = new System.Drawing.Size(93, 19);
this.label1.TabIndex = 65;
this.label1.Text = "閲囪喘鐪嬫澘";
this.label1.Click += new System.EventHandler(this.label1_Click);
@@ -150,10 +146,9 @@
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(693, 308);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(462, 205);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(106, 29);
+ this.label2.Size = new System.Drawing.Size(72, 19);
this.label2.TabIndex = 66;
this.label2.Text = "寮�宸ュ崟";
//
@@ -163,10 +158,9 @@
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(926, 308);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(617, 205);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(168, 29);
+ this.label3.Size = new System.Drawing.Size(114, 19);
this.label3.TabIndex = 67;
this.label3.Text = "浜ч噺姹囨姤鍗�";
//
@@ -176,10 +170,9 @@
this.label6.BackColor = System.Drawing.Color.Transparent;
this.label6.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(447, 138);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(298, 92);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(137, 29);
+ this.label6.Size = new System.Drawing.Size(93, 19);
this.label6.TabIndex = 70;
this.label6.Text = "杞﹂棿鐪嬫澘";
this.label6.Click += new System.EventHandler(this.label6_Click);
@@ -190,10 +183,9 @@
this.label7.BackColor = System.Drawing.Color.Transparent;
this.label7.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(693, 138);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(462, 92);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(137, 29);
+ this.label7.Size = new System.Drawing.Size(93, 19);
this.label7.TabIndex = 71;
this.label7.Text = "缂烘枡鐪嬫澘";
this.label7.Click += new System.EventHandler(this.label7_Click);
@@ -204,10 +196,9 @@
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(935, 471);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(290, 420);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(137, 29);
+ this.label8.Size = new System.Drawing.Size(93, 19);
this.label8.TabIndex = 73;
this.label8.Text = "绯荤粺璁剧疆";
//
@@ -215,10 +206,9 @@
//
this.cmdSetKanbanIni.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdSetKanbanIni.Image = ((System.Drawing.Image)(resources.GetObject("cmdSetKanbanIni.Image")));
- this.cmdSetKanbanIni.Location = new System.Drawing.Point(951, 357);
- this.cmdSetKanbanIni.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdSetKanbanIni.Location = new System.Drawing.Point(302, 344);
this.cmdSetKanbanIni.Name = "cmdSetKanbanIni";
- this.cmdSetKanbanIni.Size = new System.Drawing.Size(110, 110);
+ this.cmdSetKanbanIni.Size = new System.Drawing.Size(73, 73);
this.cmdSetKanbanIni.TabIndex = 11;
this.cmdSetKanbanIni.Tag = "绯荤粺璁剧疆";
this.cmdSetKanbanIni.UseVisualStyleBackColor = true;
@@ -230,10 +220,9 @@
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(175, 308);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(117, 205);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(199, 29);
+ this.label9.Size = new System.Drawing.Size(135, 19);
this.label9.TabIndex = 75;
this.label9.Text = "鏈満缂烘枡鐪嬫澘";
//
@@ -241,10 +230,9 @@
//
this.Sc_BJQLFXB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_BJQLFXB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_BJQLFXB.Image")));
- this.Sc_BJQLFXB.Location = new System.Drawing.Point(202, 189);
- this.Sc_BJQLFXB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_BJQLFXB.Location = new System.Drawing.Point(135, 126);
this.Sc_BJQLFXB.Name = "Sc_BJQLFXB";
- this.Sc_BJQLFXB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_BJQLFXB.Size = new System.Drawing.Size(73, 73);
this.Sc_BJQLFXB.TabIndex = 5;
this.Sc_BJQLFXB.Tag = "鏈満缂烘枡鐪嬫澘";
this.Sc_BJQLFXB.UseVisualStyleBackColor = true;
@@ -256,10 +244,9 @@
this.label10.BackColor = System.Drawing.Color.Transparent;
this.label10.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(410, 308);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(273, 205);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(199, 29);
+ this.label10.Size = new System.Drawing.Size(135, 19);
this.label10.TabIndex = 77;
this.label10.Text = "缂烘枡姹囨�荤湅鏉�";
//
@@ -267,10 +254,9 @@
//
this.Sc_HZQLCGKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_HZQLCGKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_HZQLCGKB.Image")));
- this.Sc_HZQLCGKB.Location = new System.Drawing.Point(452, 189);
- this.Sc_HZQLCGKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_HZQLCGKB.Location = new System.Drawing.Point(301, 126);
this.Sc_HZQLCGKB.Name = "Sc_HZQLCGKB";
- this.Sc_HZQLCGKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_HZQLCGKB.Size = new System.Drawing.Size(73, 73);
this.Sc_HZQLCGKB.TabIndex = 6;
this.Sc_HZQLCGKB.Tag = "缂烘枡姹囨�荤湅鏉�";
this.Sc_HZQLCGKB.UseVisualStyleBackColor = true;
@@ -282,10 +268,9 @@
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(944, 138);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(629, 92);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(137, 29);
+ this.label11.Size = new System.Drawing.Size(93, 19);
this.label11.TabIndex = 79;
this.label11.Text = "鍙戣揣鐪嬫澘";
//
@@ -293,10 +278,9 @@
//
this.Sc_BRFHKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_BRFHKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_BRFHKB.Image")));
- this.Sc_BRFHKB.Location = new System.Drawing.Point(949, 24);
- this.Sc_BRFHKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_BRFHKB.Location = new System.Drawing.Point(633, 16);
this.Sc_BRFHKB.Name = "Sc_BRFHKB";
- this.Sc_BRFHKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_BRFHKB.Size = new System.Drawing.Size(73, 73);
this.Sc_BRFHKB.TabIndex = 4;
this.Sc_BRFHKB.Tag = "鍙戣揣鐪嬫澘";
this.Sc_BRFHKB.UseVisualStyleBackColor = true;
@@ -308,10 +292,9 @@
this.label12.BackColor = System.Drawing.Color.Transparent;
this.label12.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(187, 630);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(125, 420);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(137, 29);
+ this.label12.Size = new System.Drawing.Size(93, 19);
this.label12.TabIndex = 81;
this.label12.Text = "閫�鍑虹郴缁�";
//
@@ -319,10 +302,9 @@
//
this.cmdClose.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdClose.Image = ((System.Drawing.Image)(resources.GetObject("cmdClose.Image")));
- this.cmdClose.Location = new System.Drawing.Point(202, 516);
- this.cmdClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdClose.Location = new System.Drawing.Point(135, 344);
this.cmdClose.Name = "cmdClose";
- this.cmdClose.Size = new System.Drawing.Size(110, 110);
+ this.cmdClose.Size = new System.Drawing.Size(73, 73);
this.cmdClose.TabIndex = 12;
this.cmdClose.Tag = "閫�鍑虹郴缁�";
this.cmdClose.UseVisualStyleBackColor = true;
@@ -334,10 +316,9 @@
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(435, 471);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(290, 314);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(137, 29);
+ this.label13.Size = new System.Drawing.Size(93, 19);
this.label13.TabIndex = 85;
this.label13.Text = "閰嶆枡鐪嬫澘";
//
@@ -347,10 +328,9 @@
this.label14.BackColor = System.Drawing.Color.Transparent;
this.label14.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(156, 471);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(104, 314);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(199, 29);
+ this.label14.Size = new System.Drawing.Size(135, 19);
this.label14.TabIndex = 84;
this.label14.Text = "妫�娴嬭繘搴︾湅鏉�";
//
@@ -358,10 +338,9 @@
//
this.Sc_WorkBillProcMaterReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillProcMaterReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillProcMaterReportKB.Image")));
- this.Sc_WorkBillProcMaterReportKB.Location = new System.Drawing.Point(452, 357);
- this.Sc_WorkBillProcMaterReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillProcMaterReportKB.Location = new System.Drawing.Point(301, 238);
this.Sc_WorkBillProcMaterReportKB.Name = "Sc_WorkBillProcMaterReportKB";
- this.Sc_WorkBillProcMaterReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillProcMaterReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillProcMaterReportKB.TabIndex = 83;
this.Sc_WorkBillProcMaterReportKB.Tag = "閰嶆枡鐪嬫澘";
this.Sc_WorkBillProcMaterReportKB.UseVisualStyleBackColor = true;
@@ -371,10 +350,9 @@
//
this.Sc_WorkBillProcTestReportKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WorkBillProcTestReportKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WorkBillProcTestReportKB.Image")));
- this.Sc_WorkBillProcTestReportKB.Location = new System.Drawing.Point(202, 357);
- this.Sc_WorkBillProcTestReportKB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Sc_WorkBillProcTestReportKB.Location = new System.Drawing.Point(135, 238);
this.Sc_WorkBillProcTestReportKB.Name = "Sc_WorkBillProcTestReportKB";
- this.Sc_WorkBillProcTestReportKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WorkBillProcTestReportKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WorkBillProcTestReportKB.TabIndex = 82;
this.Sc_WorkBillProcTestReportKB.Tag = "妫�娴嬭繘搴︾湅鏉�";
this.Sc_WorkBillProcTestReportKB.UseVisualStyleBackColor = true;
@@ -386,10 +364,9 @@
this.label4.BackColor = System.Drawing.Color.Transparent;
this.label4.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(642, 471);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(428, 314);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(230, 29);
+ this.label4.Size = new System.Drawing.Size(156, 19);
this.label4.TabIndex = 87;
this.label4.Text = "澶栬喘浠朵粨搴撶湅鏉�";
//
@@ -397,22 +374,47 @@
//
this.Sc_WGJCKKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Sc_WGJCKKB.Image = ((System.Drawing.Image)(resources.GetObject("Sc_WGJCKKB.Image")));
- this.Sc_WGJCKKB.Location = new System.Drawing.Point(698, 357);
- this.Sc_WGJCKKB.Margin = new System.Windows.Forms.Padding(4);
+ this.Sc_WGJCKKB.Location = new System.Drawing.Point(465, 238);
this.Sc_WGJCKKB.Name = "Sc_WGJCKKB";
- this.Sc_WGJCKKB.Size = new System.Drawing.Size(110, 110);
+ this.Sc_WGJCKKB.Size = new System.Drawing.Size(73, 73);
this.Sc_WGJCKKB.TabIndex = 86;
this.Sc_WGJCKKB.Tag = "澶栬喘浠朵粨搴撶湅鏉�";
this.Sc_WGJCKKB.UseVisualStyleBackColor = true;
this.Sc_WGJCKKB.Click += new System.EventHandler(this.Sc_WGJCKKB_Click);
//
+ // Gy_WLKB
+ //
+ this.Gy_WLKB.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Gy_WLKB.Image = ((System.Drawing.Image)(resources.GetObject("Gy_WLKB.Image")));
+ this.Gy_WLKB.Location = new System.Drawing.Point(633, 238);
+ this.Gy_WLKB.Name = "Gy_WLKB";
+ this.Gy_WLKB.Size = new System.Drawing.Size(73, 73);
+ this.Gy_WLKB.TabIndex = 88;
+ this.Gy_WLKB.Tag = "鐗╂枡鐪嬫澘";
+ this.Gy_WLKB.UseVisualStyleBackColor = true;
+ this.Gy_WLKB.Click += new System.EventHandler(this.Gy_WLKB_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Font = new System.Drawing.Font("榛戜綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.ForeColor = System.Drawing.Color.Black;
+ this.label5.Location = new System.Drawing.Point(629, 314);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(93, 19);
+ this.label5.TabIndex = 89;
+ this.label5.Text = "鐗╂枡鐪嬫澘";
+ //
// MESMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
- this.ClientSize = new System.Drawing.Size(1257, 945);
+ this.ClientSize = new System.Drawing.Size(838, 630);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.Gy_WLKB);
this.Controls.Add(this.label4);
this.Controls.Add(this.Sc_WGJCKKB);
this.Controls.Add(this.label13);
@@ -440,7 +442,6 @@
this.Controls.Add(this.Sc_MESBeginWorkBill_Fast);
this.Controls.Add(this.Sc_ICMOBillList_K3);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MESMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "娆цMES绯荤粺";
@@ -478,5 +479,7 @@
private System.Windows.Forms.Button Sc_WorkBillProcTestReportKB;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button Sc_WGJCKKB;
+ private System.Windows.Forms.Button Gy_WLKB;
+ private System.Windows.Forms.Label label5;
}
}
\ No newline at end of file
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
index b3df017..b7d25ef 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.cs"
@@ -211,5 +211,11 @@
Kanban.Sc_WGJCKKB oSc_WGJCKKB = new Kanban.Sc_WGJCKKB();
oSc_WGJCKKB.ShowDialog();
}
+
+ private void Gy_WLKB_Click(object sender, EventArgs e)
+ {
+ Kanban.Gy_WLKB oGy_WLKB = new Kanban.Gy_WLKB();
+ oGy_WLKB.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx" "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx"
index 0da595b..fd7201c 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.resx"
@@ -1470,6 +1470,94 @@
iP8AmuaVyJbr4RsAAAAASUVORK5CYII=
</value>
</data>
+ <data name="Gy_WLKB.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ iP8AmuaVyJbr4RsAAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>45</value>
</metadata>
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index df7dc2d..bf531f7 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,10 +3,10 @@
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c5a3eeb..f1a6fdb 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 8313a7a..5c659f3 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 87b3842..5d50c67 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 8313a7a..5c659f3 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 87b3842..5d50c67 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1