From acb7c8de21c66ded398cc52a9e6be712b85d50e8 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 28 七月 2022 10:02:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/公用/MESMain.Designer.cs | 6
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
WarM/条码打印/Sc_ICMOToBarCode.cs | 122 ++
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 46
Kanban/Sc_CJKB.cs | 71
WebAPI/Controllers/工资管理/Pay_PieceRateWageReportController.cs | 104 ++
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
WarM/WarM.csproj.user | 2
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
WebAPI/Controllers/工资管理/Pay_MonthlySalaryReportController.cs | 103 ++
WarM/条码打印/Gy_BarCodeBill.resx | 20
NETERPNoWin/bin/x86/Debug/HXERP_OLD.ini | 28
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
LMES/bin/x86/Debug.rar | 0
WebAPI/Models/基础资料/Gy_Process.cs | 1
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
Model/基础资料/基础资料/ClsGy_FactoryDayOff_Model.cs | 13
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 10
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
DAL/DAL.csproj | 2
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
WarM/条码打印/Gy_BarCodeBill.designer.cs | 2
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
WebAPI/WebAPI.csproj | 3
NETERPNoWin/bin/x86/Debug/grdWidth.wyini | 1
.gitignore | 3
LMES/ClsShowMod.cs | 8
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
Model/Model.csproj | 1
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
DAL/基础资料/公用基础资料/ClsGy_FactoryDayOff_Ctl.cs | 99 +
DAL/基础资料/公用基础资料/ClsGy_FactoryDayOff_View.cs | 89 +
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 | 2
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 | 1
WebAPI/Web.config | 6
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
Kanban/Sc_QLKB.cs | 46
NETERPNoWin/Frm_MESSetIni.cs | 12
WarM/WarM.csproj | 3
WebAPI/Models/动态列/OptionListModel.cs | 16
BaseSet/BaseSet.csproj | 10
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.cs | 667 +++++++++++++
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.designer.cs | 772 +++++++++++++++
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 107 ++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0
/dev/null | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/HXERP.ini | 40
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.resx | 573 +++++++++++
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
74 files changed, 2,911 insertions(+), 122 deletions(-)
diff --git a/.gitignore b/.gitignore
index b399be1..60fedd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,4 +131,5 @@
/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.AssemblyReference.cache
/NETERPNoWin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
/NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
-/WebAPI
+/NETERPNoWin/bin/Debug
+/NETERPNoWin/obj/Debug
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 239fba4..5ba733e 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -195,6 +195,12 @@
<Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConveyComp.designer.cs">
<DependentUpon>Gy_ConveyComp.cs</DependentUpon>
</Compile>
+ <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.designer.cs">
+ <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon>
+ </Compile>
<Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.cs">
<SubType>Form</SubType>
</Compile>
@@ -1646,6 +1652,10 @@
<DependentUpon>Gy_ConveyComp.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.resx">
+ <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.resx">
<DependentUpon>Gy_EntryComp.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs"
new file mode 100644
index 0000000..ea38dbe
--- /dev/null
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.cs"
@@ -0,0 +1,667 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DBUtility;
+using gregn6Lib;
+using System.Threading;
+
+namespace BaseSet
+{
+ public partial class Gy_FactoryDayOff : Form
+ {
+ private int HItemIDCol = 0;
+ private int HNumberCol = 0;
+ public DBUtility.frm_B_BillQueryCondition_New frmCondition;
+ public const string ViewName = "h_v_Gy_FactoryDayOffList";
+ public string CheckProcName = "h_p_Gy_CheckUseDept"; //20141020
+ public string ModName = "鍘備紤";
+ public const string BillName = "Gy_FactoryDayOff";
+ public const string ModRightNameEdit = BillName + "_Edit";
+ public const string ModRightNameDelete = BillName + "_Delete";
+ public DBUtility.ClsPub.Enum_InputMode InputMode; //褰曞叆鐘舵�佹爣蹇�(0-闈炲綍鍏ョ姸鎬� 1-澧炲姞 2-淇敼)
+ public long HItemID;//椤圭洰ID
+ public string sCondition; //杩囨护鏉′欢
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DAL.ClsGy_FactoryDayOff_Ctl oFdo = new DAL.ClsGy_FactoryDayOff_Ctl();
+ DAL.ClsGy_FactoryDayOff_View oFdoHlp = new DAL.ClsGy_FactoryDayOff_View();
+ TreeNode CurNode = new TreeNode();
+ public Gy_FactoryDayOff()
+ {
+ InitializeComponent();
+ }
+ //浠ヤ笅浠ｇ爜鍩烘湰涓嶉渶瑕佷慨鏀�
+ #region 鍥哄畾浠ｇ爜
+ //淇濆瓨GRID鍒楀
+ private void Gy_FactoryDayOff_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ DBUtility.ClsPub.SaveGridView(grdMain, this.Name, DBUtility.ClsPub.AppPath);
+ }
+ //绐椾綋鍔犺浇
+ private void Gy_FactoryDayOff_Load(object sender, EventArgs e)
+ {
+ frmCondition = new DBUtility.frm_B_BillQueryCondition_New();
+ LoadTree();
+ initGrid();
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_View;
+ RefreshTool();
+ }
+ private void LoadAllNodes(TreeNode sNode) //Lock
+ {
+ DBUtility.Gy_BaseFun.LoadAllNodes(sNode, BillName);
+ }
+ private void LoadTree()//Lock
+ {
+ DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
+ }
+
+ //鏂板
+ private void AddNew()
+ {
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew;
+ Init();
+ }
+ //閫�鍑烘ā鍧�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ //鍒锋柊
+ private void xs_Click(object sender, EventArgs e)
+ {
+ Display();
+ }
+ //鏌ヨ
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new DBUtility.frm_B_BillQueryCondition_New();
+ DBUtility.Gy_BaseFun.SetCondition(frmCondition ,ViewName, this.Name );
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+ private Int32 Fun_GetCol(string sCol)//Lock
+ {
+ return DBUtility.Gy_BaseFun.Fun_GetCol(sCol, grdMain);
+ }
+ //鍒锋柊TOOLBAR
+ private void RefreshTool()//Lock
+ {
+ if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_View)
+ {
+ stTab.SelectedIndex = 0;
+ stTab.TabPages.Remove(this.tabPage2);
+ stTab.TabPages.Remove(this.tabPage1);
+ stTab.TabPages.Add(this.tabPage1);
+ grdMain.Enabled = true;
+ tc.Enabled = true;
+ yl.Enabled = true;
+ xz.Enabled = true;
+ xg.Enabled = true;
+ sc.Enabled = true;
+ xs.Enabled = true;
+ cx.Enabled = true;
+ fz.Enabled = false;
+ }
+ else
+ {
+ stTab.SelectedIndex = 1;
+ stTab.TabPages.Remove(this.tabPage1);
+ stTab.TabPages.Remove(this.tabPage2);
+ stTab.TabPages.Add(this.tabPage2);
+ stTab.TabPages[0].Hide();
+ grdMain.Enabled = false;
+ tc.Enabled = true;
+ yl.Enabled = false;
+ xz.Enabled = false;
+ xg.Enabled = false;
+ sc.Enabled = false;
+ xs.Enabled = false;
+ cx.Enabled = false;
+ fz.Enabled = true;
+ }
+ }
+ //鍒犻櫎椤圭洰
+ public void Delete()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ //
+ if (DBUtility.Gy_BaseFun.AllowRow(grdMain))
+ {
+ if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶉」鐩紵", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ //寰楀埌HITEMID
+ long sItemID;
+ sItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[HItemIDCol].Value);
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oFdoHlp.GetInfoByID(sItemID))
+ {
+ if (oFdo.HavChildCodes(sItemID))
+ {
+ MessageBox.Show("姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒", "鎻愮ず");
+ return;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oFdoHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ MessageBox.Show("姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�", "鎻愮ず");
+ return;
+ }
+ //
+ if (oFdo.DeleteByID(sItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oFdoHlp.omodel.HNumber + ",鍚嶇О锛�" + oFdoHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ MessageBox.Show("鍒犻櫎椤圭洰鎴愬姛锛�", "鎻愮ず");
+ Display();
+ }
+ else
+ MessageBox.Show("鍒犻櫎椤圭洰澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ }
+
+ }
+ }
+ //鍙栨秷鎸夐挳
+ private void cmdCancel_Click(object sender, EventArgs e)
+ {
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_View;
+ RefreshTool();
+ }
+ //淇濆瓨鎸夐挳
+ private void cmdOK_Click(object sender, EventArgs e)
+ {
+ if (!WriteClass())
+ return;
+ if (Save())
+ {
+ MessageBox.Show("淇濆瓨瀹屾瘯锛�", "鎻愮ず");
+ }
+ else
+ {
+ MessageBox.Show("淇濆瓨澶辫触锛佸師鍥狅細" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ }
+ if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_Modify)
+ {
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_View;
+ RefreshTool();
+ }
+ }
+ //鏍戝瀷 鍗曞嚮
+ private void tv_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
+ {
+ CurNode = e.Node;
+ if (CurNode != null)
+ {
+ if (CurNode.Nodes.Count == 0)
+ LoadAllNodes(CurNode);
+ //鎵惧埌閫変腑缁撶偣
+ FindRow(CurNode.Text);
+ }
+ }
+ //杩囨护璧勬枡
+ private void FindRow(string sCode)//Lock
+ {
+ DBUtility.Gy_BaseFun.FindRow(sCode, ModName, ref sCondition);
+ Display();
+ }
+ //鍒犻櫎
+ private void sc_Click(object sender, EventArgs e)
+ {
+ Delete();
+ }
+ //鏂板鎸夐挳
+ private void xz_Click(object sender, EventArgs e)
+ {
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew;
+ label3.Text = "閮ㄩ棬璧勬枡-姝ｅ湪鏂板";
+ Init();
+ }
+ //淇敼
+ private void Modify()
+ {
+ if (DBUtility.Gy_BaseFun.AllowRow(grdMain))
+ {
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_Modify;
+ RefreshTool();
+ Init();
+ }
+ }
+ //淇敼鎸夐挳
+ private void xg_Click(object sender, EventArgs e)
+ {
+ Modify();
+ label3.Text = "閮ㄩ棬璧勬枡-姝ｅ湪淇敼";
+ }
+
+
+ //
+ private void Sub_Copy()
+ {
+ txtHNumber.Text = "";
+ txtHHelpCode.Text = "";
+ HItemID = 0;
+ InputMode = DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew;
+ }
+ //鍒濆鍖栫晫闈�
+ private bool Init()
+ {
+ long sItemID;
+ if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew)
+ {
+ Sub_Clear();
+ RefreshTool();
+ return true;
+ }
+ else
+ {
+ //寰楀埌HITEMID
+ sItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[HItemIDCol].Value);
+ //妫�鏌ユ槸鍚﹀瓨鍦�
+ if (oFdoHlp.GetInfoByID(sItemID))
+ {
+ ShowData(sItemID);
+ //txtHNumber.Focus();
+ return true;
+ }
+ else
+ {
+ MessageBox.Show("鎮ㄩ�夋嫨鐨勯」鐩凡缁忎笉瀛樺湪锛�" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return false;
+ }
+ }
+ }
+ //淇濆瓨
+ private bool Save()
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return false;
+ }
+ //
+ if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew)
+ {
+ if (oFdo.AddNew())
+ {
+ Init();
+ }
+ else
+ {
+ return false;
+ }
+ Display();
+ }
+ if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_Modify)
+ {
+ if (!oFdo.ModifyByID(HItemID))
+ {
+ return false;
+ }
+ Display();
+ }
+ return true;
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.ClsPub.SaveGridView(grdMain, this.Name, DBUtility.ClsPub.AppPath);
+ }
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)//Lock
+ {
+ DBUtility.ClsPub.DefaultGridView(grdMain);
+ //鍙傛暟瑙ｉ噴 寮�濮嬪垪 锛岀粨鏉熷垪锛屾槸鍚︿互鏈�澶у垪瀹戒负鍑嗭紝鏈�灏忓垪瀹�
+ DBUtility.ClsPub.SaveGridView(grdMain, this.Name, DBUtility.ClsPub.AppPath);
+ }
+ //鏃堕棿鎺т欢
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ Display();
+ }
+ //鍙屽嚮GRID
+ private void grdMain_DblClick(object sender, EventArgs e)
+ {
+ Modify();
+ }
+ //鍒濆鍖朑RID
+ private void initGrid()
+ {
+ DBUtility.Gy_BaseFun.initGrid(grdMain);
+ }
+ //鏄剧ず鍒楄〃
+ private void Display() // 骞诲績
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ DataSet DSet;
+ string sSql = "";
+ string sWhere = "";
+ //鍒锋柊鏍戝舰
+ //LoadTree();
+ //杩囨护鏉′欢
+ if (DBUtility.ClsPub.isStrNull(sCondition) == "" && frmCondition.SqlStr.Trim().Length != 0)
+ {
+ sSql = frmCondition.SqlStr + sWhere + " order by " + ModName + "浠ｇ爜";
+ }
+ else if (DBUtility.ClsPub.isStrNull(sCondition) != "")
+ {
+ sSql = "Select * from " + ViewName + sCondition + sWhere + " order by " + ModName + "浠ｇ爜";
+ }
+ else
+ {
+ sSql = "Select * from " + ViewName + " order by " + ModName + "浠ｇ爜";
+ }
+ //鎵цSQL
+ DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ if (DSet == null)
+ {
+ MessageBox.Show("鏄剧ず澶辫触锛佸師鍥狅細" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //绂佺敤 绾㈣壊鏄剧ず 20141020
+ Sub_ShowStopFlag();
+ //鍔犺浇鍒楀
+ DBUtility.Gy_BaseFun.DisplayGrid(grdMain, this.Name);
+ //
+ HItemIDCol = Fun_GetCol("HItemID");
+ //HNumberCol = Fun_GetCol(ModName + "浠ｇ爜");
+ sCondition = "";
+ }
+ //澶嶅埗鎸夐挳
+ private void fz_Click(object sender, EventArgs e)
+ {
+ Sub_Copy();
+ }
+ //鏂板鏃舵竻绌轰俊鎭�
+ private void Sub_Clear() //Lock
+ {
+ DBUtility.Gy_BaseFun.Sub_Clear(tabPage2,ref HItemID, txtHNumber);
+ }
+
+ private void grdMain_DoubleClick(object sender, EventArgs e)
+ {
+ Modify();
+ }
+
+ private void cmdLoadTree_Click(object sender, EventArgs e)
+ {
+ LoadTree();
+ }
+
+ #endregion
+
+ #region 绫荤殑璇诲啓
+
+ private bool AllowSave()
+ {
+ //if (txtHNumber.Text.Trim() == "")
+ //{
+ // MessageBox.Show("浠ｇ爜涓嶈兘涓虹┖!", "鎻愮ず");
+ // return false;
+ //}
+ //if (txtHName.Text.Trim() == "")
+ //{
+ // MessageBox.Show("鍚嶇О涓嶈兘涓虹┖!", "鎻愮ず");
+ // return false;
+ //}
+ //if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0)
+ //{
+ // MessageBox.Show("璐熻矗浜轰笉鑳戒负绌�!", "鎻愮ず");
+ // return false;
+ //}
+ //瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ //if (!DBUtility.ClsPub.AllowNumber(txtHNumber.Text.Trim()))
+ //{
+ // MessageBox.Show("浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒", "鎻愮ず");
+ // return false;
+ //}
+
+ ////鏄惁閲嶅浠ｇ爜
+ //if (oFdo.HavSameNumber(HItemID, txtHNumber.Text.Trim()))
+ //{
+ // MessageBox.Show("浠ｇ爜閲嶅锛�", "鎻愮ず");
+ // return false;
+ //}
+ return true;
+ }
+
+ //璇诲彇绫� 鍒� 鎺т欢
+ private void ShowData(long sItemID)
+ {
+ DAL.ClsGy_Employee_View oEmp = new DAL.ClsGy_Employee_View();
+ //if (oFdoHlp.GetInfoByID(sItemID))
+ //{
+ // txtHNumber.Text = oFdoHlp.omodel.HNumber.ToString();
+ // txtHHelpCode.Text = oFdoHlp.omodel.HHelpCode.ToString();
+ // txtHName.Text = oFdoHlp.omodel.HName.ToString();
+ // txtHEmpID.Tag = Convert.ToInt64(oFdoHlp.omodel.HEmpID.ToString());
+ // if (oEmp.GetInfoByID(oFdoHlp.omodel.HEmpID))
+ // {
+ // txtHEmpID.Text = oEmp.omodel.HName;
+ // txtHEmpID.Tag = oEmp.omodel.HItemID.ToString();
+ // }
+ // else
+ // {
+ // txtHEmpID.Text = "";
+ // }
+ // txtHNumber.Text = oFdoHlp.omodel.HNumber.ToString();
+ // txtHRemark.Text = oFdoHlp.omodel.HRemark;
+ // txtHBarCode.Text = oFdoHlp.omodel.HBarCode;
+ // if (oFdoHlp.omodel.HStopflag)
+ // chkHStopflag.Checked = true;
+ // else
+ // chkHStopflag.Checked = false;
+ // HItemID = oFdoHlp.omodel.HItemID;
+ //}
+ }
+ //鍐欏叆绫� 浠庢帶浠�
+ private bool WriteClass()
+ {
+ //鍒ゆ柇鏄惁鍏佽 淇濆瓨
+ if (!AllowSave())
+ {
+ return false;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(txtHNumber.Text.Trim());
+ if (sParent.Trim() == "")
+ {
+ oFdo.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oFdo.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oFdo.oModel.HParentID = oFdo.oModel.HItemID;
+ }
+ else
+ {
+ MessageBox.Show("涓婄骇浠ｇ爜涓嶅瓨鍦ㄦ垨琚鐢紒", "鎻愮ず");
+ return false;
+ }
+ }
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(txtHNumber.Text.Trim());
+ //if (sShortNumber.Trim() == "")
+ //{
+ // return false;
+ //}
+ //淇濆瓨鍘熶唬鐮�
+ if (oFdoHlp.GetInfoByID(HItemID))
+ {
+ oFdo.HOldNumber = oFdoHlp.omodel.HNumber;
+ //鏄惁鏂颁唬鐮佹槸鑷繁瀛愰」鐩殑銆�瀛愰」鐩�
+ if (sParent.Length >= oFdo.HOldNumber.Length)
+ {
+ if (sParent.Substring(0, oFdo.HOldNumber.ToString().Length) == oFdo.HOldNumber.Trim())
+ {
+ MessageBox.Show("鏂颁唬鐮佷笉鑳芥槸鑷繁鐨勪笅绾х殑瀛愰」鐩紒", "鎻愮ず");
+ return false;
+ }
+ }
+ }
+ else
+ {
+ oFdo.HOldNumber = "";
+ }
+ //鍐欏叆淇℃伅
+ oFdo.oModel.HShortNumber = sShortNumber;
+ oFdo.oModel.HEndFlag = true;
+ oFdo.oModel.HLevel = DBUtility.ClsPub.GetLevel(txtHNumber.Text.Trim());
+ oFdo.oModel.HNumber = txtHNumber.Text.Trim();
+ oFdo.oModel.HHelpCode = txtHHelpCode.Text.Trim();
+ oFdo.oModel.HName = txtHName.Text.Trim();
+ oFdo.oModel.HStopflag = chkHStopflag.Checked;
+ oFdo.oModel.HRemark = txtHRemark.Text.Trim();
+ oFdo.oModel.HFactoryDayOffDate = dtpHFactoryDayOffDate.Value;
+ oFdo.oModel.HNoFactoryDayOffDate = dtpHNoFactoryDayOffDate.Value;
+ return true;
+ }
+ #endregion
+
+
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+
+ //棰勮
+ int CurRows = 0;
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModName;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ grdMain.Rows[i].Cells[0].Value = "";
+ }
+ for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+ {
+ grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//your report?kao
+ {
+ try
+ {
+ //Report.FieldByName("閮ㄩ棬浠ｇ爜").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("閮ㄩ棬浠ｇ爜")].Value.ToString();
+ //Report.FieldByName("閮ㄩ棬鍚嶇О").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("閮ㄩ棬鍚嶇О")].Value.ToString();
+ //Report.FieldByName("鏉＄爜缂栧彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("HItemID")].Value.ToString();
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdMain, ds, Fun_GetCol("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModName;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+
+ #region 鐣岄潰鎺т欢澶勭悊
+
+
+
+ private void cmdHEmpID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Employee_View oEmp = new DAL.ClsGy_Employee_View();
+ if (oEmp.RefreshView())
+ {
+ this.txtHEmpID.Text = oEmp.oModel.HName;
+ this.txtHEmpID.Tag = oEmp.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHEmpID.Text = "";
+ }
+ }
+
+ private void txtHEmpID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHEmpID.Text.Length == 0)
+ {
+ txtHEmpID.Tag = "0";
+ }
+ }
+ #endregion
+
+ //妫�娴嬫寜閽� 20141020
+ private void jc_Click(object sender, EventArgs e)
+ {
+ BLL.ClsPub_BLL.Sub_CheckUseStatus(grdMain, HItemIDCol, CheckProcName);
+ Display();
+ }
+
+
+ //绂佺敤椤圭洰 绾㈣壊瀛椾綋 20141020
+ public void Sub_ShowStopFlag()
+ {
+ BLL.ClsPub_BLL.Sub_ShowStopFlag(grdMain, Fun_GetCol("绂佺敤鏍囪"));
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs"
new file mode 100644
index 0000000..106cc94
--- /dev/null
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.designer.cs"
@@ -0,0 +1,772 @@
+锘縩amespace BaseSet
+{
+ partial class Gy_FactoryDayOff
+ {
+ /// <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_FactoryDayOff));
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
+ this.ToolBar = new System.Windows.Forms.ToolStrip();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.cx = new System.Windows.Forms.ToolStripButton();
+ this.xz = new System.Windows.Forms.ToolStripButton();
+ this.xg = new System.Windows.Forms.ToolStripButton();
+ this.sc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.xs = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.fz = new System.Windows.Forms.ToolStripButton();
+ this.jc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+ this.stTab = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txtHBarCode = new System.Windows.Forms.TextBox();
+ this.cmdHEmpID = new System.Windows.Forms.Button();
+ this.label28 = new System.Windows.Forms.Label();
+ this.txtHEmpID = new System.Windows.Forms.TextBox();
+ this.txtHName = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.cmdCancel = new System.Windows.Forms.Button();
+ this.cmdOK = new System.Windows.Forms.Button();
+ this.chkHStopflag = new System.Windows.Forms.CheckBox();
+ this.txtHRemark = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtHHelpCode = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtHNumber = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.tv = new System.Windows.Forms.TreeView();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.cmdLoadTree = new System.Windows.Forms.Button();
+ this.label3 = new System.Windows.Forms.Label();
+ this.dtpHFactoryDayOffDate = new System.Windows.Forms.DateTimePicker();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.dtpHNoFactoryDayOffDate = new System.Windows.Forms.DateTimePicker();
+ this.ToolBar.SuspendLayout();
+ this.stTab.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // ToolBar
+ //
+ this.ToolBar.AutoSize = false;
+ this.ToolBar.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ToolBar.BackgroundImage")));
+ this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dy,
+ this.yl,
+ this.toolStripSeparator4,
+ this.cx,
+ this.xz,
+ this.xg,
+ this.sc,
+ this.toolStripSeparator2,
+ this.xs,
+ this.toolStripSeparator1,
+ this.fz,
+ this.jc,
+ this.toolStripSeparator3,
+ this.toolStripSeparator8,
+ this.mrlk,
+ this.toolStripSeparator7,
+ this.bclk,
+ this.toolStripSeparator9,
+ this.tc,
+ this.toolStripSeparator5});
+ this.ToolBar.Location = new System.Drawing.Point(0, 0);
+ this.ToolBar.Name = "ToolBar";
+ this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
+ this.ToolBar.Size = new System.Drawing.Size(877, 50);
+ this.ToolBar.Stretch = true;
+ this.ToolBar.TabIndex = 13;
+ this.ToolBar.Text = "toolStrip1";
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(35, 47);
+ this.dy.Text = "鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Click += new System.EventHandler(this.dy_Click);
+ //
+ // yl
+ //
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 47);
+ this.yl.Text = "棰勮";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Click += new System.EventHandler(this.yl_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ //
+ // cx
+ //
+ this.cx.AutoSize = false;
+ this.cx.Image = ((System.Drawing.Image)(resources.GetObject("cx.Image")));
+ this.cx.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cx.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.cx.ImageTransparentColor = System.Drawing.Color.White;
+ this.cx.Name = "cx";
+ this.cx.Size = new System.Drawing.Size(35, 47);
+ this.cx.Text = "鏌ヨ";
+ this.cx.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.cx.Click += new System.EventHandler(this.cx_Click);
+ //
+ // xz
+ //
+ this.xz.AutoSize = false;
+ this.xz.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
+ this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xz.ImageTransparentColor = System.Drawing.Color.White;
+ this.xz.Name = "xz";
+ this.xz.Size = new System.Drawing.Size(35, 47);
+ this.xz.Text = "鏂板";
+ this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xz.Click += new System.EventHandler(this.xz_Click);
+ //
+ // xg
+ //
+ this.xg.AutoSize = false;
+ this.xg.Image = ((System.Drawing.Image)(resources.GetObject("xg.Image")));
+ this.xg.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xg.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xg.ImageTransparentColor = System.Drawing.Color.White;
+ this.xg.Name = "xg";
+ this.xg.Size = new System.Drawing.Size(35, 47);
+ this.xg.Text = "淇敼";
+ this.xg.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xg.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xg.Visible = false;
+ this.xg.Click += new System.EventHandler(this.xg_Click);
+ //
+ // sc
+ //
+ this.sc.AutoSize = false;
+ this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
+ this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sc.ImageTransparentColor = System.Drawing.Color.White;
+ this.sc.Name = "sc";
+ this.sc.Size = new System.Drawing.Size(35, 47);
+ this.sc.Text = "鍒犻櫎";
+ this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sc.Visible = false;
+ this.sc.Click += new System.EventHandler(this.sc_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Visible = false;
+ //
+ // xs
+ //
+ this.xs.AutoSize = false;
+ this.xs.Image = ((System.Drawing.Image)(resources.GetObject("xs.Image")));
+ this.xs.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xs.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.xs.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.xs.Name = "xs";
+ this.xs.Size = new System.Drawing.Size(35, 47);
+ this.xs.Text = "鍒锋柊";
+ this.xs.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.xs.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.xs.Click += new System.EventHandler(this.xs_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ //
+ // fz
+ //
+ this.fz.AutoSize = false;
+ this.fz.Image = ((System.Drawing.Image)(resources.GetObject("fz.Image")));
+ this.fz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fz.ImageTransparentColor = System.Drawing.Color.White;
+ this.fz.Name = "fz";
+ this.fz.Size = new System.Drawing.Size(35, 47);
+ this.fz.Text = "澶嶅埗";
+ this.fz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fz.Visible = false;
+ this.fz.Click += new System.EventHandler(this.fz_Click);
+ //
+ // jc
+ //
+ this.jc.AutoSize = false;
+ this.jc.Image = ((System.Drawing.Image)(resources.GetObject("jc.Image")));
+ this.jc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.jc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.jc.ImageTransparentColor = System.Drawing.Color.White;
+ this.jc.Name = "jc";
+ this.jc.Size = new System.Drawing.Size(35, 47);
+ this.jc.Text = "妫�娴�";
+ this.jc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.jc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.jc.Visible = false;
+ this.jc.Click += new System.EventHandler(this.jc_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Visible = false;
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ //
+ // mrlk
+ //
+ this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+ this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
+ this.mrlk.Name = "mrlk";
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Text = "榛樿鍒楀";
+ this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mrlk.Click += new System.EventHandler(this.mrlk_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // bclk
+ //
+ this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+ this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bclk.ImageTransparentColor = System.Drawing.Color.White;
+ this.bclk.Name = "bclk";
+ this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Text = "淇濆瓨鍒楀";
+ this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bclk.Click += new System.EventHandler(this.bclk_Click);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ 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(35, 47);
+ this.tc.Text = "閫�鍑�";
+ this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ //
+ // imageList1
+ //
+ this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+ this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList1.Images.SetKeyName(0, "鏂囦欢澶�.bmp");
+ this.imageList1.Images.SetKeyName(1, "鏂囦欢澶�2.bmp");
+ //
+ // stTab
+ //
+ this.stTab.Controls.Add(this.tabPage1);
+ this.stTab.Controls.Add(this.tabPage2);
+ this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.stTab.Location = new System.Drawing.Point(0, 0);
+ this.stTab.Name = "stTab";
+ this.stTab.SelectedIndex = 0;
+ this.stTab.Size = new System.Drawing.Size(735, 495);
+ this.stTab.TabIndex = 15;
+ //
+ // tabPage1
+ //
+ this.tabPage1.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(727, 469);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鍒楄〃瑙嗗浘";
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.Color.White;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersVisible = false;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(719, 461);
+ this.grdMain.TabIndex = 0;
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
+ //
+ // tabPage2
+ //
+ this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.label8);
+ this.tabPage2.Controls.Add(this.dtpHNoFactoryDayOffDate);
+ this.tabPage2.Controls.Add(this.label7);
+ this.tabPage2.Controls.Add(this.dtpHFactoryDayOffDate);
+ this.tabPage2.Controls.Add(this.label6);
+ this.tabPage2.Controls.Add(this.txtHBarCode);
+ this.tabPage2.Controls.Add(this.cmdHEmpID);
+ this.tabPage2.Controls.Add(this.label28);
+ this.tabPage2.Controls.Add(this.txtHEmpID);
+ this.tabPage2.Controls.Add(this.txtHName);
+ this.tabPage2.Controls.Add(this.label4);
+ this.tabPage2.Controls.Add(this.cmdCancel);
+ this.tabPage2.Controls.Add(this.cmdOK);
+ this.tabPage2.Controls.Add(this.chkHStopflag);
+ this.tabPage2.Controls.Add(this.txtHRemark);
+ this.tabPage2.Controls.Add(this.label5);
+ this.tabPage2.Controls.Add(this.txtHHelpCode);
+ this.tabPage2.Controls.Add(this.label2);
+ this.tabPage2.Controls.Add(this.txtHNumber);
+ this.tabPage2.Controls.Add(this.label1);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(727, 469);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(29, 114);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.TabIndex = 195;
+ this.label6.Text = "鏉� 褰� 鐮�";
+ //
+ // txtHBarCode
+ //
+ this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBarCode.Location = new System.Drawing.Point(88, 111);
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(143, 21);
+ this.txtHBarCode.TabIndex = 194;
+ //
+ // cmdHEmpID
+ //
+ this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
+ this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHEmpID.Location = new System.Drawing.Point(226, 135);
+ this.cmdHEmpID.Name = "cmdHEmpID";
+ this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHEmpID.TabIndex = 193;
+ this.cmdHEmpID.UseVisualStyleBackColor = false;
+ this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
+ //
+ // label28
+ //
+ this.label28.AutoSize = true;
+ this.label28.ForeColor = System.Drawing.Color.Black;
+ this.label28.Location = new System.Drawing.Point(29, 139);
+ this.label28.Name = "label28";
+ this.label28.Size = new System.Drawing.Size(53, 12);
+ this.label28.TabIndex = 191;
+ this.label28.Text = "璐� 璐� 浜�";
+ //
+ // txtHEmpID
+ //
+ this.txtHEmpID.BackColor = System.Drawing.Color.Beige;
+ this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHEmpID.Location = new System.Drawing.Point(88, 136);
+ this.txtHEmpID.Name = "txtHEmpID";
+ this.txtHEmpID.Size = new System.Drawing.Size(139, 21);
+ this.txtHEmpID.TabIndex = 192;
+ this.txtHEmpID.Tag = "0";
+ this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
+ //
+ // txtHName
+ //
+ this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHName.Location = new System.Drawing.Point(88, 57);
+ this.txtHName.Name = "txtHName";
+ this.txtHName.Size = new System.Drawing.Size(143, 21);
+ this.txtHName.TabIndex = 18;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(29, 87);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 17;
+ this.label4.Text = "鍔� 璁� 鐮�";
+ //
+ // cmdCancel
+ //
+ this.cmdCancel.Location = new System.Drawing.Point(279, 231);
+ this.cmdCancel.Name = "cmdCancel";
+ this.cmdCancel.Size = new System.Drawing.Size(52, 23);
+ this.cmdCancel.TabIndex = 16;
+ this.cmdCancel.Text = "鍙� 娑�";
+ this.cmdCancel.UseVisualStyleBackColor = true;
+ this.cmdCancel.Click += new System.EventHandler(this.cmdCancel_Click);
+ //
+ // cmdOK
+ //
+ this.cmdOK.Location = new System.Drawing.Point(221, 231);
+ this.cmdOK.Name = "cmdOK";
+ this.cmdOK.Size = new System.Drawing.Size(52, 23);
+ this.cmdOK.TabIndex = 15;
+ this.cmdOK.Text = "淇� 瀛�";
+ this.cmdOK.UseVisualStyleBackColor = true;
+ this.cmdOK.Click += new System.EventHandler(this.cmdOK_Click);
+ //
+ // chkHStopflag
+ //
+ this.chkHStopflag.AutoSize = true;
+ this.chkHStopflag.Location = new System.Drawing.Point(88, 235);
+ this.chkHStopflag.Name = "chkHStopflag";
+ this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
+ this.chkHStopflag.TabIndex = 12;
+ this.chkHStopflag.Text = "绂佺敤鏍囧織";
+ this.chkHStopflag.UseVisualStyleBackColor = true;
+ //
+ // txtHRemark
+ //
+ this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHRemark.Location = new System.Drawing.Point(88, 163);
+ this.txtHRemark.Multiline = true;
+ this.txtHRemark.Name = "txtHRemark";
+ this.txtHRemark.Size = new System.Drawing.Size(243, 60);
+ this.txtHRemark.TabIndex = 10;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(29, 166);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.TabIndex = 9;
+ this.label5.Text = "澶� 娉�";
+ //
+ // txtHHelpCode
+ //
+ this.txtHHelpCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHHelpCode.Location = new System.Drawing.Point(88, 84);
+ this.txtHHelpCode.Name = "txtHHelpCode";
+ this.txtHHelpCode.Size = new System.Drawing.Size(143, 21);
+ this.txtHHelpCode.TabIndex = 3;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(29, 60);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "閮� 闂�";
+ //
+ // txtHNumber
+ //
+ this.txtHNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHNumber.Location = new System.Drawing.Point(88, 30);
+ this.txtHNumber.Name = "txtHNumber";
+ this.txtHNumber.Size = new System.Drawing.Size(143, 21);
+ this.txtHNumber.TabIndex = 1;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(29, 33);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "閮ㄩ棬浠ｇ爜";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // splitContainer1
+ //
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer1.Location = new System.Drawing.Point(0, 50);
+ this.splitContainer1.Name = "splitContainer1";
+ //
+ // splitContainer1.Panel1
+ //
+ this.splitContainer1.Panel1.Controls.Add(this.tv);
+ this.splitContainer1.Panel1.Controls.Add(this.panel1);
+ //
+ // splitContainer1.Panel2
+ //
+ this.splitContainer1.Panel2.Controls.Add(this.stTab);
+ this.splitContainer1.Size = new System.Drawing.Size(877, 495);
+ this.splitContainer1.SplitterDistance = 138;
+ this.splitContainer1.TabIndex = 16;
+ //
+ // tv
+ //
+ this.tv.BackColor = System.Drawing.Color.White;
+ this.tv.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tv.ForeColor = System.Drawing.Color.Black;
+ this.tv.ImageIndex = 0;
+ this.tv.ImageList = this.imageList1;
+ this.tv.Indent = 18;
+ this.tv.ItemHeight = 18;
+ this.tv.LineColor = System.Drawing.Color.Navy;
+ this.tv.Location = new System.Drawing.Point(0, 23);
+ this.tv.Name = "tv";
+ treeNode1.ForeColor = System.Drawing.Color.Black;
+ treeNode1.Name = "tjbb";
+ treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
+ treeNode1.Text = "椤圭洰";
+ this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
+ treeNode1});
+ this.tv.SelectedImageIndex = 1;
+ this.tv.Size = new System.Drawing.Size(138, 472);
+ this.tv.TabIndex = 16;
+ this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
+ //
+ // panel1
+ //
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.panel1.Controls.Add(this.cmdLoadTree);
+ this.panel1.Controls.Add(this.label3);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(138, 23);
+ this.panel1.TabIndex = 15;
+ //
+ // cmdLoadTree
+ //
+ this.cmdLoadTree.Dock = System.Windows.Forms.DockStyle.Right;
+ this.cmdLoadTree.Location = new System.Drawing.Point(94, 0);
+ this.cmdLoadTree.Name = "cmdLoadTree";
+ this.cmdLoadTree.Size = new System.Drawing.Size(40, 19);
+ this.cmdLoadTree.TabIndex = 1;
+ this.cmdLoadTree.Text = "鍒锋柊";
+ this.cmdLoadTree.UseVisualStyleBackColor = true;
+ this.cmdLoadTree.Click += new System.EventHandler(this.cmdLoadTree_Click);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(0, 3);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(107, 12);
+ this.label3.TabIndex = 0;
+ this.label3.Text = "閮ㄩ棬璧勬枡-姝ｅ湪娴忚";
+ //
+ // dtpHFactoryDayOffDate
+ //
+ this.dtpHFactoryDayOffDate.Location = new System.Drawing.Point(364, 30);
+ this.dtpHFactoryDayOffDate.Name = "dtpHFactoryDayOffDate";
+ this.dtpHFactoryDayOffDate.Size = new System.Drawing.Size(200, 21);
+ this.dtpHFactoryDayOffDate.TabIndex = 196;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(305, 35);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(53, 12);
+ this.label7.TabIndex = 197;
+ this.label7.Text = "鍘備紤鏃ユ湡";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(295, 83);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(65, 12);
+ this.label8.TabIndex = 199;
+ this.label8.Text = "闈炲巶浼戞棩鏈�";
+ //
+ // dtpHNoFactoryDayOffDate
+ //
+ this.dtpHNoFactoryDayOffDate.Location = new System.Drawing.Point(364, 78);
+ this.dtpHNoFactoryDayOffDate.Name = "dtpHNoFactoryDayOffDate";
+ this.dtpHNoFactoryDayOffDate.Size = new System.Drawing.Size(200, 21);
+ this.dtpHNoFactoryDayOffDate.TabIndex = 198;
+ //
+ // Gy_FactoryDayOff
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.SystemColors.Control;
+ this.ClientSize = new System.Drawing.Size(877, 545);
+ this.Controls.Add(this.splitContainer1);
+ this.Controls.Add(this.ToolBar);
+ this.Name = "Gy_FactoryDayOff";
+ this.Text = "閮ㄩ棬璁剧疆";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_FactoryDayOff_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_FactoryDayOff_Load);
+ this.ToolBar.ResumeLayout(false);
+ this.ToolBar.PerformLayout();
+ this.stTab.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabPage2.ResumeLayout(false);
+ this.tabPage2.PerformLayout();
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+ this.splitContainer1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.ToolStripButton xz;
+ private System.Windows.Forms.ToolStripButton xg;
+ private System.Windows.Forms.ToolStripButton sc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton cx;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStrip ToolBar;
+ private System.Windows.Forms.ToolStripButton xs;
+ private System.Windows.Forms.ImageList imageList1;
+ private System.Windows.Forms.TabControl stTab;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.TextBox txtHHelpCode;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtHNumber;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox txtHRemark;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.CheckBox chkHStopflag;
+ private System.Windows.Forms.Button cmdCancel;
+ private System.Windows.Forms.Button cmdOK;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.SplitContainer splitContainer1;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripButton fz;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.TreeView tv;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.Button cmdLoadTree;
+ private System.Windows.Forms.TextBox txtHName;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Button cmdHEmpID;
+ private System.Windows.Forms.Label label28;
+ private System.Windows.Forms.TextBox txtHEmpID;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox txtHBarCode;
+ private System.Windows.Forms.ToolStripButton jc;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.DateTimePicker dtpHNoFactoryDayOffDate;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.DateTimePicker dtpHFactoryDayOffDate;
+ }
+}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
new file mode 100644
index 0000000..cf035ac
--- /dev/null
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
@@ -0,0 +1,573 @@
+<?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="ToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="ToolBar.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="ToolBar.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYAAABIAAAAAQAAAEgAAAABQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1AAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+AAEEpGSUYAAQIBAEgASAAA/+0ADEFkb2JlX0NNAAL/7gAO
+ QWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEBAxEB/90ABAAI/8QBPwAAAQUB
+ AQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMC
+ BAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKD
+ JkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3
+ x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVj
+ czTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm
+ 9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCSW+kpeLN4
+ /Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1wP8Amvg/uZn/AG7X/wCSS/5r
+ 4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJcWbx+xXDj8PtcD/mv
+ g/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCS
+ W+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx+xXDj8PtcD/mvg/uZn/btf8A
+ 5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/Z/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP
+ FB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAKQQAAwEi
+ AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAAB
+ fQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNE
+ RUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1
+ tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA
+ AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRC
+ kaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpz
+ dHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ
+ 2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8AiaP+Eku/+eUP/fpP
+ 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
+ OnormKKLAf/Z
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
+ F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
+ KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
+ oXs9qiieYFzuPSiSvmMYkef5B9h5hyvM1NoFGlmIXFPo6IWcJv9h5clA7oepFQ4HHLTFi7svsPoMG2+Q
+ UtDPT4GC2XgTpCe5X/YktlNs733486C5AJ9FHdrrRaLxARuoscFuuEjwX1RQNqzRzWXDfhTy670qMY7z
+ BdYeeKA8svstAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
+</value>
+ </data>
+ <data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
+ USCIQiyti2iuMYoQS8n+IMLUi/07kq4L03WzLiTvahvVGghtujFashLLzNqEiTCNGfT0ve/OOufICPSB
+ h3P4zu/3nu98HKHPoNOHYdc4XJ5xuL3G0tqwcwLEqLgxA44x/Cr+hjUCCJesZ1flmj36hxliVU3L3UEn
+ NvKbsAYLmMqiYm2hLWaIVTUtPfdHkF/PQYwCT1eBttfAoSn5Zrda2oUTzBCralpu9Q8hu/adoa4oUD8t
+ hTHZx7rKIdtbhcpnYOt9hJXlr/y2en8FWVZJyatM/EQNorXCOKj79j1kMp8hFAn5ZJ8Yq6TlVebgjTi2
+ GwQQAxZMddqQa/Y7SKY/weyOQ3TMQVzSqrz6+U/2fyx9Ag2Zq9Pt4vrNPkwGZrnTz1/ArzaztMxQtSXG
+ cnIHOO5Z4V0YBlDOt5rReOoc92jzGTwLzDBQZUkYZP6sk5NGeXfCb6IMHLB+2LtcjrtT7E9OhRWGaADe
+ t/5ffhmJQV/v5dLBsLzzAygmeEhZ/raWM/DyF3bg3fwi3sbSiCS+wCtF/QCzSXBpLRVSmCGWHHLFhfYr
+ fOLHTGdxpLkFD9pK8OGm06AhdE8Jzih4KJ8RQyw5F9uv4i8FGOblYoXaAQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
+ ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
+ SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
+ bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
+ AIbNSzi9csNm59A3bsGibZtuVNvSLT+5oraVmpu7HHj/E1weHkOTCzi+cMJ5+yAGnG4Ptnb25QWlmibF
+ Ai/vBz4+4FAxlHQ4hJ+aKa6sUywgHhnEHii/g1JNZpjCsppfC3qZUKAt7otC8FuTb2SGyS+pUiwgJxCf
+ llTERlAME+QWlf9ZQNfOiomguD5BTkEpFRuOQ/hCBTf3PgwY58NhsjZ5JgsUPLEkT9iAIPgOeAMvuL7j
+ qUfXF8LknWqhJOKMjMxsxCelISElHaoUNRJT1Zi2Lool0uGwZphPnPTZd01KdgkAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="xs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
+ WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
+ MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
+ GGcDdAsRKTA13koF0oKdAl2jzCC24JAFiwxMC7GCRAs2Fg5bMCFyC9YZJFsIKcTUFmjkg+2eAgj+eMnq
+ 3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="jc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ 2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
+ vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
+ 8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
+ TeQkqqpyB0pZj3rgKogAFCE0s2owVh8oS45rDdlYQSge1IdUuE/jOGIP0Qqm2sRUCtBMAnErIWTmxthZ
+ QTiNNkgzhVRF0TzRyOxNCAn2tldaiV/+nwgRkMiYHwIr6UXY3sHBAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <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>
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>112, 17</value>
+ </metadata>
+ <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
+ CgAAAk1TRnQBSQFMAgEBAgEAASQBAQEkAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
+ AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
+ AwAB/wMAAf8DAAH/gAAE/wEAAUEBigH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQ
+ AbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/
+ AQwBkAG5Af8DAAn/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
+ AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AwAB/wMAAf+AAAT/
+ AQABQQGKAf8B0QH2Av8BUwHaAfQB/wFIAdMB8QH/AT0BywHvAf8BMwHEAe0B/wEpAb4B6wH/AR8BuAHo
+ Af8BEwGwAecB/wEJAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQwBkAG5Af8DAAn/AQABQQGK
+ Af8B0QH2Av8BKAG+AesB/wEiAbkB6QH/ARoBtAHnAf8BEgGwAeYB/wELAasB5AH/AQQBpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQwBkAG5Af8BAAFBAYoB/wMAAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AVkB3gH1
+ Af8BTgHWAfMB/wFEAdAB8QH/ATkByQHuAf8BLwHCAewB/wEkAbwB6gH/ARoBtAHnAf8BDwGtAeUB/wEF
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATMBxQHuAf8BLQHB
+ AesB/wEmAbwB6wH/AR4BtwHoAf8BFwGyAecB/wEPAa4B5QH/AQgBqQHkAf8BAQGlAeIB/wEAAaEB4QH/
+ AQwBkAG5Af8DAAH/AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYEB4QH3Af8BVQHaAfQB/wFK
+ AdQB8gH/AT8BzAHvAf8BNQHGAe4B/wErAcAB6wH/ASABuQHpAf8BFgGyAeYB/wELAasB5QH/AQEBpQHi
+ Af8BAAGfAeEB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATgByAHuAf8BMQHEAewB/wEqAb8B6wH/
+ ASMBuwHqAf8BHAG2AegB/wEUAbAB5wH/AQ0BrAHlAf8BBgGnAeMB/wEAAaMB4gH/AQABQQGKAf8DAAH/
+ AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYYB5QH3Af8BWwHfAfUB/wFQAdgB8wH/AUYB0QHx
+ Af8BOwHKAe8B/wExAcQB7QH/AScBvQHqAf8BHAG2AegB/wERAa8B5QH/AQYBqAHjAf8BAAGiAeEB/wEM
+ AZABuQH/AwAB/wEAAUEBigH/AdEB9gL/AUQBzwHxAf8BPQHLAe8B/wE1AccB7gH/AS8BwgHsAf8BKAG9
+ AeoB/wEgAbkB6QH/ARkBtAHnAf8BEgGwAeYB/wEKAaoB5QH/AQwBkAG5Af8DAAH/AQwBkAG5Af8BDAGQ
+ AbkB/wMAAf+AAAT/AQABQQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVcB3AH1Af8BTQHVAfIB/wFB
+ Ac4B8AH/ATcByAHuAf8BLQHBAewB/wEjAboB6gH/ARcBswHnAf8BDQGsAeUB/wEDAaYB4wH/AQwBkAG5
+ Af8DAAH/AQABQQGKAf8B0QH2Av8BSQHTAfIB/wFBAc4B8AH/AToBygHuAf8BMwHFAe0B/wEtAcEB6wH/
+ ASUBvAHqAf8BHgG3AegB/wEWAbIB5gH/AQ8BrgHlAf8BDAGQAbkB/wMAAf8BDAGQAbkB/wEMAZABuQH/
+ AwAB/4AABP8BAAFBAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXQHgAfYB/wFTAdkB8wH/AUgB0wHy
+ Af8BPQHLAe8B/wEzAcUB7QH/ASkBvgHrAf8BHwG4AekB/wETAbAB5gH/AQgBqQHkAf8BDAGQAbkB/wMA
+ Af8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
+ AUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BDAGQAbkB/wE6AckB7gH/AQwBkAG5
+ Af8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVoB3gH1Af8BTgHW
+ AfMB/wFEAc8B8QH/ATkByQHvAf8BLwHCAewB/wElAbsB6QH/ARoBtQHnAf8BDwGtAeYB/wEMAZABuQH/
+ AwAF/wEAAUEBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFa
+ Ad0B9QH/AVQB2gHzAf8BTgHXAfMB/wFJAdMB8QH/AUMBzwHxAf8BPQHLAe8B/wEMAZABuQH/AwAB/4AA
+ BP8BAAFBAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFdAeAB9gH/AVgB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BDAGQAbkB/wMAAf+AAAT/AQABQQGKAf8BHwGoAdMB/wEfAagB0wH/AR8BqAHTAf8BHwGo
+ AdMB/wEfAagB0wH/AR8BqAHTAf8BHwGoAdMB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
+ AQABQQGKAf8BAAFBAYoJ/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFB
+ AYoF/4AACP8BAAFBAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUEBigH/AwAh/wEAAUEBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQQGKHf+AAAz/AQABQQGKAf8BAAFBAYoB/wEA
+ AUEBigH/AQABQQGKAf8BAAFBAYoB/wMAKf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
+ AUEBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <metadata name="stTab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="tabPage1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="grdMain.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="tabPage2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="dtpHNoFactoryDayOffDate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="dtpHFactoryDayOffDate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txtHBarCode.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="cmdHEmpID.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <data name="cmdHEmpID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIZBAAAzmQBmzP///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>
+ <metadata name="label28.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txtHEmpID.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txtHName.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="cmdCancel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="cmdOK.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="chkHStopflag.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txtHRemark.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txtHHelpCode.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txtHNumber.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>225, 17</value>
+ </metadata>
+ <metadata name="splitContainer1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="tv.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="cmdLoadTree.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>49</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index b3c82ee..27fdb38 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -78,6 +78,8 @@
<Compile Include="MES\ClsSc_MESMaterToSourceBill .cs" />
<Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsGy_BarCodeBill_ChaiMa.cs" />
<Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_FactoryDayOff_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_FactoryDayOff_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Ctl.cs" />
<Compile Include="婧愬崟\ERP婧愬崟\Cls_S_Sc_ABJJD.cs" />
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs"
new file mode 100644
index 0000000..5055ff5
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Ctl.cs"
@@ -0,0 +1,99 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_FactoryDayOff_Ctl:DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_FactoryDayOff_Model oModel = new Model.ClsGy_FactoryDayOff_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HFactoryDayOffDate,HNoFactoryDayOffDate,HRemark) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HFactoryDayOffDate.ToString() + "','" + oModel.HNoFactoryDayOffDate.ToString() + "','" + oModel.HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HLevel=" + oModel.HLevel +
+ ",HParentID=" + oModel.HParentID +
+ ",HFactoryDayOffDate=" + oModel.HFactoryDayOffDate +
+ ",HNoFactoryDayOffDate='" + oModel.HNoFactoryDayOffDate + "'" +
+
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_FactoryDayOff_Ctl()
+ {
+ MvarItemKey = "Gy_FactoryDayOff";
+ MvarReportTitle = "鍘備紤璁剧疆";
+ oModel = new Model.ClsGy_FactoryDayOff_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_View.cs"
new file mode 100644
index 0000000..a8cba0c
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_View.cs"
@@ -0,0 +1,89 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_FactoryDayOff_View:DBUtility.ClsGy_Base_View
+ {
+
+ //
+ public Model.ClsGy_FactoryDayOff_Model omodel = new Model.ClsGy_FactoryDayOff_Model();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public ClsGy_FactoryDayOff_View()
+ {
+ base.ViewNameForWeb = "h_v_Gy_Department_ForWeb";
+ base.MvarReportTitle = "鍘備紤璁剧疆";
+ base.MvarItemKey = "Gy_FactoryDayOff";
+ base.SQLName = "Select HItemID,HFactoryDayOffDate 鍘備紤鏃ユ湡,HNoFactoryDayOffDate 闈炲巶浼戞棩鏈� from Gy_FactoryDayOff where HStopflag=0 Order by HItemID ";
+ //涓嬫媺SQL
+ base.SQLNameForDown = " Select top 30 HItemID,HFactoryDayOffDate 鍘備紤鏃ユ湡,HNoFactoryDayOffDate 闈炲巶浼戞棩鏈� from Gy_FactoryDayOff ";
+ base.SQLOrderForDown = " Order by HNumber ";
+ base.SQLWhereForDown = " where HStopflag=0 ";
+ }
+ //
+ public void Dispose()
+ {
+ GC.SuppressFinalize(this);
+ }
+ //
+
+
+ //杩斿洖椤圭洰淇℃伅
+ public override bool GetInfoByID(Int64 sItemID)
+ {
+ DataSet DS ;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HItemID='" + sItemID + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ return GetInfo(DS);
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜杩斿洖椤圭洰淇℃伅
+ public override bool GetInfoByNumber(string sNumber)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HNumber='" + sNumber + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ return GetInfo(DS);
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //杩斿洖椤圭洰淇℃伅
+ public override bool GetInfo(DataSet DS)
+ {
+ try
+ {
+ omodel = new Model.ClsGy_FactoryDayOff_Model();
+ omodel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ omodel.HFactoryDayOffDate = Convert.ToDateTime(DS.Tables[0].Rows[0]["HFactoryDayOffDate"]);
+ omodel.HNoFactoryDayOffDate = Convert.ToDateTime(DS.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
+ return true;
+
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ }
+}
diff --git a/Kanban/Sc_CJKB.cs b/Kanban/Sc_CJKB.cs
index cbc910c..055ee65 100644
--- a/Kanban/Sc_CJKB.cs
+++ b/Kanban/Sc_CJKB.cs
@@ -76,7 +76,7 @@
string sSql = "";
string sWhere = "";
ClsIni oIni = new ClsIni();
- string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
sDeptID = sID;
//杩囨护鏉′欢
//if (frmCondition.SqlStr.Trim().Length == 0)
@@ -101,21 +101,15 @@
//-----------棰勮鐘舵��
//寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
//瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
- //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;
- // }
- //}
+ 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;
+ }
+ }
//璁剧疆鍚堣鍒�
string sTotalCol = "";
@@ -282,7 +276,16 @@
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;
+ }
+ }
////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
//int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
@@ -447,6 +450,15 @@
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)
@@ -489,17 +501,26 @@
//-----------棰勮鐘舵��
//寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
//瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
- int HBDateCol = Fun_GetCol("寮�宸ユ椂闂�");
- int HEDateCol = Fun_GetCol("瀹屽伐鏃堕棿");
- int HStatusCol = Fun_GetCol("鐢熶骇鐘舵��");
+ //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;
+ // }
+ //}
+ 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[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) == "寰呯敓浜�")
+ if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
{
grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
}
diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
index e41c9fd..49a7f84 100644
--- a/Kanban/Sc_QLKB.cs
+++ b/Kanban/Sc_QLKB.cs
@@ -144,12 +144,20 @@
////}
////
///
- ClsCN clsCN = new ClsCN();
- ClsIni clsIni = new ClsIni();
- string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp.ini");
- this.sDeptID = text;
+ //ClsCN clsCN = new ClsCN();
+ //ClsIni clsIni = new ClsIni();
+ //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini");
+ //this.sDeptID = text;
+
+
+ ClsCN SubCn = new ClsCN();
+ string sSql = "";
+ string sWhere = "";
+ ClsIni oIni = new ClsIni();
+ string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
+ sDeptID = sID;
string procName = "exec h_p_QLKB " + this.sDeptID;
- this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+ this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
bool flag = this.DSet == null;
if (!flag)
{
@@ -164,6 +172,15 @@
int frCol = 10;
string 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;
+ }
}
}
catch (Exception e)
@@ -300,8 +317,16 @@
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;
+ }
+ }
////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊
//int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級");
//int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺");
@@ -465,6 +490,15 @@
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)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 9be9640..476560a 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -7826,7 +7826,13 @@
oGy_QCCheckItem.Show();
oMainForm.AddTabPage(oGy_QCCheckItem);
break;
-
+ case "gy_factorydayoff"://厂休
+ Gy_FactoryDayOff oGy_FactoryDayOff = new Gy_FactoryDayOff();
+ oGy_FactoryDayOff.MdiParent = oMain;
+ oGy_FactoryDayOff.Show();
+ oMainForm.AddTabPage(oGy_FactoryDayOff);
+ break;
+
case "":
//
break;
diff --git a/LMES/bin/x86/Debug.rar b/LMES/bin/x86/Debug.rar
new file mode 100644
index 0000000..aa8ea7a
--- /dev/null
+++ b/LMES/bin/x86/Debug.rar
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 9d264c3..8894178 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -320,6 +320,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CusLevel_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CusStatus_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Dealer_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_FactoryDayOff_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DisposeWay_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DotCheck_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Dweller_Model.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Model.cs"
new file mode 100644
index 0000000..88de3e7
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_FactoryDayOff_Model.cs"
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_FactoryDayOff_Model : DBUtility.ClsGy_Base_Model
+ {
+ //
+ public DateTime HFactoryDayOffDate;
+ public DateTime HNoFactoryDayOffDate;
+ }
+}
diff --git a/NETERPNoWin/Frm_MESSetIni.cs b/NETERPNoWin/Frm_MESSetIni.cs
index ca04342..778ad94 100644
--- a/NETERPNoWin/Frm_MESSetIni.cs
+++ b/NETERPNoWin/Frm_MESSetIni.cs
@@ -19,9 +19,9 @@
private void cmdOK_Click(object sender, EventArgs e)
{
ClsIni oIni = new ClsIni();
- ClsIni.WriteIni("Dept", "DeptID", this.txtHDeptID.Tag.ToString(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
- ClsIni.WriteIni("Dept", "DeptName", this.txtHDeptID.Text.Trim(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
- ClsIni.WriteIni("OPenWin", "gnmc", this.txtHOPWin.Text.Trim(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ 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("OPenWin", "gnmc", this.txtHOPWin.Text.Trim(), Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
this.Close();
}
@@ -47,9 +47,9 @@
private void Frm_MESSetIni_Load(object sender, EventArgs e)
{
ClsIni oIni = new ClsIni();
- string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
- string sName = ClsIni.ReadIni("Dept", "DeptName", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
- string sWinName = ClsIni.ReadIni("OPenWin", "gnmc", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ 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 sWinName = ClsIni.ReadIni("OPenWin", "gnmc", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
txtHDeptID.Tag = sID;
txtHDeptID.Text = sName;
txtHOPWin.Text = sWinName;
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index b25ca69..62a197f 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 879bab6..90ab76e 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 22730aa..c2f29ef 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 c5e00c3..bbb7b1f 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 0ae4232..f51a1e5 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 c346229..1f3ab8d 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 ac1831b..b1aeb55 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 5da9c86..4314e15 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.ini b/NETERPNoWin/bin/x86/Debug/HXERP.ini
index 1a758d9..44f071a 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP.ini
@@ -1,28 +1,46 @@
[po]
-Server=10.55.43.244
+Server=47.96.97.237,15127
[Erp]
-Server=10.55.43.244
-DataBase=HX_DMKanban
-DataBaseNumber=
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-智云LMES管理系统
+UserName=HX_USER
+PassWord=lc@841022
+UserPsd=
+Remember=
+[Srm]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-ERP供应商协同平台
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[K3Erp]
-Server=10.55.43.244
-DataBase=AIS20181012154003
+Server=47.96.97.237,15127
+DataBase=
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
-Server=10.55.43.244
-DataBase=AIS20181012154003
+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=
Remember=1
+HOrgName=蓝海实业集团
+[CLOUDINFO]
+
+sCLOUDUrl=http://47.96.97.237/k3cloud/
+sCLOUDAcc=6204a70eba35fc
+sCLOUDUseName=demo
+sCLOUDPsd=888888
[OPenWin]
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
-gnmc=Sc_CJKB
\ No newline at end of file
+gnmc=车间看板
+[Dept]
+DeptID=没有找到！
+DeptName=没有找到！
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP_OLD.ini b/NETERPNoWin/bin/x86/Debug/HXERP_OLD.ini
new file mode 100644
index 0000000..1a758d9
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/HXERP_OLD.ini
@@ -0,0 +1,28 @@
+[po]
+Server=10.55.43.244
+[Erp]
+Server=10.55.43.244
+DataBase=HX_DMKanban
+DataBaseNumber=
+UserName=HX_USER
+PassWord=lc@841022
+UserPsd=
+Remember=
+[K3Erp]
+Server=10.55.43.244
+DataBase=AIS20181012154003
+UserName=HX_USER
+PassWord=lc@841022
+[K32Erp]
+Server=10.55.43.244
+DataBase=AIS20181012154003
+UserName=HX_USER
+PassWord=lc@841022
+[UserInfo]
+UserName=admin
+UserPsd=jinghuanzh
+Remember=1
+[OPenWin]
+gnbm=Sc9910
+gnsy=Sc_WorkBillPlanSumReportKB
+gnmc=Sc_CJKB
\ No newline at end of file
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
index ec30947..ee4c056 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP_SY.ini
@@ -29,4 +29,4 @@
[OPenWin]
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
-gnmc=
+gnmc=车间看板
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
index a808b02..c844bc0 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 13d9411..57cbc56 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 1d65221..c52e58b 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 c8f11da..96d03cf 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 f5ad290..5d28b9a 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 e5d15b2..e6efcd5 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 aba85d8..c0443f4 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 8cfa718..a3e94e3 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 8708670..21fb289 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 d22a6c9..db17776 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 e6dcea8..c1b1523 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 6120acb..cbd4d70 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 393affd..9cd4514 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 6a0d265..86efcc3 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 5b092e7..447350a 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 c589b10..1ff113f 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 15b0a6b..75254ae 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 e98588d..3707c6f 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 b34eff7..e88e2bb 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 6d066f9..81022db 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 ecc1f6b..82305d4 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 da61587..836addf 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -54,3 +54,4 @@
Sc_WorkBillProcProdReportKB=193,556,523,112
Sc_HZQLCGKB=11,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
frmDownMenu任务单设置=100,135,100
+Sc_CJKB=
diff --git a/NETERPNoWin/bin/x86/Debug/stdole.dll b/NETERPNoWin/bin/x86/Debug/stdole.dll
deleted file mode 100644
index 9673c81..0000000
--- a/NETERPNoWin/bin/x86/Debug/stdole.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
index a4a6454..c844bc0 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.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index 61582b9..47fc74d 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -107,4 +107,3 @@
D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
-D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
index 6b543d9..2747ea8 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 b7418fe..3b94b51 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.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
index 88471c7..4ae63c9 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index e5d15b2..e6efcd5 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 aba85d8..c0443f4 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
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 920db49..635bfac 100644
--- "a/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
+++ "b/NETERPNoWin/\345\205\254\347\224\250/MESMain.Designer.cs"
@@ -65,7 +65,7 @@
this.Sc_ICMOBillList_K3.Name = "Sc_ICMOBillList_K3";
this.Sc_ICMOBillList_K3.Size = new System.Drawing.Size(83, 83);
this.Sc_ICMOBillList_K3.TabIndex = 1;
- this.Sc_ICMOBillList_K3.Tag = "褰撳墠宸ュ崟";
+ this.Sc_ICMOBillList_K3.Tag = "閲囪喘鐪嬫澘";
this.Sc_ICMOBillList_K3.UseVisualStyleBackColor = true;
this.Sc_ICMOBillList_K3.Click += new System.EventHandler(this.Sc_ICMOBillList_K3_Click);
//
@@ -101,7 +101,7 @@
this.Sc_WorkBillPlanReportKB.Name = "Sc_WorkBillPlanReportKB";
this.Sc_WorkBillPlanReportKB.Size = new System.Drawing.Size(83, 83);
this.Sc_WorkBillPlanReportKB.TabIndex = 2;
- this.Sc_WorkBillPlanReportKB.Tag = "璁″垝鐪嬫澘";
+ this.Sc_WorkBillPlanReportKB.Tag = "杞﹂棿鐪嬫澘";
this.Sc_WorkBillPlanReportKB.UseVisualStyleBackColor = true;
this.Sc_WorkBillPlanReportKB.Click += new System.EventHandler(this.Sc_WorkBillPlanReportKB_Click);
//
@@ -113,7 +113,7 @@
this.Sc_WorkBillPlanSumReportKB.Name = "Sc_WorkBillPlanSumReportKB";
this.Sc_WorkBillPlanSumReportKB.Size = new System.Drawing.Size(83, 83);
this.Sc_WorkBillPlanSumReportKB.TabIndex = 3;
- this.Sc_WorkBillPlanSumReportKB.Tag = "姹囨�荤湅鏉�1";
+ this.Sc_WorkBillPlanSumReportKB.Tag = "缂烘枡鐪嬫澘";
this.Sc_WorkBillPlanSumReportKB.UseVisualStyleBackColor = true;
this.Sc_WorkBillPlanSumReportKB.Click += new System.EventHandler(this.Sc_WorkBillPlanSumReportKB_Click);
//
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index e9ab141..a47a8de 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -176,6 +176,10 @@
{
omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
+ {
+ omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
@@ -488,6 +492,10 @@
{
omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
+ {
+ omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 16be230..cc45b85 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -31,6 +31,7 @@
public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_MateOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
//生产退料
public string Kf_MateOutBackBill_AutoCheck;
public string Kf_MateOutBackBill_ERPMode;
@@ -122,6 +123,7 @@
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位
+ public string Kf_MoveStockBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配
//补料单
public string Kf_MateReplenishOutBill_AutoCheck;
public string Kf_MateReplenishOutBill_ERPMode;
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 5685cea..a5f2ac3 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -940,9 +940,6 @@
<DependentUpon>CH_RedStockOutCheckCount.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo.resx">
- <SubType>Designer</SubType>
- </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.resx">
<DependentUpon>Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git a/WarM/WarM.csproj.user b/WarM/WarM.csproj.user
index eca3abc..1c6f68c 100644
--- a/WarM/WarM.csproj.user
+++ b/WarM/WarM.csproj.user
@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index bdb5a0f..e4a90dc 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -139,9 +139,9 @@
this.toolStripSeparator2,
this.AddRow,
this.spRow,
+ this.bc,
this.DelRow,
this.toolStripSeparator4,
- this.bc,
this.toolStripSeparator8,
this.wxm,
this.toolStripSeparator9,
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index f3d4019..59b08f6 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -415,16 +415,6 @@
sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
</value>
</data>
- <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
- G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
- 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
- EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
- E8pc2+4AAAAASUVORK5CYII=
-</value>
- </data>
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -440,6 +430,16 @@
SUVORK5CYII=
</value>
</data>
+ <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
<data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 225d43b..258363c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -41,6 +41,7 @@
public Int64 HInterID_TTM = 0;
public string HBillNo_TTM = "";
ClsCN SubCn = new ClsCN();
+ Pub_Class.ClsGridViewSum oSumGrid = new Pub_Class.ClsGridViewSum();
//
private void initGrid()
{
@@ -216,6 +217,7 @@
{
//
//frmCondition = new frmBillQueryCondition_New();
+ oSumGrid.ogrdMain = grdMain;
this.Text = ModCaption;
//lblCaption.Text = ModCaption;
initGrid();
@@ -787,13 +789,49 @@
string WeiShu = ""; //灏炬暟
int LSHlen = 6; //娴佹按鍙烽暱搴�
string TM = ""; //鏉＄爜
+ string sPackBarCode = "";
+ //HDate = dtpHBeginDate.Value.ToShortDateString();
+ //HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ //HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ //HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ //HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ //HDay = HDay.Substring(HDay.Length - 2, 2);
- HDate = dtpHBeginDate.Value.ToShortDateString();
- HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
- HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
- HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
- HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
- HDay = HDay.Substring(HDay.Length - 2, 2);
+ HDate = dtpHBeginDate.Value.ToShortDateString();
+ DataSet DSet1 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet1 == null || DSet1.Tables[0].Rows.Count == 0)
+ {
+ HDate = DateTime.Now.ToShortDateString();
+ HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ HDay = HDay.Substring(HDay.Length - 2, 2);
+ long HTMaterID = 0;
+ HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
+ string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+ DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + TTM_LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ }
+ else
+ {
+ HDate = DBUtility.ClsPub.isStrNull(DSet1.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
+ HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ HDay = HDay.Substring(HDay.Length - 2, 2);
+ long HTMaterID = 0;
+ HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
+ string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+ DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + TTM_LSH.ToString() + "+" ;
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ }
//=============鏍规嵁鐣岄潰涓婂凡缁忓垎閰嶇殑鏁版嵁杩涜鏉＄爜鐢熸垚鍜屾墦鍗般��
//鑾峰彇鏈鐢熸垚鐨� 涓诲唴鐮�
@@ -807,13 +845,13 @@
//00 鍏堢敓鎴� 鍞竴鐨� 鎵樻潯鐮�
//鐢熸垚涓�涓绠辩爜
- long HTMaterID = 0;
- HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
- string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
- DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
- string sPackBarCode = sPackStr + TTM_LSH.ToString();
- oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ //long HTMaterID = 0;
+ //HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
+ //string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+ //DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ //Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ //string sPackBarCode = sPackStr + TTM_LSH.ToString();
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
//MessageBox.Show("11");
@@ -947,7 +985,7 @@
}
//2.寰幆缁撴潫鍚庯紝鏍规嵁 鏈鐢熸垚鐨� 涓诲唴鐮侊紝浠庡悗鍙版暟鎹簱鑾峰彇 鏉＄爜鍒楄〃锛岀敓鎴� 缁勬墭鍗� 鍜� 鎵樻潯鐮侊紝 鐩存帴璋冪敤瀛樺偍杩囩▼
//鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗ｆ锛孲UM妗ｆ
- oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + HInterID_TTM.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + HInterID_TTM.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "','" + HDate + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
oCn.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterID_TTM.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
@@ -1053,6 +1091,7 @@
bool flag = this.txtHZXQty.Text.Trim() != "";
double num;
+ double HICMOQty = 0;
if (flag)
{
num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
@@ -1070,6 +1109,17 @@
{
for (int i = 0; i < this.grdMain.Rows.Count; i++)
{
+ for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
+ {
+
+ HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ if (HICMOQty < num)
+ {
+ MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
+ break;
+ }
+
bool flag3 = num > 0.0;
if (!flag3)
{
@@ -1312,9 +1362,49 @@
}
if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
{
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = HTMNumber + LSH2;
+ HDate = DateTime.Now.ToShortDateString();
+ DataSet DSet = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null || DSet.Tables[0].Rows.Count == 0)
+ {
+ HDate = DateTime.Now.ToShortDateString();
+ HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ HDay = HDay.Substring(HDay.Length - 2, 2);
+ HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ TM = HTMNumber + LSH2;
+ }
+ else
+ {
+ HDate = DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HNoFactoryDayOffDate"]);
+ HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ HDay = HDay.Substring(HDay.Length - 2, 2);
+ HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ TM = HTMNumber + LSH2 + "+";
+ }
+ //HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ //HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ //HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ //HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ //HDay = HDay.Substring(HDay.Length - 2, 2);
+ //HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+ //Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
}
+ //if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ //{
+ // //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ // TM = HTMNumber + LSH2;
+ //}
if (TM.Trim() == "")
{
MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�");
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 7b5f663..105b64e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -323,6 +323,11 @@
long HProcID = list[0].HProcID;
int HUSEORGID = list[0].HUSEORGID;
+
+
+ long HWorkCenterID = list[0].HWorkCenterID; //宸ヤ綔涓績
+
+
//鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
//{
@@ -360,13 +365,13 @@
",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
- ",HUSEORGID) " +
+ ",HUSEORGID,HWorkCenterID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
- ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ","+ HUSEORGID + "," + HWorkCenterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -397,6 +402,7 @@
",HFixPrice= " + HFixPrice +
",HOverFixPrice= " + HOverFixPrice +
",HProcMulID= " + HProcMulID +
+ ",HWorkCenterID= " + HWorkCenterID +
",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index b076c66..00f955e 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -78,6 +78,106 @@
}
}
+ [Route("Cg_POOrderBill/list3")]
+ [HttpGet]
+ public object list3(string sWhere, string user)
+ {
+ try
+ {
+ List<string> optionList = new List<string>();
+ string sql = "select top 1 * from h_v_IF_POOrderBillList where 1 = 1 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(@"{ field: 'hmainid', title: '"+ item.ToString() + "', sort: true, hide: false }");
+ }
+ string option = string.Join(",",optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList.ToArray();
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ [Route("Cg_POOrderBill/list2")]
+ [HttpGet]
+ public object list2(string sWhere, string user)
+ {
+ try
+ {
+ List<OptionListModel> optionList = new List<OptionListModel>();
+ string sql = "select top 1 * from h_v_IF_POOrderBillList where 1 = 1 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(new OptionListModel
+ {
+ field = item.ToString(),
+ title = item.ToString(),
+ sort = true,
+ hide = false,
+ });
+ }
+ string option = string.Join(",", optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 閲囪喘璁㈠崟 鍒嗛厤
///鍙傛暟锛歴tring sql銆�
@@ -201,13 +301,13 @@
/// </summary>
[Route("Cg_POOrderBill/Resynchronize")]
[HttpGet]
- public object Resynchronize(string HBillNo,string HBillType)
+ public object Resynchronize(string HBillNo, string HBillType)
{
try
{
oCN.BeginTran();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + HBillNo + "','"+ HBillType + "'", "h_p_WMS_ERPSourceBillToLocal");
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ERPSourceBillToLocal");
if (DS == null)
{
objJsonResult.code = "0";
@@ -325,7 +425,7 @@
else
fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
- DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = "+dr["HINTERID"].ToString());
+ DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
JObject model = new JObject();
model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
@@ -561,4 +661,5 @@
//
}
+
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 44b51be..76b2def 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -331,6 +331,7 @@
//鍒涘缓涓存椂琛�
DataTable tb2 = new DataTable("dt2");
+ DataTable tb3 = new DataTable("dt3");
//娣诲姞鍒楀悕
for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
@@ -595,6 +596,7 @@
public string HPeriod;
public string DataAppend;
public string HOrgID;
+ public Int64 HTProcessFlag;
}
[Route("Gy_RoutingBill/Gy_RoutingBill_btnSave")]
@@ -716,7 +718,7 @@
ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HName='" + list[i]["宸ヤ綔涓績"].ToString() + "'", "Gy_WorkCenter");
var HCenterID = "0";
if (ds.Tables[0].Rows.Count > 0)
- HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
@@ -739,16 +741,38 @@
var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
//鐗╂枡鍒嗙被
- oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
- ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
- ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
- ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
- $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
- $", {hworkqty}, {(HFixPrice==""?"0": HFixPrice)}, {(HBadPrice == "" ? "0": HBadPrice)}, {(HWasterPrice == "" ? "0": HWasterPrice)}, {(HBeginFixQty == "" ? "0": HBeginFixQty)}, {(HBeginDayQty == "" ? "0": HBeginDayQty)}, {(HFixWorkDays == "" ? "0": HFixWorkDays)}" +
- $", {(HTrunWorkDays == "" ? "0": HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1": "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
- $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
- //鑷娆℃暟
- num[0]++;
+
+
+ oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
+ ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
+ ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
+ ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
+ $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
+ $", {hworkqty}, {(HFixPrice == "" ? "0" : HFixPrice)}, {(HBadPrice == "" ? "0" : HBadPrice)}, {(HWasterPrice == "" ? "0" : HWasterPrice)}, {(HBeginFixQty == "" ? "0" : HBeginFixQty)}, {(HBeginDayQty == "" ? "0" : HBeginDayQty)}, {(HFixWorkDays == "" ? "0" : HFixWorkDays)}" +
+ $", {(HTrunWorkDays == "" ? "0" : HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1" : "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
+ $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
+ //鑷娆℃暟
+ num[0]++;
+ if(omdelMian.HTProcessFlag == 1 )
+ {
+ if ((i == list.Count - 1) || (list[i]["浜у搧浠ｇ爜"].ToString() != list[i + 1]["浜у搧浠ｇ爜"].ToString()))
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1", "Gy_Process");
+ if (ds.Tables[0].Rows.Count > 0)
+ HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ HProcNo = ds.Tables[0].Rows[0]["HSno"].ToString();
+ oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
+ ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
+ ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
+ ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
+ $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
+ $", {hworkqty}, {(HFixPrice == "" ? "0" : HFixPrice)}, {(HBadPrice == "" ? "0" : HBadPrice)}, {(HWasterPrice == "" ? "0" : HWasterPrice)}, {(HBeginFixQty == "" ? "0" : HBeginFixQty)}, {(HBeginDayQty == "" ? "0" : HBeginDayQty)}, {(HFixWorkDays == "" ? "0" : HFixWorkDays)}" +
+ $", {(HTrunWorkDays == "" ? "0" : HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1" : "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
+ $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
+ }
+ num[0]++;
+ }
+
}
objJsonResult.code = "1";
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_MonthlySalaryReportController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_MonthlySalaryReportController.cs"
new file mode 100644
index 0000000..926e7e4
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_MonthlySalaryReportController.cs"
@@ -0,0 +1,103 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Pay_MonthlySalaryReportController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ /// <summary>
+ /// 杩斿洖閲囪喘璁㈠崟鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_MonthlySalaryReport/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ string sql = $"exec [h_p_MonthlySalaryReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("Pay_MonthlySalaryReport/list2")]
+ [HttpGet]
+ public object list2(string sWhere)
+ {
+ try
+ {
+ List<OptionListModel> optionList = new List<OptionListModel>();
+ string sql = $"exec [h_p_MonthlySalaryReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(new OptionListModel
+ {
+ field = item.ToString(),
+ title = item.ToString(),
+ sort = true,
+ hide = false,
+ });
+ }
+ string option = string.Join(",", optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_PieceRateWageReportController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_PieceRateWageReportController.cs"
new file mode 100644
index 0000000..938a535
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_PieceRateWageReportController.cs"
@@ -0,0 +1,104 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Pay_PieceRateWageReportController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖閲囪喘璁㈠崟鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_PieceRateWageReport/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ string sql = $"exec [h_p_PieceRateWageReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("Pay_PieceRateWageReport/list2")]
+ [HttpGet]
+ public object list2(string sWhere)
+ {
+ try
+ {
+ List<OptionListModel> optionList = new List<OptionListModel>();
+ string sql = $"exec [h_p_PieceRateWageReport] '{sWhere}'";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ if (ds != null)
+ {
+ foreach (DataColumn item in ds.Tables[0].Columns)
+ {
+ optionList.Add(new OptionListModel
+ {
+ field = item.ToString(),
+ title = item.ToString(),
+ sort = true,
+ hide = false,
+ });
+ }
+ string option = string.Join(",", optionList);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = optionList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栬〃鏍煎け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\212\250\346\200\201\345\210\227/OptionListModel.cs" "b/WebAPI/Models/\345\212\250\346\200\201\345\210\227/OptionListModel.cs"
new file mode 100644
index 0000000..6723b97
--- /dev/null
+++ "b/WebAPI/Models/\345\212\250\346\200\201\345\210\227/OptionListModel.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class OptionListModel
+ {
+ public string field { get; set; }
+ public string title { get; set; }
+ public bool sort { get; set; }
+ public bool hide { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index 807f58a..fc6d065 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -37,5 +37,6 @@
public string HBarCodeForBase { get; set; }
+ public long HWorkCenterID { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7fe4b38..c828f26 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/06/2022 13:47:21</publishTime>
+ <publishTime>07/18/2022 18:17:10</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/06/2022 13:47:21</publishTime>
+ <publishTime>07/18/2022 18:17:10</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/06/2022 13:47:19</publishTime>
+ <publishTime>07/18/2022 18:17:09</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/06/2022 13:47:19</publishTime>
+ <publishTime>07/18/2022 18:17:09</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/06/2022 13:47:13</publishTime>
+ <publishTime>07/18/2022 18:17:07</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/06/2022 13:47:13</publishTime>
+ <publishTime>07/18/2022 18:17:07</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/06/2022 13:47:15</publishTime>
+ <publishTime>07/18/2022 18:17:08</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/06/2022 13:47:15</publishTime>
+ <publishTime>07/18/2022 18:17:08</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/06/2022 13:47:11</publishTime>
+ <publishTime>07/18/2022 18:17:06</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/06/2022 13:47:11</publishTime>
+ <publishTime>07/18/2022 18:17:06</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/06/2022 13:47:12</publishTime>
+ <publishTime>07/18/2022 18:17:06</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/06/2022 13:47:12</publishTime>
+ <publishTime>07/18/2022 18:17:06</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/06/2022 13:47:12</publishTime>
+ <publishTime>07/18/2022 18:17:07</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/06/2022 13:47:12</publishTime>
+ <publishTime>07/18/2022 18:17:07</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/06/2022 13:47:28</publishTime>
+ <publishTime>07/18/2022 18:17:15</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/06/2022 13:47:28</publishTime>
+ <publishTime>07/18/2022 18:17:15</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -459,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/06/2022 13:47:37</publishTime>
+ <publishTime>07/18/2022 18:17:23</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index e99d9b0..0d54a06 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
- <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
+ <add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" />
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
<!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
@@ -92,7 +92,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -100,7 +100,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
+ <value>http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b125d7f..e3ea52f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -428,6 +428,8 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
@@ -572,6 +574,7 @@
<Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+ <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
--
Gitblit v1.9.1