From 11b1f8ad50cda7f73e2afedfff9e60555d512793 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 15 五月 2025 14:49:08 +0800
Subject: [PATCH] 1
---
PayM/bin/x86/Debug/SQLHelper.dll | 0
NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 10
SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb | 0
WarM/条码打印/Gy_BarCodeBill_Rework.resx | 45
WebAPI/Controllers/QC_ManagementController.cs | 4
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
PayM/bin/x86/Debug/Pub_Control.pdb | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 120
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
LMES/Frm_Show.cs | 4
WarM/条码打印/Gy_BarCodeBill.cs | 1
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 57
WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs | 163 +
PayM/bin/x86/Debug/Pub_Class.pdb | 0
WarM/条码打印/Gy_BarCodeBill_XiaBao.cs | 2043 +++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml | 16
PayM/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/Controllers/基础资料/生产基础资料/Gy_ShiftsController.cs | 27
PayM/bin/x86/Debug/Pub_Class.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
DAL/基础资料/公用基础资料/ClsGy_Unit_Ctl.cs | 5
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 25
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
PayM/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 7
Pub_Class/bin/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/WebAPIController.cs | 72
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 485 ---
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
PayM/bin/x86/Debug/BLL.pdb | 0
WarM/条码打印/Gy_BarCodeBill_XiaBao.resx | 528 ++++
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 25
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 122
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 16
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user | 9
DAL/DAL.csproj | 1
DAL/源单/InterFace源单/Cls_S_IF_MoveStockRequestBillList.cs | 23
Model/基础资料/其他基础资料/ClsGy_QCCheckProjectSub.cs | 4
WebAPI/WebAPI.csproj | 6
PayM/bin/x86/Debug/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
WarM/条码打印/Gy_BarCodeBill_New.cs | 1
WebAPI/Controllers/GG_NoticeController.cs | 2
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 1
WebAPI/Web References/WebS/WebService1.wsdl | 498 ++-
LMES/ClsShowMod.cs | 6
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
PayM/bin/x86/Debug/DAL.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 12
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 123
PayM/bin/x86/Debug/DBUtility.pdb | 0
WebAPI/Controllers/LMESController.cs | 2
WarM/条码打印/Frm_Split.cs | 16
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 12
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
WarM/条码打印/Gy_BarCodeBill_XiaBao.designer.cs | 975 +++++++
WebAPI/Controllers/基础资料/基础资料/Gy_WorkStationBillController.cs | 28
sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
LMES/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 1
SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb | 0
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 165 +
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
WebAPI/Web References/WebS/Reference.cs | 1152 +++++--
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs | 1
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 8
WarM/WarM.csproj | 10
PayM/bin/x86/Debug/Model.dll | 0
DAL/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 8
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 43
WebAPI/Models/Department.cs | 4
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 2
WarM/条码打印/Gy_BarCodeBill_Rework.designer.cs | 318 +-
WebAPI/Controllers/基础资料/基础资料/Gy_MaterTypeBillController.cs | 15
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 26
Model/基础资料/基础资料/ClsGy_Unit_Model.cs | 1
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 160 +
/dev/null | 391 --
WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 2
PayM/bin/x86/Debug/DAL.pdb | 0
PayM/bin/x86/Debug/PayM.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb | 0
PayM/bin/x86/Debug/PayM.pdb | 0
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 24
WebAPI/Controllers/ReportPlatFormController.cs | 40
95 files changed, 6,184 insertions(+), 1,725 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 7a7f1c5..510bc72 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -84,6 +84,7 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_ProductReceiveMaterialBill.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_MoveStockRequestBillList.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBill.cs" />
<Compile Include="ClsPay_AbsentBill.cs" />
<Compile Include="ClsPay_EarlyLateErrBill.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_Unit_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_Unit_Ctl.cs"
index 799b499..2f48a14 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Unit_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_Unit_Ctl.cs"
@@ -20,10 +20,10 @@
oCn.BeginTran();
oCn.RunProc("Insert into Gy_Unit" +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID,HMakeEmp,HUnitGroupID) " +
" 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.HRemark +
- "'," + oModel.HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(oModel.HStandard) + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "'," + oModel.HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(oModel.HStandard) + "," + oModel.HUSEORGID +",'" + oModel.HMakeEmp+"'," + oModel.HUnitGroupID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update Gy_Unit" + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -53,6 +53,7 @@
",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
",HRate=" + oModel.HRate.ToString() +
",HStandard=" + DBUtility.ClsPub.BoolToString(oModel.HStandard) + "" +
+ ",HUnitGroupID=" + DBUtility.ClsPub.isInt(oModel.HStandard) + "" +
",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);
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
index 33bff98..1af774b 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
@@ -104,7 +104,7 @@
",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
- ",HControlUpperLimit,HControlLowerLimit" +
+ ",HControlUpperLimit,HControlLowerLimit,HSampleCount,HSampleDayCount" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -118,7 +118,7 @@
"," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB +
"," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt
+ "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
- ","+ oSub.HControlUpperLimit + ","+ oSub.HControlLowerLimit +
+ ","+ oSub.HControlUpperLimit + ","+ oSub.HControlLowerLimit + "," + oSub.HSampleCount + "," + oSub.HSampleDayCount +
") ");
}
//=========================淇濆瓨鍚庢帶鍒�
@@ -209,7 +209,7 @@
",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
- ",HControlUpperLimit,HControlLowerLimit" +
+ ",HControlUpperLimit,HControlLowerLimit,HSampleCount,HSampleDayCount" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -223,7 +223,7 @@
"," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB +
"," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt
+ "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
- ","+ oSub.HControlUpperLimit + "," +oSub.HControlLowerLimit +
+ ","+ oSub.HControlUpperLimit + "," +oSub.HControlLowerLimit + "," + oSub.HSampleCount + "," + oSub.HSampleDayCount +
") ");
}
//=========================淇濆瓨鍚庢帶鍒�
diff --git "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_MoveStockRequestBillList.cs" "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_MoveStockRequestBillList.cs"
new file mode 100644
index 0000000..884301d
--- /dev/null
+++ "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_MoveStockRequestBillList.cs"
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using SQLHelper;
+using DBUtility;
+
+namespace DAL
+{
+ public class Cls_S_IF_MoveStockRequestBillList : Cls_S_Xt_BaseBill
+ {
+
+ public Cls_S_IF_MoveStockRequestBillList()
+ {
+ base.ViewName = "h_v_IF_MoveStockRequestBillList_Source";
+ base.mvarReportTitle = "璋冩嫧鐢宠鍗�";
+ base.mvarItemKey = "1243";
+ base.sCondtion = " ";
+ base.sOrderSql = " order by 鍗曟嵁鍙� desc,hsubid ";
+ base.sKeyCol = "";
+ }
+
+ }
+}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index d4f0c96..6293af3 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 59940f0..434686b 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 2be0819..24e3175 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3646,6 +3646,12 @@
oGy_BarCodeBill_Rework.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oGy_BarCodeBill_Rework.ShowDialog();
break;
+ case "gy_barcodebill_xiabao":
+ //
+ Gy_BarCodeBill_XiaBao oGy_BarCodeBill_XiaBao = new Gy_BarCodeBill_XiaBao();
+ oGy_BarCodeBill_XiaBao.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_BarCodeBill_XiaBao.ShowDialog();
+ break;
case "gy_cusbarcodebilllist":
//权限
Gy_CusBarCodeBillList oGy_CusBarCodeBillList = new Gy_CusBarCodeBillList();
diff --git a/LMES/Frm_Show.cs b/LMES/Frm_Show.cs
index ad77fea..c883f2a 100644
--- a/LMES/Frm_Show.cs
+++ b/LMES/Frm_Show.cs
@@ -185,7 +185,7 @@
{
DataSet oDs;
Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
- oDs = oCn.RunProcReturn("h_p_OA_EmpMinMessageList " + DBUtility.ClsPub.CurUserName.ToString(), "xt_xtgnb");
+ oDs = oCn.RunProcReturn("h_p_OA_EmpMinMessageList '" + DBUtility.ClsPub.CurUserName.ToString()+"'", "h_p_OA_EmpMinMessageList");
if (oDs != null)
{
grdList1.DataSource = oDs.Tables[0].DefaultView;
@@ -196,7 +196,7 @@
}
//
- oDs = oCn.RunProcReturn("exec h_p_OA_WorkBillList " + DBUtility.ClsPub.CurUserName.ToString(), "xt_xtgnb");
+ oDs = oCn.RunProcReturn("exec h_p_OA_WorkBillList '" + DBUtility.ClsPub.CurUserName.ToString() + "'", "h_p_OA_WorkBillList");
if (oDs == null)
{
return;
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index 0c23372..e455d8c 100644
--- a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/LMES/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll b/LMES/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
new file mode 100644
index 0000000..9e4d28c
--- /dev/null
+++ b/LMES/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 7e1ff1d..d3669ce 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs"
index 4ad9c14..c9efa09 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs"
@@ -6,8 +6,6 @@
{
public class ClsGy_QCCheckProjectSub : DBUtility.ClsXt_BaseBillSub
{
- public String HBillNo_bak;
- //
public Int64 HPrjNo;
public Int64 HQCCheckItemID;
public String HQCStd;
@@ -43,6 +41,8 @@
public Decimal HDownOffSetQ;
public Decimal HControlUpperLimit;
public Decimal HControlLowerLimit;
+ public Int64 HSampleCount;
+ public Int64 HSampleDayCount;
public Int64 HTargetValB;
public Int64 HUpLimitB;
public Int64 HDownLimitB;
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_Unit_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_Unit_Model.cs"
index 7772327..2ab8cf8 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Unit_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_Unit_Model.cs"
@@ -12,5 +12,6 @@
public string HBarCode;
public int HUSEORGID;
public int HCREATEORGID;
+ public int HUnitGroupID; //单位组ID
}
}
diff --git a/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll b/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll
deleted file mode 100644
index fbd0ebf..0000000
--- a/NETERPNoWin/bin/x86/Debug/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll
deleted file mode 100644
index f33f9ae..0000000
--- a/NETERPNoWin/bin/x86/Debug/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
deleted file mode 100644
index 433f983..0000000
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
deleted file mode 100644
index 559a7b2..0000000
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
deleted file mode 100644
index 0aac0f6..0000000
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
deleted file mode 100644
index 62252b8..0000000
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
deleted file mode 100644
index 94e3c5c..0000000
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
deleted file mode 100644
index de50034..0000000
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
deleted file mode 100644
index add1b5a..0000000
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
deleted file mode 100644
index a3cf8e2..0000000
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
deleted file mode 100644
index 330d401..0000000
--- a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
deleted file mode 100644
index ac79713..0000000
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
deleted file mode 100644
index 9e2f200..0000000
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll b/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
deleted file mode 100644
index 25dd347..0000000
--- a/NETERPNoWin/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
deleted file mode 100644
index ebdfffb..0000000
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
deleted file mode 100644
index 5f8a963..0000000
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
deleted file mode 100644
index 9c5acfd..0000000
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
deleted file mode 100644
index 51278a4..0000000
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
deleted file mode 100644
index 3442e38..0000000
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll
deleted file mode 100644
index a200471..0000000
--- a/NETERPNoWin/bin/x86/Debug/NPOI.OOXML.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll
deleted file mode 100644
index 5034194..0000000
--- a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXml4Net.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll b/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll
deleted file mode 100644
index df8708d..0000000
--- a/NETERPNoWin/bin/x86/Debug/NPOI.OpenXmlFormats.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NPOI.dll b/NETERPNoWin/bin/x86/Debug/NPOI.dll
deleted file mode 100644
index 907cfb1..0000000
--- a/NETERPNoWin/bin/x86/Debug/NPOI.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll b/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll
deleted file mode 100644
index 416bd37..0000000
--- a/NETERPNoWin/bin/x86/Debug/Newtonsoft.Json.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
deleted file mode 100644
index d932cf3..0000000
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
deleted file mode 100644
index 4ee6bcf..0000000
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
deleted file mode 100644
index 0fb1fbc..0000000
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
deleted file mode 100644
index 72dacf7..0000000
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
deleted file mode 100644
index ddabcca..0000000
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
deleted file mode 100644
index deaca02..0000000
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
deleted file mode 100644
index 35ae692..0000000
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
deleted file mode 100644
index fbd7c96..0000000
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
deleted file mode 100644
index 4ad1f4b..0000000
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
deleted file mode 100644
index 479ed7b..0000000
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
deleted file mode 100644
index feef46b..0000000
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll.config b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
deleted file mode 100644
index d9658be..0000000
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <configSections>
- </configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
deleted file mode 100644
index 10ed36c..0000000
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
deleted file mode 100644
index 6ed78a5..0000000
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
deleted file mode 100644
index ece6889..0000000
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
index 28a6365..b1a10d4 100644
--- a/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 1e2e4f6..f758837 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
deleted file mode 100644
index f7faff8..0000000
--- a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Form1.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Form1.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Form1.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources
deleted file mode 100644
index c7c0b2c..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_MESSetIni.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_Show.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_Show.resources
deleted file mode 100644
index ad18340..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Frm_Show.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.MDIMain.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.MDIMain.resources
deleted file mode 100644
index 759d25b..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.MDIMain.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.MESMain.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.MESMain.resources
deleted file mode 100644
index 6fa92d5..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.MESMain.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.OA_MessageBox.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.OA_MessageBox.resources
deleted file mode 100644
index c79deb3..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.OA_MessageBox.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Properties.Resources.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Properties.Resources.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Properties.Resources.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Xt_Wait.resources b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Xt_Wait.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.Xt_Wait.resources
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
deleted file mode 100644
index 29702f9..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CopyComplete b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CopyComplete
+++ /dev/null
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
deleted file mode 100644
index fbbdd71..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-417e6dc671e47ed52c7b59de94e63aca66435af8
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
deleted file mode 100644
index ff6caee..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.GenerateResource.cache
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
deleted file mode 100644
index 9b052d7..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
deleted file mode 100644
index 9c5acfd..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
deleted file mode 100644
index 3442e38..0000000
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
index f107fb0..7a37dd0 100644
--- a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 2127c3b..7e51ccd 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index 6752251..45d5dc1 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index 2c4bcb9..2b94791 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index f7c5554..2e714f4 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 07e01d0..3a3d165 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index f96d5e1..ffdd669 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
index ccb2e64..1971640 100644
--- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index b7423d8..a56962e 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index c1c1d54..54cebc3 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 4f5927c..f18aab8 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index f63a246..60535cc 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index bebe98b..41fab44 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index abca571..174853a 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 012a72e..f6ea471 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index 3969309..7fea752 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index 6f5c6fe..27bc5b8 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index d7b618e..4331b46 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll
deleted file mode 100644
index f107fb0..0000000
--- a/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources b/PayM/obj/x86/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
deleted file mode 100644
index 1eec1a9..0000000
--- a/PayM/obj/x86/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill.resources b/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill2.resources b/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill2.resources
deleted file mode 100644
index 0351517..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill2.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill3.resources b/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill3.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill3.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill4.resources b/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill4.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill4.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill5.resources b/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill5.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBill5.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBillList.resources b/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBillList.resources
deleted file mode 100644
index f753f0d..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_AccPayMentDayBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew.resources b/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew.resources
deleted file mode 100644
index f753f0d..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew1.resources b/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew1.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew1.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew2.resources b/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew2.resources
deleted file mode 100644
index 21db791..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew2.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew3.resources b/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew3.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew3.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew4.resources b/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew4.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew4.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew5.resources b/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew5.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/CostM.Pay_PayMentBillAutoAddnew5.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/HuanXin.ERP.Pay_PayMentBillListDlg.resources b/PayM/obj/x86/Debug/HuanXin.ERP.Pay_PayMentBillListDlg.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/HuanXin.ERP.Pay_PayMentBillListDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources b/PayM/obj/x86/Debug/HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/Interop.gregn6Lib.dll b/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
deleted file mode 100644
index ccb2e64..0000000
--- a/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/OAM.HR_EmpEngageRequestBill.resources b/PayM/obj/x86/Debug/OAM.HR_EmpEngageRequestBill.resources
deleted file mode 100644
index fe67101..0000000
--- a/PayM/obj/x86/Debug/OAM.HR_EmpEngageRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/OAM.HR_EmpEngageRequestBillList.resources b/PayM/obj/x86/Debug/OAM.HR_EmpEngageRequestBillList.resources
deleted file mode 100644
index 9db27ad..0000000
--- a/PayM/obj/x86/Debug/OAM.HR_EmpEngageRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Err_MonthExpenseEntryBill.resources b/PayM/obj/x86/Debug/PayM.Err_MonthExpenseEntryBill.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Err_MonthExpenseEntryBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Err_MonthExpenseEntryBillDlg.resources b/PayM/obj/x86/Debug/PayM.Err_MonthExpenseEntryBillDlg.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.Err_MonthExpenseEntryBillDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Form2.resources b/PayM/obj/x86/Debug/PayM.Form2.resources
deleted file mode 100644
index 4174109..0000000
--- a/PayM/obj/x86/Debug/PayM.Form2.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.FrmChangeDate.resources b/PayM/obj/x86/Debug/PayM.FrmChangeDate.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.FrmChangeDate.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_ContractBookBill.resources b/PayM/obj/x86/Debug/PayM.HR_ContractBookBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_ContractBookBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_ContractBookBillList.resources b/PayM/obj/x86/Debug/PayM.HR_ContractBookBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_ContractBookBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpChangeBill.resources b/PayM/obj/x86/Debug/PayM.HR_EmpChangeBill.resources
deleted file mode 100644
index 8243501..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpChangeBillList.resources b/PayM/obj/x86/Debug/PayM.HR_EmpChangeBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpChangeBillQuery.resources b/PayM/obj/x86/Debug/PayM.HR_EmpChangeBillQuery.resources
deleted file mode 100644
index c36b02c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpChangeBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpDimissionBill.resources b/PayM/obj/x86/Debug/PayM.HR_EmpDimissionBill.resources
deleted file mode 100644
index c9652fd..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpDimissionBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpDimissionBillList.resources b/PayM/obj/x86/Debug/PayM.HR_EmpDimissionBillList.resources
deleted file mode 100644
index 0831b84..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpDimissionBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpFosterBill.resources b/PayM/obj/x86/Debug/PayM.HR_EmpFosterBill.resources
deleted file mode 100644
index b0a5e3d..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpFosterBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpFosterBillList.resources b/PayM/obj/x86/Debug/PayM.HR_EmpFosterBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpFosterBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpUpChangeBill.resources b/PayM/obj/x86/Debug/PayM.HR_EmpUpChangeBill.resources
deleted file mode 100644
index b0a5e3d..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpUpChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_EmpUpChangeBillList.resources b/PayM/obj/x86/Debug/PayM.HR_EmpUpChangeBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_EmpUpChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_FamilyMemberBill.resources b/PayM/obj/x86/Debug/PayM.HR_FamilyMemberBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_FamilyMemberBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_FamilyMemberBillList.resources b/PayM/obj/x86/Debug/PayM.HR_FamilyMemberBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_FamilyMemberBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_InsuranceBookBill.resources b/PayM/obj/x86/Debug/PayM.HR_InsuranceBookBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_InsuranceBookBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_InsuranceBookBillList.resources b/PayM/obj/x86/Debug/PayM.HR_InsuranceBookBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_InsuranceBookBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_LearnHistoryBill.resources b/PayM/obj/x86/Debug/PayM.HR_LearnHistoryBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_LearnHistoryBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_LearnHistoryBillList.resources b/PayM/obj/x86/Debug/PayM.HR_LearnHistoryBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_LearnHistoryBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_PaperPhotoBill.resources b/PayM/obj/x86/Debug/PayM.HR_PaperPhotoBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_PaperPhotoBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_PaperPhotoBillList.resources b/PayM/obj/x86/Debug/PayM.HR_PaperPhotoBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_PaperPhotoBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_RewardsPunishBill.resources b/PayM/obj/x86/Debug/PayM.HR_RewardsPunishBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_RewardsPunishBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_RewardsPunishBillList.resources b/PayM/obj/x86/Debug/PayM.HR_RewardsPunishBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_RewardsPunishBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_WorkInjuryBill.resources b/PayM/obj/x86/Debug/PayM.HR_WorkInjuryBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_WorkInjuryBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_WorkInjuryBillList.resources b/PayM/obj/x86/Debug/PayM.HR_WorkInjuryBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_WorkInjuryBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_WorkSkillBill.resources b/PayM/obj/x86/Debug/PayM.HR_WorkSkillBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_WorkSkillBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_WorkSkillBillList.resources b/PayM/obj/x86/Debug/PayM.HR_WorkSkillBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_WorkSkillBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_WorkStoryBill.resources b/PayM/obj/x86/Debug/PayM.HR_WorkStoryBill.resources
deleted file mode 100644
index 787985c..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_WorkStoryBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.HR_WorkStoryBillList.resources b/PayM/obj/x86/Debug/PayM.HR_WorkStoryBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.HR_WorkStoryBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.KQ_sourceReport.resources b/PayM/obj/x86/Debug/PayM.KQ_sourceReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.KQ_sourceReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.KQ_sourceReportDlg.resources b/PayM/obj/x86/Debug/PayM.KQ_sourceReportDlg.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.KQ_sourceReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_AbsentBill.resources b/PayM/obj/x86/Debug/PayM.Pay_AbsentBill.resources
deleted file mode 100644
index 957b53c..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_AbsentBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_AbsentBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_AbsentBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_AbsentBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_CarOutApplyBill.resources b/PayM/obj/x86/Debug/PayM.Pay_CarOutApplyBill.resources
deleted file mode 100644
index e620e33..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_CarOutApplyBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_CarOutApplyBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_CarOutApplyBillList.resources
deleted file mode 100644
index a70b498..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_CarOutApplyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBill.resources b/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBill.resources
deleted file mode 100644
index 89f3885..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBillList.resources
deleted file mode 100644
index a70b498..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBill_KS.resources b/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBill_KS.resources
deleted file mode 100644
index 06ccee7..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_DuSubsidyItemBill_KS.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EarlyLateErrBill.resources b/PayM/obj/x86/Debug/PayM.Pay_EarlyLateErrBill.resources
deleted file mode 100644
index 957b53c..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EarlyLateErrBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EarlyLateErrBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_EarlyLateErrBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EarlyLateErrBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EmpInitChangeBill.resources b/PayM/obj/x86/Debug/PayM.Pay_EmpInitChangeBill.resources
deleted file mode 100644
index 6c01776..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EmpInitChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EmpInitChangeBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_EmpInitChangeBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EmpInitChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EmpPayMentSumReport.resources b/PayM/obj/x86/Debug/PayM.Pay_EmpPayMentSumReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EmpPayMentSumReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EmpPayMentSumReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_EmpPayMentSumReportDlg.resources
deleted file mode 100644
index 79c7741..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EmpPayMentSumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources b/PayM/obj/x86/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_EmpWorkQtyEntryReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_EmpWorkQtyEntryReportDlg.resources
deleted file mode 100644
index 15ce6e2..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_EmpWorkQtyEntryReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources b/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources
deleted file mode 100644
index 9e00c6e..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources
deleted file mode 100644
index a70b498..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBill.resources b/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBill.resources
deleted file mode 100644
index 592d8c1..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources
deleted file mode 100644
index 5003e21..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ErrWorkTimesSendBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
deleted file mode 100644
index 63c32a2..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_GroupBalBill.resources b/PayM/obj/x86/Debug/PayM.Pay_GroupBalBill.resources
deleted file mode 100644
index cd05a9f..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_GroupBalBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_GroupBalBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_GroupBalBillList.resources
deleted file mode 100644
index 96bd928..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_GroupBalBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_GroupBalBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_GroupBalBillQuery.resources
deleted file mode 100644
index c36b02c..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_GroupBalBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_InnerScrap.resources b/PayM/obj/x86/Debug/PayM.Pay_InnerScrap.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_InnerScrap.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_InnerScrapDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_InnerScrapDlg.resources
deleted file mode 100644
index 780f787..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_InnerScrapDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill1.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill1.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill1.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill2.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill2.resources
deleted file mode 100644
index 21db791..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill2.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill3.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill3.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill3.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill4.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill4.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill4.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill5.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill5.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBill5.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillList.resources
deleted file mode 100644
index f753f0d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillReportDlg.resources
deleted file mode 100644
index 79c7741..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthExpenseEntryBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthICMOStockSumBill.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthICMOStockSumBill.resources
deleted file mode 100644
index cd05a9f..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthICMOStockSumBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthICMOStockSumBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthICMOStockSumBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthICMOStockSumBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillAdd.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillAdd.resources
deleted file mode 100644
index 4121e55..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillAdd.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources
deleted file mode 100644
index 8b7dfec..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
deleted file mode 100644
index 79c7741..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyYearReport.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyYearReport.resources
deleted file mode 100644
index e267dbd..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthSubsidyYearReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReport.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReport.resources
deleted file mode 100644
index 833c5f6..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportDlg.resources
deleted file mode 100644
index 79c7741..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportMX.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportMX.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportMX.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportMX2.resources b/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportMX2.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_MonthWriteBillReportMX2.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_NoWorkTimesReport.resources b/PayM/obj/x86/Debug/PayM.Pay_NoWorkTimesReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_NoWorkTimesReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_NoWorkTimesReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_NoWorkTimesReportDlg.resources
deleted file mode 100644
index 780f787..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_NoWorkTimesReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OtherBalBill.resources b/PayM/obj/x86/Debug/PayM.Pay_OtherBalBill.resources
deleted file mode 100644
index 9f5486e..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OtherBalBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OtherBalBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_OtherBalBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OtherBalBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OtherBalBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_OtherBalBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OtherBalBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OtherMoney_Dlg.resources b/PayM/obj/x86/Debug/PayM.Pay_OtherMoney_Dlg.resources
deleted file mode 100644
index 2e88a39..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OtherMoney_Dlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OutApplyBill.resources b/PayM/obj/x86/Debug/PayM.Pay_OutApplyBill.resources
deleted file mode 100644
index 47c1be3..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OutApplyBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OutApplyBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_OutApplyBillList.resources
deleted file mode 100644
index 96b3e13..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OutApplyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OutApplyBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_OutApplyBillQuery.resources
deleted file mode 100644
index c36b02c..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OutApplyBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OutForComApplyBill.resources b/PayM/obj/x86/Debug/PayM.Pay_OutForComApplyBill.resources
deleted file mode 100644
index 4fcbbac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OutForComApplyBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OutForComApplyBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_OutForComApplyBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OutForComApplyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OuterScrap.resources b/PayM/obj/x86/Debug/PayM.Pay_OuterScrap.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OuterScrap.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OuterScrapDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_OuterScrapDlg.resources
deleted file mode 100644
index 780f787..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OuterScrapDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OverApplyBill.resources b/PayM/obj/x86/Debug/PayM.Pay_OverApplyBill.resources
deleted file mode 100644
index 4fcbbac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OverApplyBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OverApplyBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_OverApplyBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OverApplyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_OverApplyBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_OverApplyBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_OverApplyBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentBill.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentBill.resources
deleted file mode 100644
index a44b342..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentBillList.resources
deleted file mode 100644
index 430f1cc4..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillReport.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentBillReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentBillReportDlg.resources
deleted file mode 100644
index 71aa44d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentDayBill.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentDayBill.resources
deleted file mode 100644
index 2ca7d0f..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentDayBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentDayBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentDayBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentDayBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptSendList.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptSendList.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptSendList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptSendListDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptSendListDlg.resources
deleted file mode 100644
index 24688c3..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptSendListDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptYearReport.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptYearReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptYearReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptYearReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptYearReportDlg.resources
deleted file mode 100644
index ec17503..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentDeptYearReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentPrintReport.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentPrintReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentPrintReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentPrintReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentPrintReportDlg.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentPrintReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentSendList.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentSendList.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentSendList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentSendListDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentSendListDlg.resources
deleted file mode 100644
index 24688c3..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentSendListDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentYearReport.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentYearReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentYearReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMentYearReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMentYearReportDlg.resources
deleted file mode 100644
index ec17503..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMentYearReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMent_QC.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMent_QC.resources
deleted file mode 100644
index 980ec2d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMent_QC.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_PayMent_QCAdd.resources b/PayM/obj/x86/Debug/PayM.Pay_PayMent_QCAdd.resources
deleted file mode 100644
index 092f8ee..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_PayMent_QCAdd.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBill.resources b/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBill.resources
deleted file mode 100644
index 8243501..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProcPriceRequestBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources b/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtyEntryReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtyEntryReportDlg.resources
deleted file mode 100644
index 780f787..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtyEntryReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtySumReport.resources b/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtySumReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtySumReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtySumReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtySumReportDlg.resources
deleted file mode 100644
index 780f787..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_ProdWorkQtySumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_RewardPunishBill.resources b/PayM/obj/x86/Debug/PayM.Pay_RewardPunishBill.resources
deleted file mode 100644
index f25c391..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_RewardPunishBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_RewardPunishBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_RewardPunishBillList.resources
deleted file mode 100644
index 96bd928..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_RewardPunishBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill.resources
deleted file mode 100644
index 01f83ad..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillDlg.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillEntryReport.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillEntryReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillEntryReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillEntryReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillEntryReportDlg.resources
deleted file mode 100644
index 71aa44d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillEntryReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillList_KS.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillList_KS.resources
deleted file mode 100644
index a3c7c3c..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillList_KS.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillSumReport.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillSumReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillSumReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillSumReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillSumReportDlg.resources
deleted file mode 100644
index 71aa44d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBillSumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_Enter.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_Enter.resources
deleted file mode 100644
index 0edfd4b..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_Enter.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_KS.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_KS.resources
deleted file mode 100644
index 66d7d86..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_KS.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_YR.resources b/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_YR.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SingleBalBill_YR.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SubsidyChangeBill.resources b/PayM/obj/x86/Debug/PayM.Pay_SubsidyChangeBill.resources
deleted file mode 100644
index 323dd9f..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SubsidyChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SubsidyChangeBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_SubsidyChangeBillList.resources
deleted file mode 100644
index a70b498..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SubsidyChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SumBalBill.resources b/PayM/obj/x86/Debug/PayM.Pay_SumBalBill.resources
deleted file mode 100644
index 9f5486e..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SumBalBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SumBalBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_SumBalBillList.resources
deleted file mode 100644
index 6b8300c..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SumBalBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_SumBalBill_JS.resources b/PayM/obj/x86/Debug/PayM.Pay_SumBalBill_JS.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_SumBalBill_JS.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkErrTimesBill.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkErrTimesBill.resources
deleted file mode 100644
index f25c391..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkErrTimesBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkErrTimesBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkErrTimesBillList.resources
deleted file mode 100644
index 96bd928..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkErrTimesBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBill.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBill.resources
deleted file mode 100644
index 06ccee7..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBill.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBillList.resources
deleted file mode 100644
index 26509ac..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBillQuery.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBillQuery.resources
deleted file mode 100644
index 14c98cb..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesBillQuery.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill1.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill1.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill1.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill2.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill2.resources
deleted file mode 100644
index 21db791..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill2.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill3.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill3.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill3.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill4.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill4.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill4.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill5.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill5.resources
deleted file mode 100644
index 6a89d65..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBill5.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBillList.resources
deleted file mode 100644
index f753f0d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesCardBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesList.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesList.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesListDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesListDlg.resources
deleted file mode 100644
index 24688c3..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesListDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentEntryReport.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentEntryReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentEntryReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentEntryReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentEntryReportDlg.resources
deleted file mode 100644
index 71aa44d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentEntryReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentSumReport.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentSumReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentSumReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentSumReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentSumReportDlg.resources
deleted file mode 100644
index 71aa44d..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesPayMentSumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesSumQueryBillList.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesSumQueryBillList.resources
deleted file mode 100644
index 4328a63..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesSumQueryBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesSumQueryBillListDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_WorkTimesSumQueryBillListDlg.resources
deleted file mode 100644
index 1f586c7..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_WorkTimesSumQueryBillListDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_YearToCashBillReport.resources b/PayM/obj/x86/Debug/PayM.Pay_YearToCashBillReport.resources
deleted file mode 100644
index 01c9556..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_YearToCashBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Pay_YearToCashBillReportDlg.resources b/PayM/obj/x86/Debug/PayM.Pay_YearToCashBillReportDlg.resources
deleted file mode 100644
index 79c7741..0000000
--- a/PayM/obj/x86/Debug/PayM.Pay_YearToCashBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.Properties.Resources.resources b/PayM/obj/x86/Debug/PayM.Properties.Resources.resources
deleted file mode 100644
index 6c05a97..0000000
--- a/PayM/obj/x86/Debug/PayM.Properties.Resources.resources
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.CopyComplete b/PayM/obj/x86/Debug/PayM.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/PayM/obj/x86/Debug/PayM.csproj.CopyComplete
+++ /dev/null
diff --git a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 3362526..0000000
--- a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-76d6e649eaf418858fb80b047dbac5a1964f90f8
diff --git a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
deleted file mode 100644
index e9384f8..0000000
--- a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
deleted file mode 100644
index 9b052d7..0000000
--- a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
deleted file mode 100644
index 4f5927c..0000000
--- a/PayM/obj/x86/Debug/PayM.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
deleted file mode 100644
index f63a246..0000000
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index 9a5be6e..c0635b3 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index 310ad83..ca3eca3 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index 9a5be6e..c0635b3 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
index 310ad83..ca3eca3 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..cccadf8
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index f32ef2c..6de4073 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -9,9 +9,19 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> 1a6e71bfdc0c4385f1c93984d211c710cc711d54
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb
new file mode 100644
index 0000000..be6ecd0
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb
new file mode 100644
index 0000000..d4f984c
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb
new file mode 100644
index 0000000..be6ecd0
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 97979d2..00e2be1 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,3 +3,10 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
index 9a5be6e..c0635b3 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
index 310ad83..ca3eca3 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 2ca50b9..fdb3906 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -719,6 +719,12 @@
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.designer.cs">
<DependentUpon>Gy_BarCodeBill_Rework.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiaBao.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiaBao.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_XiaBao.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.cs">
<SubType>Form</SubType>
</Compile>
@@ -1206,7 +1212,9 @@
</EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.resx">
<DependentUpon>Gy_BarCodeBill_Rework.cs</DependentUpon>
- <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiaBao.resx">
+ <DependentUpon>Gy_BarCodeBill_XiaBao.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.resx">
<DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Frm_Split.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Frm_Split.cs"
index b70bf1e..6482ee1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Frm_Split.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Frm_Split.cs"
@@ -20,9 +20,19 @@
private void cmdOK_Click(object sender, EventArgs e)
{
- DBUtility.Gy_BaseFun.SaveControlInfo(groupBox2, this.Name);
- IsOk = 1;
- this.Visible = false;
+ string content = txtHQ.Text;
+ int number;
+ if (!int.TryParse(content, out number) || number < 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ鏁存暟锛�", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ DBUtility.Gy_BaseFun.SaveControlInfo(groupBox2, this.Name);
+ IsOk = 1;
+ this.Visible = false;
+ }
}
private void cmdCancel_Click(object sender, EventArgs e)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 72fb226..a00dba1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -1943,6 +1943,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
index 36353ba..e7111db 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
@@ -1050,6 +1050,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 622be66..985e9f9 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -259,8 +259,6 @@
this.lblCaption.Text = ModCaption;
//鍔犺浇缁勭粐淇℃伅
Sub_AddOrdList();
- //鍔犺浇婧愬崟绫诲瀷
- Sub_AddHSourceBillTypeList();
//鑾峰彇绯荤粺鍙傛暟
ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
@@ -307,25 +305,7 @@
cmbHOrgID.DisplayMember = "HName";
cmbHOrgID.ValueMember = "HItemID";
}
-
- //鍔犺浇婧愬崟绫诲瀷
- private void Sub_AddHSourceBillTypeList()
- {
- DataSet ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_SourceBillType " + HOrgID.ToString(), "h_p_Gy_BarCodeBill_SourceBillType");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- cmbSourceBillType.DataSource = null;
- cmbSourceBillType.Items.Clear();
- MessageBox.Show("鑾峰彇婧愬崟绫诲瀷澶辫触");
- return;
- }
- cmbSourceBillType.DataSource = null;
- cmbSourceBillType.Items.Clear();
- cmbSourceBillType.DataSource = ds.Tables[0];
- cmbSourceBillType.DisplayMember = "HName";
- cmbSourceBillType.ValueMember = "HItemID";
- }
-
+
//绐椾綋灏哄鍙樺寲鏃�
private void Gy_BarCodeBill_Rework_Resize(object sender, EventArgs e)
{
@@ -567,7 +547,6 @@
int HSumBQty = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
DataSet Ds;
- pb1.Value = 0;
Int64 HEntryID = 0; //瀛怚D
string HBarCode = ""; //鏉″舰鐮�
@@ -622,7 +601,6 @@
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
- pb1.Maximum = HSumBQty;
}
}
for (int j = 0; j < grdMain.Rows.Count; j++)
@@ -642,39 +620,11 @@
//==================================
if (HBarCodeType == "鍞竴鏉＄爜")
{
- if (CampanyName == "涓帶")
- {
- HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
- sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
- if (HSourceBillNo == "")
- {
- //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
- }
- else
- {
- //鏉＄爜 = 婧愬崟鍗曞彿 + 鐗╂枡ID + 琛屽彿
- sTMNumber = HSourceBillNo + sMaterID + sSourceEntryID;
- }
- }
- else //閫氱敤鏂规硶
- {
- //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
- }
- }
- else if (HBarCodeType == "鍝佺鏉＄爜")
- {
- TM = HOrgNumber + sMaterID;
- }
- else if (HBarCodeType == "鎵规鏉＄爜")
- {
- TM = HOrgNumber + sMaterID + HBatchNo;
- }
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
else
{
MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
@@ -716,31 +666,13 @@
}
if (HBarCodeType == "鍞竴鏉＄爜")
{
- if (CampanyName == "涓帶")
- {
- if (HSourceBillNo == "")
- {
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
- }
- else
- {
- if (HBQty > 1)
- {
- MessageBox.Show("鐢熶骇姹囨姤鍗曘�佹敹鏂欓�氱煡鍗曠敓鎴愭潯鐮佹椂锛岀鏁颁笉鑳藉ぇ浜�1锛�");
- bc.Enabled = true;
- oCn.RollBack();
- return;
- }
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑
- TM = sTMNumber;
- }
- }
- else
- {
- //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
- TM = sTMNumber + LSH2;
- }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
HEntryID = j + 1;
@@ -815,7 +747,6 @@
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
")");
- pb1.Value = n + 1;
n = n + 1;
nn = nn + 1;
}
@@ -936,6 +867,7 @@
grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
grdMain.Columns[HEndDateCol].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
grdMain.Columns[HMainIDCol].Visible = false;
@@ -977,6 +909,7 @@
grdMain.Columns[HSeOrderSEQCol].Visible = false;
grdMain.Columns[HInnerBillNoCol].Visible = false;
grdMain.Columns[HEndDateCol].Visible = false;
+ grdMain.Columns[HBillNoCol].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1016,17 +949,9 @@
grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
//缃戞牸涓嬫媺閫夋嫨妗�
DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
- if (CampanyName == "涓帶")
- {
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
- else
- {
- column.Items.Add("鍞竴鏉＄爜");
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
+
+ column.Items.Add("鍞竴鏉＄爜");
+
grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
}
@@ -1050,6 +975,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
@@ -1124,7 +1050,7 @@
grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
- grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = oMater.omodel.HBarCodeType;
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "鍞竴鏉＄爜";
//鍚敤鎵规
if (oMater.omodel.HBatchManager)
{
@@ -1149,12 +1075,7 @@
grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
}
-
- if (CampanyName == "涓帶")
- {
- grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
- grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
- }
+
oEdit.Text = oMater.omodel.HNumber;
}
else
@@ -1374,154 +1295,7 @@
}
#endregion
-
-
- #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夋斁澶ч暅鍥炬爣杩斿洖
-
- private void cmdSourceBillNo_Click(object sender, EventArgs e)
- {
- if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
- {
- string sWhere = "";
- //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
- if (SourceQtyCtl == "N")
- {
- sWhere = " and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0";
- }
- else
- {
- sWhere = " and HOrgID =" + HOrgID.ToString();
- }
-
- DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
- if (oIFCLD_ICMOList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
- if (oIF_ICMOReportBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
- if (oIF_POInStockBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POInStockBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
- if (oIF_POOrderBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POOrderBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
- if (oIF_EntrustOrderBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
- {
- string sWhere = "";
- DAL.Cls_S_IF_POStockInBillList oIF_POStockInBillList = new DAL.Cls_S_IF_POStockInBillList();
- if (oIF_POStockInBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POStockInBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
- {
- string sWhere = "";
- DAL.Cls_S_IF_SeOutStockBackBillList oIF_SeOutStockBackBillList = new DAL.Cls_S_IF_SeOutStockBackBillList();
- if (oIF_SeOutStockBackBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_SeOutStockBackBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_OtherInBillList oIF_OtherInBillList = new DAL.Cls_S_IF_OtherInBillList();
- if (oIF_OtherInBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_OtherInBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐩存帴璋冩嫧鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_MoveStockBillList oIF_MoveStockBillList = new DAL.Cls_S_IF_MoveStockBillList();
- if (oIF_MoveStockBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_MoveStockBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘閫�鏂欏崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_POStockInBackBillList oIF_POStockInBackBillList = new DAL.Cls_S_IF_POStockInBackBillList();
- if (oIF_POStockInBackBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POStockInBackBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐢熶骇閫�鏂欏崟")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_MateOutBackBillList oIF_MateOutBackBillList = new DAL.Cls_S_IF_MateOutBackBillList();
- if (oIF_MateOutBackBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_MateOutBackBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "缁勮鎷嗗嵏鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_PackageDismantleBillList oIF_PackageDismantleBillList = new DAL.Cls_S_IF_PackageDismantleBillList();
- if (oIF_PackageDismantleBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "宸ュ簭娴佽浆鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
- if (oIF_ProcessExchangeBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "宸ュ簭姹囨姤鍗�")
- {
- string sWhere = " and HOrgID =" + HOrgID.ToString();
- DAL.Cls_S_IF_ProcessReportBillList oIF_ProcessReportBillList = new DAL.Cls_S_IF_ProcessReportBillList();
- if (oIF_ProcessReportBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_ProcessReportBillList.oBillSelectColl);
- }
- }
- else
- {
-
- }
- }
-
+
private void FillSelectData(List<DBUtility.BillSelect> oList)
{
DataSet Ds;
@@ -1837,51 +1611,8 @@
grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
}
- if (CampanyName == "涓帶")
- {
- grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
- }
- else
- {
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
- }
- if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�" || cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
- || cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟" || cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
- {
- grdMain.Rows[i].Cells[HInnerBillNoCol].Value = oTable.Rows[0]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
- grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
- grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
- grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
- if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
- {
- if (oTable.Rows[0]["鏄惁璧犲搧"].ToString() == "鏄�")
- {
- grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 1;
- }
- else
- {
- grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 0;
- }
- grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oTable.Rows[0]["閿�鍞鍗曞彿"].ToString();
- grdMain.Rows[i].Cells[HSeOrderSEQCol].Value = oTable.Rows[0]["閿�鍞鍗曡鍙�"].ToString();
- }
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
- }
- if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
- {
- grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
- grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠ｇ爜"].ToString();
- grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
- }
- if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
- {
- grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
- grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["浠撳簱浠ｇ爜"].ToString();
- grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["浠撳簱"].ToString();
- grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
- grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["浠撲綅浠ｇ爜"].ToString();
- grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["浠撲綅"].ToString();
- }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1951,10 +1682,6 @@
grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
}
- if (CampanyName == "涓帶")
- {
- grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
- }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1971,117 +1698,9 @@
RowCount(i, 0);
}
- #endregion
- #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夊洖杞﹂敭杩斿洖
- private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
- {
- if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
- {
- if (txtHSourceBillNo.Text.Length < 4)
- {
- MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
- return;
- }
- //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
- if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
- {
- DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
- //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
- if (SourceQtyCtl == "N")
- {
- if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0")) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else
- {
- if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
- {
- DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
- if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
- {
- DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
- if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POInStockBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
- {
- DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
- if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_POOrderBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
- {
- DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
- if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
- {
- FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
- txtHSourceBillNo.Text = "";
- }
- else
- {
- MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
- return;
- }
- }
- else
- {
- MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
- return;
- }
- }
- }
-
- #endregion
-
+
#region //鎵撳嵃璁剧疆
@@ -2327,28 +1946,28 @@
#region 閫夋嫨鏃ユ湡
private void dtpHDate_ValueChanged(object sender, EventArgs e)
{
- if (chkUpdateSubDate.Checked == true)
- {
- for (int j = 0; j < grdMain.Rows.Count; j++)
- {
- long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
- if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
- {
- //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
- DateTime HProduceDate = dtpHDate.Value; //鐢熶骇鏃ユ湡
- string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
- int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
- //鐢熶骇鏃ユ湡
- grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //if (chkUpdateSubDate.Checked == true)
+ //{
+ // for (int j = 0; j < grdMain.Rows.Count; j++)
+ // {
+ // long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ // if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
+ // {
+ // //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
+ // DateTime HProduceDate = dtpHDate.Value; //鐢熶骇鏃ユ湡
+ // string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ // int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ // //鐢熶骇鏃ユ湡
+ // grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
- if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
- {
- //鏈夋晥鏈熻嚦
- grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
- }
- }
- }
- }
+ // if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ // {
+ // //鏈夋晥鏈熻嚦
+ // grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
+ // }
+ // }
+ // }
+ //}
}
#endregion
@@ -2479,17 +2098,9 @@
grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell3;
//缃戞牸涓嬫媺閫夋嫨妗�
DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
- if (CampanyName == "涓帶")
- {
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
- else
- {
- column.Items.Add("鍞竴鏉＄爜");
- column.Items.Add("鎵规鏉＄爜");
- column.Items.Add("鍝佺鏉＄爜");
- }
+
+ column.Items.Add("鍞竴鏉＄爜");
+
grdMain.Rows[row + r].Cells[HBarCodeTypeCol] = column;
}
DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs"
index 6233030..8fd84e7 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs"
@@ -58,20 +58,13 @@
this.tc = new System.Windows.Forms.ToolStripButton();
this.lblCaption = new System.Windows.Forms.Label();
this.P1 = new System.Windows.Forms.Panel();
- this.pb1 = new System.Windows.Forms.ProgressBar();
this.pic1 = new System.Windows.Forms.PictureBox();
this.gbUp = new System.Windows.Forms.GroupBox();
- this.chkUpdateSubDate = new System.Windows.Forms.CheckBox();
this.dtpHDate = new System.Windows.Forms.DateTimePicker();
this.label2 = new System.Windows.Forms.Label();
this.cmbHOrgID = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
this.cmdHEmpID = new System.Windows.Forms.Button();
- this.cmdSourceBillNo = new System.Windows.Forms.Button();
- this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
- this.label14 = new System.Windows.Forms.Label();
- this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
- this.label10 = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
this.txtHDeleteDate = new System.Windows.Forms.Label();
this.label25 = new System.Windows.Forms.Label();
@@ -152,7 +145,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1017, 50);
+ this.Tool.Size = new System.Drawing.Size(2034, 100);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -202,7 +195,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 100);
//
// AddRow
//
@@ -249,7 +242,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 100);
//
// bc
//
@@ -282,7 +275,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 100);
//
// kc
//
@@ -301,13 +294,13 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 100);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 100);
//
// tb
//
@@ -327,7 +320,7 @@
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 100);
//
// gl
//
@@ -346,7 +339,7 @@
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 100);
//
// BatchNo
//
@@ -365,7 +358,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 100);
//
// mrlk
//
@@ -375,7 +368,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(114, 94);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -385,7 +378,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 100);
//
// bclk
//
@@ -395,7 +388,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(114, 94);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -405,7 +398,7 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 100);
//
// tc
//
@@ -425,37 +418,32 @@
//
this.lblCaption.AutoSize = true;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(501, 12);
+ this.lblCaption.Location = new System.Drawing.Point(1002, 24);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.Size = new System.Drawing.Size(173, 38);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
// P1
//
this.P1.BackColor = System.Drawing.Color.Lavender;
- this.P1.Controls.Add(this.pb1);
this.P1.Controls.Add(this.pic1);
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(41, 50);
+ this.P1.Location = new System.Drawing.Point(82, 100);
+ this.P1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(937, 137);
+ this.P1.Size = new System.Drawing.Size(1874, 196);
this.P1.TabIndex = 31;
- //
- // pb1
- //
- this.pb1.Location = new System.Drawing.Point(76, 12);
- this.pb1.Name = "pb1";
- this.pb1.Size = new System.Drawing.Size(256, 23);
- this.pb1.TabIndex = 93;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(313, 3);
+ this.pic1.Location = new System.Drawing.Point(626, 6);
+ this.pic1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(78, 41);
+ this.pic1.Size = new System.Drawing.Size(156, 82);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -464,51 +452,36 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
- this.gbUp.Controls.Add(this.chkUpdateSubDate);
this.gbUp.Controls.Add(this.dtpHDate);
this.gbUp.Controls.Add(this.label2);
this.gbUp.Controls.Add(this.cmbHOrgID);
this.gbUp.Controls.Add(this.label3);
this.gbUp.Controls.Add(this.cmdHEmpID);
- this.gbUp.Controls.Add(this.cmdSourceBillNo);
- this.gbUp.Controls.Add(this.txtHSourceBillNo);
- this.gbUp.Controls.Add(this.label14);
- this.gbUp.Controls.Add(this.cmbSourceBillType);
- this.gbUp.Controls.Add(this.label10);
- this.gbUp.Location = new System.Drawing.Point(14, 39);
+ this.gbUp.Location = new System.Drawing.Point(28, 78);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(892, 80);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.gbUp.Size = new System.Drawing.Size(1784, 103);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
- //
- // chkUpdateSubDate
- //
- this.chkUpdateSubDate.AutoSize = true;
- this.chkUpdateSubDate.Location = new System.Drawing.Point(596, 24);
- this.chkUpdateSubDate.Margin = new System.Windows.Forms.Padding(2);
- this.chkUpdateSubDate.Name = "chkUpdateSubDate";
- this.chkUpdateSubDate.Size = new System.Drawing.Size(120, 16);
- this.chkUpdateSubDate.TabIndex = 103;
- this.chkUpdateSubDate.Text = "鎵归噺鏇存柊鐢熶骇鏃ユ湡";
- this.chkUpdateSubDate.UseVisualStyleBackColor = true;
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(394, 17);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Location = new System.Drawing.Point(788, 34);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(188, 21);
+ this.dtpHDate.Size = new System.Drawing.Size(372, 35);
this.dtpHDate.TabIndex = 96;
this.dtpHDate.ValueChanged += new System.EventHandler(this.dtpHDate_ValueChanged);
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(327, 21);
- this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label2.Location = new System.Drawing.Point(654, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(106, 24);
this.label2.TabIndex = 95;
this.label2.Text = "鏃� 鏈�";
//
@@ -516,9 +489,10 @@
//
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
+ this.cmbHOrgID.Location = new System.Drawing.Point(202, 34);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+ this.cmbHOrgID.Size = new System.Drawing.Size(372, 32);
this.cmbHOrgID.TabIndex = 85;
this.cmbHOrgID.SelectionChangeCommitted += new System.EventHandler(this.cmbHOrgID_SelectionChangeCommitted);
//
@@ -526,9 +500,10 @@
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(35, 21);
+ this.label3.Location = new System.Drawing.Point(70, 42);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(53, 12);
+ this.label3.Size = new System.Drawing.Size(106, 24);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
//
@@ -537,62 +512,13 @@
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(892, -7);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1784, -14);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHEmpID.Size = new System.Drawing.Size(44, 44);
this.cmdHEmpID.TabIndex = 79;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
- //
- // cmdSourceBillNo
- //
- this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
- this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
- this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
- this.cmdSourceBillNo.TabIndex = 42;
- this.cmdSourceBillNo.UseVisualStyleBackColor = true;
- this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
- //
- // txtHSourceBillNo
- //
- this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
- this.txtHSourceBillNo.Name = "txtHSourceBillNo";
- this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
- this.txtHSourceBillNo.TabIndex = 41;
- this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
- //
- // label14
- //
- this.label14.AutoSize = true;
- this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(327, 50);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(53, 12);
- this.label14.TabIndex = 40;
- this.label14.Text = "閫� 鍗� 鍙�";
- //
- // cmbSourceBillType
- //
- this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbSourceBillType.FormattingEnabled = true;
- this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
- this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
- this.cmbSourceBillType.TabIndex = 36;
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(35, 50);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
- this.label10.TabIndex = 35;
- this.label10.Text = "婧愬崟绫诲瀷";
//
// panel2
//
@@ -618,18 +544,20 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(41, 506);
+ this.panel2.Location = new System.Drawing.Point(82, 1012);
+ this.panel2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(937, 93);
+ this.panel2.Size = new System.Drawing.Size(1874, 186);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
//
this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(1450, 94);
+ this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(196, 30);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -637,9 +565,10 @@
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(666, 50);
+ this.label25.Location = new System.Drawing.Point(1332, 100);
+ this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(53, 12);
+ this.label25.Size = new System.Drawing.Size(106, 24);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -647,9 +576,10 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(1450, 24);
+ this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(196, 30);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -657,9 +587,10 @@
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(666, 12);
+ this.label27.Location = new System.Drawing.Point(1332, 24);
+ this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(41, 12);
+ this.label27.Size = new System.Drawing.Size(82, 24);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -667,9 +598,10 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(1124, 94);
+ this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(196, 30);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -677,9 +609,10 @@
this.label23.AutoSize = true;
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(503, 47);
+ this.label23.Location = new System.Drawing.Point(1006, 94);
+ this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(53, 12);
+ this.label23.Size = new System.Drawing.Size(106, 24);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -687,9 +620,10 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
+ this.txtHUpDater.Location = new System.Drawing.Point(1124, 24);
+ this.txtHUpDater.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDater.Size = new System.Drawing.Size(196, 30);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -697,9 +631,10 @@
this.label21.AutoSize = true;
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(503, 12);
+ this.label21.Location = new System.Drawing.Point(1006, 24);
+ this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(41, 12);
+ this.label21.Size = new System.Drawing.Size(82, 24);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -707,9 +642,10 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
+ this.txtHCloseDate.Location = new System.Drawing.Point(794, 94);
+ this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseDate.Size = new System.Drawing.Size(196, 30);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -717,9 +653,10 @@
this.label19.AutoSize = true;
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(338, 50);
+ this.label19.Location = new System.Drawing.Point(676, 100);
+ this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(53, 12);
+ this.label19.Size = new System.Drawing.Size(106, 24);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -727,9 +664,10 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
+ this.txtHCloseMan.Location = new System.Drawing.Point(792, 26);
+ this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseMan.Size = new System.Drawing.Size(196, 30);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -737,9 +675,10 @@
this.label17.AutoSize = true;
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(338, 16);
+ this.label17.Location = new System.Drawing.Point(676, 32);
+ this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(41, 12);
+ this.label17.Size = new System.Drawing.Size(82, 24);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -747,9 +686,10 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
+ this.txtHCheckDate.Location = new System.Drawing.Point(468, 94);
+ this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCheckDate.Size = new System.Drawing.Size(196, 30);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -757,9 +697,10 @@
this.label15.AutoSize = true;
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(175, 50);
+ this.label15.Location = new System.Drawing.Point(350, 100);
+ this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(53, 12);
+ this.label15.Size = new System.Drawing.Size(106, 24);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -767,9 +708,10 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(234, 13);
+ this.txtHChecker.Location = new System.Drawing.Point(468, 26);
+ this.txtHChecker.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(98, 15);
+ this.txtHChecker.Size = new System.Drawing.Size(196, 30);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -777,9 +719,10 @@
this.label13.AutoSize = true;
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(175, 16);
+ this.label13.Location = new System.Drawing.Point(350, 32);
+ this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(41, 12);
+ this.label13.Size = new System.Drawing.Size(82, 24);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -787,9 +730,10 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
+ this.txtHMakeDate.Location = new System.Drawing.Point(142, 94);
+ this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHMakeDate.Size = new System.Drawing.Size(196, 30);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -797,9 +741,10 @@
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(12, 50);
+ this.label11.Location = new System.Drawing.Point(24, 100);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.Size = new System.Drawing.Size(106, 24);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -807,9 +752,10 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(71, 13);
+ this.txtHMaker.Location = new System.Drawing.Point(142, 26);
+ this.txtHMaker.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(98, 15);
+ this.txtHMaker.Size = new System.Drawing.Size(196, 30);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -817,9 +763,10 @@
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(12, 16);
+ this.label8.Location = new System.Drawing.Point(24, 32);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(41, 12);
+ this.label8.Size = new System.Drawing.Size(82, 24);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -831,17 +778,19 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 50);
+ this.panel1.Location = new System.Drawing.Point(0, 100);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(41, 549);
+ this.panel1.Size = new System.Drawing.Size(82, 1098);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Location = new System.Drawing.Point(1956, 100);
+ this.panel3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(39, 549);
+ this.panel3.Size = new System.Drawing.Size(78, 1098);
this.panel3.TabIndex = 34;
//
// grdSum
@@ -851,32 +800,35 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(41, 487);
+ this.grdSum.Location = new System.Drawing.Point(82, 974);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(937, 19);
+ this.grdSum.Size = new System.Drawing.Size(1874, 38);
this.grdSum.TabIndex = 45;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(809, 543);
+ this.grdPrint.Location = new System.Drawing.Point(1618, 1086);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(50, 48);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Location = new System.Drawing.Point(8, 39);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(929, 274);
+ this.tabPage3.Size = new System.Drawing.Size(1858, 553);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "鏉＄爜鏄庣粏";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -891,20 +843,22 @@
this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdList.Location = new System.Drawing.Point(0, 0);
+ this.grdList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(929, 274);
+ this.grdList.Size = new System.Drawing.Size(1858, 553);
this.grdList.TabIndex = 46;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(8, 39);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(929, 274);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabPage1.Size = new System.Drawing.Size(1858, 631);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -918,12 +872,13 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(6, 6);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(923, 268);
+ this.grdMain.Size = new System.Drawing.Size(1846, 619);
this.grdMain.TabIndex = 44;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -938,18 +893,19 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(41, 187);
+ this.tabControl1.Location = new System.Drawing.Point(82, 296);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(937, 300);
+ this.tabControl1.Size = new System.Drawing.Size(1874, 678);
this.tabControl1.TabIndex = 47;
//
// Gy_BarCodeBill_Rework
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1017, 599);
+ this.ClientSize = new System.Drawing.Size(2034, 1198);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -960,6 +916,7 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.Name = "Gy_BarCodeBill_Rework";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1021,11 +978,6 @@
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripButton DelRow;
private System.Windows.Forms.GroupBox gbUp;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.ComboBox cmbSourceBillType;
- private System.Windows.Forms.Button cmdSourceBillNo;
- private System.Windows.Forms.TextBox txtHSourceBillNo;
- private System.Windows.Forms.Label label14;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripButton mrlk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
@@ -1047,7 +999,6 @@
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.TabControl tabControl1;
- private System.Windows.Forms.ProgressBar pb1;
private System.Windows.Forms.ToolStripButton sdy;
private System.Windows.Forms.ToolStripButton spRow;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
@@ -1061,6 +1012,5 @@
private System.Windows.Forms.ToolStripButton gl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.ToolStripButton BatchNo;
- private System.Windows.Forms.CheckBox chkUpdateSubDate;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx"
index 4269726..0700745 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx"
@@ -360,7 +360,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
<data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -396,7 +396,7 @@
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -407,7 +407,7 @@
<data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -418,7 +418,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -428,7 +428,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -443,7 +443,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -452,7 +452,7 @@
<data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -463,7 +463,7 @@
<data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -478,7 +478,7 @@
<data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -492,7 +492,7 @@
<data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -502,7 +502,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -517,7 +517,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -532,7 +532,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -542,21 +542,6 @@
<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>
- <data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
/yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
/73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
/6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
new file mode 100644
index 0000000..570e76b
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
@@ -0,0 +1,2043 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.Threading;
+
+namespace WarM
+{
+ public partial class Gy_BarCodeBill_XiaBao : Form
+ {
+ public Gy_BarCodeBill_XiaBao()
+ {
+ InitializeComponent();
+ }
+ //瀹氫箟
+ public const Int16 HTagCol = 0;
+ public const Int16 HSnoCol = 1;
+ public const Int16 HMainIDCol = 2;
+ public const Int16 HSubIDCol = 3;
+ public const Int16 HBillNoCol = 4;
+ public const Int16 HBillTypeCol = 5;
+ public const Int16 HMaterIDCol = 6;
+ public const Int16 HMaterNumberCol = 7;
+ public const Int16 HMaterNameCol = 8;
+ public const Int16 HPinfanCol = 9;
+ public const Int16 HMaterModelCol = 10;
+ public const Int16 HAuxPropIDCol = 11;
+ public const Int16 HAuxPropNumberCol = 12;
+ public const Int16 HAuxPropNameCol = 13;
+ public const Int16 HBatchManagerCol = 14;
+ public const Int16 HBatchNoCol = 15;
+ public const Int16 HBarCodeTypeCol = 16;
+ public const Int16 HQtyCol = 17;
+ public const Int16 HMinQtyCol = 18;
+ public const Int16 HBQtyCol = 19;
+ public const Int16 HinitQtyCol = 20;
+ public const Int16 HISKFPERIODCol = 21;
+ public const Int16 HProduceDateCol = 22;
+ public const Int16 HExpiryDateCol = 23;
+ public const Int16 HEXPUNITCol = 24;
+ public const Int16 HEXPPERIODCol = 25;
+ public const Int16 HGiveAwayFlagCol = 26;
+ public const Int16 HUnitIDCol = 27;
+ public const Int16 HUnitNumberCol = 28;
+ public const Int16 HUnitNameCol = 29;
+ public const Int16 HWhIDCol = 30;
+ public const Int16 HWhNumberCol = 31;
+ public const Int16 HWhNameCol = 32;
+ public const Int16 HSPIDCol = 33;
+ public const Int16 HSPNumberCol = 34;
+ public const Int16 HSPNameCol = 35;
+ public const Int16 HMTONoCol = 36;
+ public const Int16 HRemarkCol = 37;
+ public const Int16 HDeptIDCol = 38;
+ public const Int16 HDeptNumberCol = 39;
+ public const Int16 HDeptNameCol = 40;
+ public const Int16 HSourceIDCol = 41;
+ public const Int16 HSourceNumberCol = 42;
+ public const Int16 HSourceNameCol = 43;
+ public const Int16 HSupIDCol = 44;
+ public const Int16 HSupNumberCol = 45;
+ public const Int16 HSupNameCol = 46;
+ public const Int16 HGroupIDCol = 47;
+ public const Int16 HGroupNumberCol = 48;
+ public const Int16 HGroupNameCol = 49;
+ public const Int16 HCusIDCol = 50;
+ public const Int16 HCusNumberCol = 51;
+ public const Int16 HCusNameCol = 52;
+ public const Int16 HCusTypeCol = 53;
+ public const Int16 HSeOrderBillNoCol = 54;
+ public const Int16 HSeOrderSEQCol = 55;
+ public const Int16 HInnerBillNoCol = 56;
+ public const Int16 HEndDateCol = 57;
+ public const Int16 HSourceBillQtyCol = 58;
+ public const Int16 HAuxPropFlagCol = 59;
+ public const Int16 HBarCodeCol = 60; //鏉＄爜缂栧彿
+ public const Int16 HTMNumberCol = 61; //鏉＄爜鍓嶇紑
+ public const Int16 HLSHCol = 62; //鐢熸垚鏉＄爜鏃惰幏鍙栧搴旀祦姘村彿
+ public const Int16 HBarcodeNoCol = 63; //璁板綍闇�鍥炲～鐨勬祦姘村彿鏁伴噺
+ //
+ public string ModName = "85";
+ public string ModCaption = "璋冩嫧鏉＄爜鐢熸垚";
+ public const string ModRightName = "Gy_BarCodeBill_XiaBao";
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DBUtility.ClsXt_BaseBill BaseBill;
+ public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public Frm_Split oDlg = new Frm_Split();
+ public bool grdStatus;
+ public int selectRow = 0;
+ public Int64 HInterID = 0; //鍐呯爜
+ public Int64 HOrgID = ClsPub.HOrgID;
+ public string HOrgNumber = ClsPub.HOrgNumber;
+ public string HOrgName = ClsPub.HOrgName;
+ public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
+ public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ public string sReturn = "";
+ public string HExpiryDate = "";
+
+ #region 鍥哄畾浠ｇ爜
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ cmbSourceBillType.Items.Clear();
+ cmbSourceBillType.Items.Add("璋冩嫧鐢宠鍗�");
+
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ //鑾峰彇褰撳墠缁勭粐
+ DataSet Ds1 = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS with(nolock) where HItemID=" + ClsPub.HOrgID, "Xt_ORGANIZATIONS", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds1.Tables[0].Rows.Count != 0)
+ {
+ cmbHOrgID.Text = DBUtility.ClsPub.isStrNull(Ds1.Tables[0].Rows[0]["HName"]);
+ }
+
+ txtHMaker.Text = ClsPub.CurUserName;
+ txtHMakeDate.Text = "";
+ txtHChecker.Text = "";
+ txtHCheckDate.Text = "";
+ txtHCloseMan.Text = "";
+ txtHCloseDate.Text = "";
+ txtHDeleteMan.Text = "";
+ txtHDeleteDate.Text = "";
+ txtHUpDater.Text = "";
+ txtHUpDateDate.Text = "";
+ initGrid();
+ grdList.DataSource = null;
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdList, this.Name + "grdList");
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdList, this.Name + "grdList");
+ }
+
+ //澧炶鎸夐挳
+ private void AddRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.AddRow(oSumGrid);
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤杈呭姪灞炴��
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = grdMain.Rows[i].Cells[HAuxPropFlagCol].Value != null ? grdMain.Rows[i].Cells[HAuxPropFlagCol].Value : 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HAuxPropFlagCol] = oCell;
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = grdMain.Rows[i].Cells[HBatchManagerCol].Value != null ? grdMain.Rows[i].Cells[HBatchManagerCol].Value : 0;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = grdMain.Rows[i].Cells[HISKFPERIODCol].Value != null ? grdMain.Rows[i].Cells[HISKFPERIODCol].Value : 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value != null ? grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value : 0;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("鍞竴鏉＄爜");
+ grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
+ if(ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+ {
+ grdMain.Rows[i].Cells[HBarCodeTypeCol].Value = "鍞竴鏉＄爜";
+ }
+ }
+ }
+
+ //鍒犺鎸夌航
+ private void DelRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DelRow(oSumGrid);
+ //璁剧疆鐗规畩鍒�
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤杈呭姪灞炴��
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count-1].Cells[HAuxPropFlagCol] = oCell;
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = 0;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count - 1].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count - 1].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = 0;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count - 1].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("鍞竴鏉＄爜");
+ grdMain.Rows[grdMain.Rows.Count - 1].Cells[HBarCodeTypeCol] = column;
+ }
+
+ //淇濆瓨鎸夐挳
+ private void bc_Click(object sender, EventArgs e)
+ {
+ this.Sub_SaveBill();
+ Display();
+ }
+
+ //閲嶇疆鎸夌航
+ private void cz_Click(object sender, EventArgs e)
+ {
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew || BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ {
+ if (MessageBox.Show("纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ this.Sub_AddBill();
+ }
+ }
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ tabControl1.SelectedIndex = 0;
+ }
+
+ //鏂板鍗曟嵁
+ private void Sub_AddBill()
+ {
+ this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ this.Sub_OperStatus();//璁剧疆TOOLBAR
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+ }
+
+ //閫�鍑烘寜閽�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ //绂诲紑鍗曞厓鏍�
+ private void grdMain_LeaveCell(object sender, EventArgs e)
+ {
+ oSumGrid.LeaveCell();
+ }
+
+ //缃戞牸鍗曞厓鏍煎彉鍖栦簨浠�
+ private void grdMain_RowColChange(object sender, EventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void Gy_BarCodeBill_XiaBao_Paint(object sender, PaintEventArgs e)//鐢荤嚎
+ {
+ Graphics g = this.panel2.CreateGraphics();
+ Pen p = new Pen(Color.Gray);
+ p.Width = 1;
+ g.DrawLine(p, new Point(txtHMaker.Left, txtHMaker.Top + txtHMaker.Height), new Point(txtHMaker.Left + txtHMaker.Width, txtHMaker.Top + txtHMaker.Height));
+ g.DrawLine(p, new Point(txtHMakeDate.Left, txtHMakeDate.Top + txtHMakeDate.Height), new Point(txtHMakeDate.Left + txtHMakeDate.Width, txtHMakeDate.Top + txtHMakeDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHChecker.Left, txtHChecker.Top + txtHChecker.Height), new Point(txtHChecker.Left + txtHChecker.Width, txtHChecker.Top + txtHChecker.Height));
+ g.DrawLine(p, new Point(txtHCheckDate.Left, txtHCheckDate.Top + txtHCheckDate.Height), new Point(txtHCheckDate.Left + txtHCheckDate.Width, txtHCheckDate.Top + txtHCheckDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHCloseMan.Left, txtHCloseMan.Top + txtHCloseMan.Height), new Point(txtHCloseMan.Left + txtHCloseMan.Width, txtHCloseMan.Top + txtHCloseMan.Height));
+ g.DrawLine(p, new Point(txtHCloseDate.Left, txtHCloseDate.Top + txtHCloseDate.Height), new Point(txtHCloseDate.Left + txtHCloseDate.Width, txtHCloseDate.Top + txtHCloseDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHDeleteMan.Left, txtHDeleteMan.Top + txtHDeleteMan.Height), new Point(txtHDeleteMan.Left + txtHDeleteMan.Width, txtHDeleteMan.Top + txtHDeleteMan.Height));
+ g.DrawLine(p, new Point(txtHDeleteDate.Left, txtHDeleteDate.Top + txtHDeleteDate.Height), new Point(txtHDeleteDate.Left + txtHDeleteDate.Width, txtHDeleteDate.Top + txtHDeleteDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHUpDater.Left, txtHUpDater.Top + txtHUpDater.Height), new Point(txtHUpDater.Left + txtHUpDater.Width, txtHUpDater.Top + txtHUpDater.Height));
+ g.DrawLine(p, new Point(txtHUpDateDate.Left, txtHUpDateDate.Top + txtHUpDateDate.Height), new Point(txtHUpDateDate.Left + txtHUpDateDate.Width, txtHUpDateDate.Top + txtHUpDateDate.Height));
+ //鎺т欢浣嶇疆璁剧疆
+
+ }
+
+ //鎺т欢浣嶇疆
+ private void Sub_ControlLocation()
+ {
+ //gbUp.Width = P1.Width - 20;
+ //gbUp.Left = 10;
+ //gbUp.Height = P1.Height - 35;
+ //gbUp.Top = 30;
+ }
+
+ //绐椾綋鍔犺浇
+ private void Gy_BarCodeBill_XiaBao_Load(object sender, EventArgs e)
+ {
+ //鎵撳嵃鍒濆鍖�
+ oSumGrid.NoCol = HSnoCol;
+ oSumGrid.ogrdMain = grdMain;
+ oSumGrid.oGridsum = grdSum;
+ this.Text = ModCaption;
+ this.lblCaption.Text = ModCaption;
+ //鍔犺浇缁勭粐淇℃伅
+ Sub_AddOrdList();
+
+ //鑾峰彇绯荤粺鍙傛暟
+ ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ CampanyName = oSystemParameter.omodel.WMS_CampanyName; //瀹㈡埛瀹氬埗鍖栧悕绉�
+ SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl; //瓒呮簮鍗曟暟閲忔帶鍒�
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ }
+ }
+
+ //鍔犺浇缁勭粐淇℃伅
+ private void Sub_AddOrdList()
+ {
+ DataSet ds;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ ds = oClsGy_ORGANIZATIONS_View.GetList();
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇缁勭粐澶辫触");
+ return;
+ }
+ cmbHOrgID.DataSource = null;
+ cmbHOrgID.Items.Clear();
+ cmbHOrgID.DataSource = ds.Tables[0];
+ cmbHOrgID.DisplayMember = "HName";
+ cmbHOrgID.ValueMember = "HItemID";
+ }
+
+ //绐椾綋灏哄鍙樺寲鏃�
+ private void Gy_BarCodeBill_XiaBao_Resize(object sender, EventArgs e)
+ {
+ //Sub_ControlLocation();
+ }
+
+ //鏍规嵁缂栬緫鐘舵�� 璁剧疆 鎺т欢鏄惁鍏佽褰曞叆
+ private void Sub_LrtextStatus(bool TextEnabled)
+ {
+ if (TextEnabled == true)
+ {
+ //鎺т欢鍏ㄩ儴鏈夋晥
+ gbUp.Enabled = true;
+ grdMain.BackColor = ClsPub.EditColor;
+ }
+ else
+ { //鎺т欢鍏ㄩ儴鏃犳晥
+ gbUp.Enabled = false;
+ grdMain.BackColor = ClsPub.ViewColor;
+ }
+ }
+
+ //timer
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ Sub_ControlLocation();
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ {
+ //this.Sub_ShowBill();
+ }
+ else
+ {
+ this.Sub_AddBill();
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //绐椾綋鍗歌浇
+ private void Gy_BarCodeBill_XiaBao_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //TOOLBAR鐘舵�� 鎸夐挳鏄惁鐏板害
+ public void Sub_OperStatus()
+ {
+ switch (BillStatus)
+ {
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
+ //娴忚鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ tc.Enabled = true;
+ //鏈鏍�
+ if (txtHChecker.Text.Trim() == "")
+ {
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ }
+ else if (txtHCloseMan.Text.Trim() == "" && txtHChecker.Text.Trim() != "")//瀹℃牳鏈叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Checked.jpg");
+ //
+ }
+ else//宸插叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Closed.jpg");
+ //
+ }
+ if (txtHDeleteMan.Text.Trim() == "")
+ {
+ }
+ else //宸蹭綔搴�
+ {
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Deleted.jpg");
+ //
+ }
+ Sub_LrtextStatus(false);
+ grdStatus = false;
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
+ //鏂板鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
+ //淇敼鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ }
+ }
+
+ #endregion
+
+
+ #region 鐢熸垚鏉＄爜
+
+ private bool Sub_SaveBill()
+ {
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ lblCaption.Focus();
+ //鐢熸垚鏉＄爜鍓嶆帶鍒�
+ if (!Sub_AllowSave())
+ {
+ return false;
+ }
+ bc.Enabled = false;
+ SaveBarCode();
+ return true;
+ }
+
+ #region 鐢熸垚鏉＄爜鍓嶆帶鍒�
+ private bool Sub_AllowSave()
+ {
+ string sHRemark = "";
+ string sHRemark2 = "";
+ //鏄庣粏琛ㄦ槸鍚︿负闆惰
+ bool b = false;
+ for (int i = 0; i < grdMain.RowCount; i++)
+ {
+ if (!IsNullRow(i))
+ {
+ b = true;
+ break;
+ }
+ }
+ if (b == false)
+ {
+ MessageBox.Show("鏄庣粏琛屼笉瀛樺湪锛�", "鎻愮ず");
+ return false;
+ }
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ sHRemark2 = "";
+ long HSno = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value); // 搴忓彿
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ string HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value); // 鐗╂枡浠ｇ爜
+ bool HBatchManager = DBUtility.ClsPub.isBool(grdMain.Rows[j].Cells[HBatchManagerCol].Value); // 鏄惁鍚敤鎵瑰彿
+ string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value); // 鎵瑰彿
+ bool HAuxPropFlag = DBUtility.ClsPub.isBool(grdMain.Rows[j].Cells[HAuxPropFlagCol].Value); // 鏄惁鍚敤杈呭姪灞炴��
+ long HAuxPropID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value); // 杈呭姪灞炴�D
+ double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value); // 鏈�灏忓寘瑁呮暟
+ bool HISKFPERIOD = DBUtility.ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value); // 鏄惁鍚敤淇濊川鏈�
+ DateTime HProduceDate = DBUtility.ClsPub.isDate(grdMain.Rows[j].Cells[HProduceDateCol].Value); // 鐢熶骇鏃ユ湡
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); // 淇濊川鏈熷崟浣�
+ long HEXPPERIOD = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); // 淇濊川鏈�
+
+ if (HMaterID != 0)
+ {
+ if(HMinQty<=0)
+ {
+ sHRemark2 = sHRemark2 + "閲嶉噺涓嶅厑璁稿皬浜庣瓑浜�0锛�";
+ }
+ if (HBatchManager && HBatchNo=="")
+ {
+ sHRemark2 = sHRemark2 + "鐗╂枡鍚敤鎵规绠＄悊锛屾壒娆′笉鍏佽涓虹┖锛�";
+ }
+ else if (!HBatchManager && HBatchNo != "")
+ {
+ sHRemark2 = sHRemark2 + "鐗╂枡鏈惎鐢ㄦ壒娆＄鐞嗭紝涓嶅厑璁告湁鎵规锛�";
+ }
+ if (HAuxPropFlag && HAuxPropID == 0)
+ {
+ sHRemark2 = sHRemark2 + "鐗╂枡鍚敤杈呭姪灞炴�х鐞嗭紝杈呭姪灞炴�т笉鍏佽涓虹┖锛�";
+ }
+ else if (!HAuxPropFlag && HAuxPropID != 0)
+ {
+ sHRemark2 = sHRemark2 + "鐗╂枡鏈惎鐢ㄨ緟鍔╁睘鎬х鐞嗭紝涓嶅厑璁告湁杈呭姪灞炴�э紱";
+ }
+ if (HISKFPERIOD && (HEXPUNIT=="" || HEXPPERIOD==0))
+ {
+ sHRemark2 = sHRemark2 + "鐗╂枡鍚敤淇濊川鏈熺鐞嗭紝鐗╂枡鍩虹璧勬枡涓殑淇濊川鏈熷崟浣嶃�佷繚璐ㄦ湡涓嶅厑璁镐负绌猴紱";
+ }
+ //鍒ゆ柇褰曞叆鐨勭敓浜ф棩鏈熴�佹湁鏁堟湡鑷虫槸鍚︽纭�
+ if (HISKFPERIOD && HProduceDate < DBUtility.ClsPub.isDate("2000-01-01"))
+ {
+ sHRemark2 = sHRemark2 + "鍚敤淇濊川鏈熺鐞嗭紝鐢熶骇鏃ユ湡褰曞叆閿欒锛�";
+ }
+ else if (HISKFPERIOD && ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
+ {
+ sHRemark2 = sHRemark2 + "鍚敤淇濊川鏈熺鐞嗭紝鏈夋晥鏈熻嚦涓嶈兘涓虹┖锛�";
+ }
+
+ if (sHRemark2 != "")
+ {
+ sHRemark = sHRemark + " 绗�" + HSno + "琛岋紝鐗╂枡锛�" + HMaterNumber + sHRemark2;
+ }
+ }
+ }
+ if (sHRemark != "")
+ {
+ MessageBox.Show(sHRemark);
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
+ #region 鐢熸垚鏉＄爜
+ private void SaveBarCode()
+ {
+ try
+ {
+ string TM = ""; //鏉＄爜
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ Int64 HBQty = 0; //绠辨暟
+ Int64 LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string sMaterID = ""; //鐗╂枡ID杞崲鎴愬瓧绗�
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ DataSet Ds;
+ pb1.Value = 0;
+
+ Int64 HEntryID = 0; //瀛怚D
+ string HBarCode = ""; //鏉″舰鐮�
+ string HBarCodeType = ""; //鏉＄爜绫诲瀷
+ Int64 HMaterID = 0; //鐗╂枡ID
+ Int64 HUnitID = 0; //璁￠噺鍗曚綅ID
+ Int64 HAuxPropID = 0; //杈呭姪灞炴�D
+ string HBatchNo = ""; //鎵规鍙�
+ string HMTONo = ""; //MTO鍙�
+ double HQty = 0; //鏁伴噺
+ double HinitQty = 0; //鍒濆鍖栨暟閲忥紙鐢熸垚鏉＄爜鏃舵暟閲忥級
+ double HSourceBillQty = 0; //婧愬崟鍙敓鎴愭潯鐮佹暟閲�
+ bool HGiveAwayFlag = false; //鏄惁璧犲搧
+ string HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
+ string HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+ bool HISKFPERIOD = false; //鏄惁鍚敤淇濊川鏈�
+ string HEXPUNIT = ""; //淇濊川鏈熷崟浣�
+ double HEXPPERIOD = 0; //淇濊川鏈�
+ Int64 HWhID = 0; //浠撳簱ID
+ Int64 HSPID = 0; //浠撲綅ID
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HBarcodeNo = 0; //褰撳墠鎵樺彿
+ string HEndQty = ""; //灏炬暟
+ Int64 HSourceInterID = 0; //婧愬崟ID
+ Int64 HSourceEntryID = 0; //婧愬崟瀛怚D
+ string HSourceBillNo = ""; //婧愬崟鍗曞彿
+ string HSourceBillType = ""; //婧愬崟绫诲瀷
+ Int64 HInitSourceEntryID = 0; //鍒濆鍖栨簮鍗曞瓙ID锛堢敓鎴愭潯鐮佹椂婧愬崟瀛怚D锛�
+ string HRemark = ""; //澶囨敞
+ Int64 HPrintQty = 0; //鎵撳嵃娆℃暟
+ Int64 HSTOCKORGID = 0; //缁勭粐ID
+ Int64 HOWNERID = 0; //璐т富ID
+ Int64 HDeptID = 0; //閮ㄩ棬ID
+ Int64 HSupID = 0; //寰�鏉ュ崟浣岻D
+ Int64 HGroupID = 0; //鐢熶骇鐝粍ID
+ Int64 HCusID = 0; //瀹㈡埛ID
+ string HCusType = ""; //瀹㈡埛鍨嬪彿
+ string HSeOrderBillNo = ""; //閿�鍞鍗曞彿
+ Int64 HSeOrderSEQ = 0; //閿�鍞鍗曡鍙�
+ string HInnerBillNo = ""; //鍐呴儴閲囪喘璁㈠崟鍙�
+ string HWorkLineName = ""; //鐢熶骇绾�
+ string HMaterName = ""; //浜у搧鍚嶇О
+ string HMaterModel = ""; //浜у搧瑙勬牸鍨嬪彿
+ string HPinfan = ""; //鍝佺暘
+ DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
+
+ oCn.BeginTran();
+ Application.DoEvents();
+ pb1.Maximum = grdMain.Rows.Count;
+
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = dtpHDate.Value.ToShortDateString();
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+
+ //鑾峰彇绗瀵瑰簲鏉＄爜缂栧彿銆佹祦姘村彿淇℃伅绛�
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ sMaterID = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HBarCodeType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBarCodeTypeCol].Value);
+
+ if (HBarCodeType == "鍞竴鏉＄爜")
+ {
+ LSH = 0;
+ LSH2 = "";
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+
+ //寰幆鍒ゆ柇璇ヨ鍓嶉潰鎵�鏈夎涓槸鍚﹀瓨鍦ㄧ浉鍚岀墿鏂�
+ for (int i = 0; i < j; i++)
+ {
+ if(ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value)== ClsPub.isLong(grdMain.Rows[j - i - 1].Cells[HMaterIDCol].Value))
+ {
+ LSH = ClsPub.isLong(grdMain.Rows[j - i - 1].Cells[HLSHCol].Value);
+ HBarcodeNo = ClsPub.isLong(grdMain.Rows[j - i - 1].Cells[HBarcodeNoCol].Value);
+ break;
+ }
+ }
+ //璇ヨ鍓嶉潰鎵�鏈夎涓嶅瓨鍦ㄤ笌璇ヨ鐗╂枡鐩稿悓鐨勮锛岃幏鍙栨渶澶ф祦姘村彿
+ if (LSH == 0)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ grdMain.Rows[j].Cells[HBarCodeCol].Value = TM;
+ grdMain.Rows[j].Cells[HTMNumberCol].Value = sTMNumber;
+ grdMain.Rows[j].Cells[HLSHCol].Value = LSH;
+ grdMain.Rows[j].Cells[HBarcodeNoCol].Value = 1;
+ }
+ //璇ヨ鍓嶉潰鎵�鏈夎涓瓨鍦ㄤ笌璇ヨ鐗╂枡鐩稿悓鐨勮锛岃幏鍙栦笌璇ヨ鐩稿悓鐗╂枡鐨勫墠涓�琛屾祦姘村彿
+ else
+ {
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ grdMain.Rows[j].Cells[HBarCodeCol].Value = TM;
+ grdMain.Rows[j].Cells[HTMNumberCol].Value = sTMNumber;
+ grdMain.Rows[j].Cells[HLSHCol].Value = LSH;
+ grdMain.Rows[j].Cells[HBarcodeNoCol].Value = HBarcodeNo + 1;
+ }
+ }
+ else if (HBarCodeType == "鍝佺鏉＄爜")
+ {
+ TM = HOrgNumber + sMaterID;
+ grdMain.Rows[j].Cells[HBarCodeCol].Value = TM;
+ }
+ else if (HBarCodeType == "鎵规鏉＄爜")
+ {
+ TM = HOrgNumber + sMaterID + HBatchNo;
+ grdMain.Rows[j].Cells[HBarCodeCol].Value = TM;
+ }
+ else
+ {
+ MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
+ }
+ }
+
+ //灏嗘潯鐮佷俊鎭啓鍏ユ潯鐮佹。妗�
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HBQty = ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
+ HEntryID = j + 1;
+ HBarCode = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBarCodeCol].Value);
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
+ HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
+ HQty = HMinQty;
+ HinitQty = HMinQty;
+ HSourceBillQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HSourceBillQtyCol].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
+ HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
+ if (HISKFPERIOD)
+ {
+ HProduceDate = ClsPub.isStrNull(ClsPub.isDate(grdMain.Rows[j].Cells[HProduceDateCol].Value));
+ HExpiryDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value);
+ }
+ else
+ {
+ HProduceDate = "";
+ HExpiryDate = "";
+ }
+ HEXPUNIT = ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value);
+ HEXPPERIOD = ClsPub.isDoule(grdMain.Rows[j].Cells[HEXPPERIODCol].Value);
+ HWhID = ClsPub.isLong(grdMain.Rows[j].Cells[HWhIDCol].Value);
+ HSPID = ClsPub.isLong(grdMain.Rows[j].Cells[HSPIDCol].Value);
+ HBarcodeQtys = HBQty;
+ HBarcodeNo = ClsPub.isLong(grdMain.Rows[j].Cells[HBarcodeNoCol].Value);
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMainIDCol].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSubIDCol].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
+ HSourceBillType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillTypeCol].Value);
+ HInitSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSubIDCol].Value);
+ HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
+ HPrintQty = 0;
+ HSTOCKORGID = HOrgID;
+ HOWNERID = HOrgID;
+ HDeptID = ClsPub.isLong(grdMain.Rows[j].Cells[HDeptIDCol].Value);
+ HSupID = ClsPub.isLong(grdMain.Rows[j].Cells[HSupIDCol].Value);
+ HGroupID = ClsPub.isLong(grdMain.Rows[j].Cells[HGroupIDCol].Value);
+ HCusID = ClsPub.isLong(grdMain.Rows[j].Cells[HCusIDCol].Value);
+ HCusType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusTypeCol].Value);
+ HSeOrderBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value);
+ HSeOrderSEQ = ClsPub.isLong(grdMain.Rows[j].Cells[HSeOrderSEQCol].Value);
+ HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
+ HWorkLineName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceNameCol].Value);
+ HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value);
+ HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value);
+ HPinfan = ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value);
+ HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[HEndDateCol].Value);
+
+ oCn.RunProc("insert into Gy_BarCodeBill" +
+ "(HInterID,HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID" +
+ ",HAuxPropID,HBatchNo,HMTONo,HQty,HinitQty,HSourceBillQty" +
+ ",HProduceDate,HExpiryDate" +
+ ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD,HBarCodeDate,HGiveAwayFlag" +
+ ",HWhID,HSPID,HBarcodeQtys,HBarcodeNo,HEndQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HInitSourceEntryID,HRemark" +
+ ",HPrintQty,HSTOCKORGID,HOWNERID,HDeptID,HSupID,HGroupID" +
+ ",HCusID,HCusType,HSeOrderBillNo,HSeOrderSEQ,HInnerBillNo,HWorkLineName" +
+ ",HMaterName,HMaterModel,HPinfan,HEndDate,HMaker,HMakeDate" +
+ ") values ("
+ + " " + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString()
+ + ", " + HAuxPropID.ToString() + ",'" + HBatchNo + "','" + HMTONo + "'," + HQty.ToString() + "," + HinitQty.ToString() + "," + HSourceBillQty.ToString()
+ + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString() + ",'" + sDate + "'," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ", " + HWhID.ToString() + "," + HSPID.ToString() + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",'" + HEndQty + "'"
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HInitSourceEntryID.ToString() + ",'" + HRemark + "'"
+ + ", " + HPrintQty.ToString() + "," + HSTOCKORGID.ToString() + "," + HOWNERID.ToString() + "," + HDeptID.ToString() + "," + HSupID.ToString() + "," + HGroupID.ToString()
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
+ ")");
+ }
+ pb1.Value = j + 1;
+ }
+
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ int nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ nn = 0;
+ sTMNumber = "";
+ if (ClsPub.isLong(grdMain.Rows[grdMain.Rows.Count-j-1].Cells[HMaterIDCol].Value) != 0)
+ {
+ //鑾峰彇鐗╂枡涓嶄负绌虹殑鏈�鍚庝竴琛岀殑鐗╂枡瀵瑰簲鏉＄爜鍓嶇紑銆侀渶绱鍥炲～鐨勬祦姘村彿鏁�
+ if(j==0)
+ {
+ sTMNumber = ClsPub.isStrNull(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HTMNumberCol].Value);
+ nn = ClsPub.isInt(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HBarcodeNoCol].Value);
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
+ }
+ else
+ {
+ //寰幆鍒ゆ柇璇ヨ鍚庨潰鐨勬墍鏈夎鏄惁瀛樺湪鍜岃琛岀墿鏂欑浉鍚岀殑琛岋紝濡備笉瀛樺湪 鍒欏洖濉搴旀祦姘村彿淇℃伅锛屽瓨鍦ㄥ垯涓嶅洖濉祦姘村彿淇℃伅
+ bool b = false;
+ for (int i = 0; i < j; i++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HMaterIDCol].Value) == ClsPub.isLong(grdMain.Rows[grdMain.Rows.Count - i - 1].Cells[HMaterIDCol].Value))
+ {
+ b = true;
+ break;
+ }
+ }
+
+ if (b == false)
+ {
+ sTMNumber = ClsPub.isStrNull(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HTMNumberCol].Value);
+ nn = ClsPub.isInt(grdMain.Rows[grdMain.Rows.Count - j - 1].Cells[HBarcodeNoCol].Value);
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
+ }
+ }
+ }
+ }
+
+ oCn.Commit();
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
+ tabControl1.SelectedIndex = 1;
+ }
+ catch (Exception e)
+ {
+ bc.Enabled = true;
+ oCn.RollBack();
+ MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e.Message);
+ }
+ }
+
+ #endregion
+
+ #region 鍒锋柊鏉＄爜鍒楄〃
+ private void Display()
+ {
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList where HInterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ }
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = "鏄�";
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdList, MainIDCol, SubIDCol, s, ref n);
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 绐椾綋澶勭悊鏂规硶
+ //鍒濆鍖朑RID
+ private void initGrid()
+ {
+ grdMain.RowCount = 0;
+ grdMain.ColumnCount = 64; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
+ grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
+ grdMain.Columns[HSubIDCol].HeaderText = "婧愬崟瀛怚D";
+ grdMain.Columns[HBillNoCol].HeaderText = "婧愬崟鍗曞彿";
+ grdMain.Columns[HBillTypeCol].HeaderText = "婧愬崟鍗曟嵁绫诲瀷";
+ grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+ grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HPinfanCol].HeaderText = "鍝佺暘";
+ grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
+ grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
+ grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
+ grdMain.Columns[HAuxPropFlagCol].HeaderText = "鏄惁鍚敤杈呭姪灞炴��";
+ grdMain.Columns[HAuxPropIDCol].HeaderText = "杈呭姪灞炴�D";
+ grdMain.Columns[HAuxPropNumberCol].HeaderText = "杈呭姪灞炴�т唬鐮�";
+ grdMain.Columns[HAuxPropNameCol].HeaderText = "杈呭姪灞炴�у悕绉�";
+ grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规";
+ grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿";
+ grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
+ grdMain.Columns[HMinQtyCol].HeaderText = "閲嶉噺";
+ grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
+ grdMain.Columns[HinitQtyCol].HeaderText = "鍒濆鍖栨暟閲�";
+ grdMain.Columns[HSourceBillQtyCol].HeaderText = "婧愬崟鍙敓鎴愭潯鐮佹暟閲�";
+ grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉＄爜绫诲瀷";
+ grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+ grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+ grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+ grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
+ grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
+ grdMain.Columns[HWhIDCol].HeaderText = "浠撳簱ID";
+ grdMain.Columns[HWhNumberCol].HeaderText = "浠撳簱浠ｇ爜";
+ grdMain.Columns[HWhNameCol].HeaderText = "浠撳簱";
+ grdMain.Columns[HSPIDCol].HeaderText = "浠撲綅ID";
+ grdMain.Columns[HSPNumberCol].HeaderText = "浠撲綅浠ｇ爜";
+ grdMain.Columns[HSPNameCol].HeaderText = "浠撲綅";
+ grdMain.Columns[HMTONoCol].HeaderText = "璁″垝璺熻釜鍙�";
+ grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+ grdMain.Columns[HDeptIDCol].HeaderText = "杞﹂棿ID";
+ grdMain.Columns[HDeptNumberCol].HeaderText = "杞﹂棿浠ｇ爜";
+ grdMain.Columns[HDeptNameCol].HeaderText = "杞﹂棿";
+ grdMain.Columns[HSourceIDCol].HeaderText = "鐢熶骇绾縄D";
+ grdMain.Columns[HSourceNumberCol].HeaderText = "鐢熶骇绾夸唬鐮�";
+ grdMain.Columns[HSourceNameCol].HeaderText = "鐢熶骇绾�";
+ grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
+ grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗕唬鐮�";
+ grdMain.Columns[HSupNameCol].HeaderText = "渚涘簲鍟�";
+ grdMain.Columns[HGroupIDCol].HeaderText = "鐢熶骇鐝粍ID";
+ grdMain.Columns[HGroupNumberCol].HeaderText = "鐢熶骇鐝粍浠ｇ爜";
+ grdMain.Columns[HGroupNameCol].HeaderText = "鐢熶骇鐝粍";
+ grdMain.Columns[HCusIDCol].HeaderText = "瀹㈡埛ID";
+ grdMain.Columns[HCusNumberCol].HeaderText = "瀹㈡埛浠ｇ爜";
+ grdMain.Columns[HCusNameCol].HeaderText = "瀹㈡埛";
+ grdMain.Columns[HCusTypeCol].HeaderText = "瀹㈡埛鍨嬪彿";
+ grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞彿";
+ grdMain.Columns[HSeOrderSEQCol].HeaderText = "閿�鍞鍗曡鍙�";
+ grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
+ grdMain.Columns[HBarCodeCol].HeaderText = "鏉＄爜缂栧彿";
+ grdMain.Columns[HTMNumberCol].HeaderText = "鏉＄爜鍓嶇紑";
+ grdMain.Columns[HLSHCol].HeaderText = "鐢熸垚鏉＄爜鏃惰幏鍙栧搴旀祦姘村彿";
+ grdMain.Columns[HBarcodeNoCol].HeaderText = "璁板綍闇�鍥炲～鐨勬祦姘村彿鏁伴噺";
+
+ //鏍煎紡鍖� 闅愯棌鍒�
+ grdMain.Columns[HTagCol].Visible = false;
+ grdMain.Columns[HMainIDCol].Visible = false;
+ grdMain.Columns[HSubIDCol].Visible = false;
+ grdMain.Columns[HBillTypeCol].Visible = false;
+ grdMain.Columns[HMaterIDCol].Visible = false;
+ grdMain.Columns[HPinfanCol].Visible = false;
+ grdMain.Columns[HUnitIDCol].Visible = false;
+ grdMain.Columns[HAuxPropIDCol].Visible = false;
+ grdMain.Columns[HinitQtyCol].Visible = false;
+ grdMain.Columns[HSourceBillQtyCol].Visible = false;
+ //grdMain.Columns[HExpiryDateCol].Visible = false;
+ //grdMain.Columns[HEXPUNITCol].Visible = false;
+ //grdMain.Columns[HEXPPERIODCol].Visible = false;
+ grdMain.Columns[HWhIDCol].Visible = false;
+ grdMain.Columns[HWhNumberCol].Visible = false;
+ grdMain.Columns[HWhNameCol].Visible = false;
+ grdMain.Columns[HSPIDCol].Visible = false;
+ grdMain.Columns[HSPNumberCol].Visible = false;
+ grdMain.Columns[HSPNameCol].Visible = false;
+ grdMain.Columns[HMTONoCol].Visible = false;
+ grdMain.Columns[HDeptIDCol].Visible = false;
+ grdMain.Columns[HDeptNumberCol].Visible = false;
+ grdMain.Columns[HDeptNameCol].Visible = false;
+ grdMain.Columns[HSourceIDCol].Visible = false;
+ grdMain.Columns[HSourceNumberCol].Visible = false;
+ grdMain.Columns[HSourceNameCol].Visible = false;
+ grdMain.Columns[HSupIDCol].Visible = false;
+ grdMain.Columns[HSupNumberCol].Visible = false;
+ grdMain.Columns[HSupNameCol].Visible = false;
+ grdMain.Columns[HGroupIDCol].Visible = false;
+ grdMain.Columns[HGroupNumberCol].Visible = false;
+ grdMain.Columns[HGroupNameCol].Visible = false;
+ grdMain.Columns[HCusIDCol].Visible = false;
+ grdMain.Columns[HCusNumberCol].Visible = false;
+ grdMain.Columns[HCusNameCol].Visible = false;
+ grdMain.Columns[HCusTypeCol].Visible = false;
+ grdMain.Columns[HSeOrderBillNoCol].Visible = false;
+ grdMain.Columns[HSeOrderSEQCol].Visible = false;
+ grdMain.Columns[HInnerBillNoCol].Visible = false;
+ grdMain.Columns[HEndDateCol].Visible = false;
+ grdMain.Columns[HBQtyCol].Visible = false;
+ grdMain.Columns[HGiveAwayFlagCol].Visible = false;
+ grdMain.Columns[HBarCodeCol].Visible = false;
+ grdMain.Columns[HTMNumberCol].Visible = false;
+ grdMain.Columns[HLSHCol].Visible = false;
+ grdMain.Columns[HBarcodeNoCol].Visible = false;
+
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HMinQtyCol.ToString() +
+ "," + HMaterNumberCol.ToString() +
+ "," + HUnitNumberCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HBarCodeTypeCol.ToString() +
+ "," + HProduceDateCol.ToString() +
+ "," + HRemarkCol.ToString();
+
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HMinQtyCol.ToString();
+
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤杈呭姪灞炴��
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HAuxPropFlagCol] = oCell;
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = 0;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = 0;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("鍞竴鏉＄爜");
+ grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
+ }
+
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.initGridList(grdList, this.Name + "grdList");
+ }
+
+ //鏄惁鏄┖琛�
+ private bool IsNullRow(int Row)
+ {
+ return DBUtility.Xt_BaseBillFun.IsNullRow(Row, HMaterIDCol,grdMain);
+ }
+
+ //鍒ゆ柇缃戞牸琛岀殑褰曞叆鏄惁姝ｇ‘
+ private bool CheckGridRow(int Row)
+ {
+ Cell oCell = new Cell();
+ int c = 0;
+ //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+ //{
+ // return true;
+ //}
+ //
+ for (c = 0; c < grdMain.ColumnCount; c++)
+ {
+ oCell.Row = Row;
+ oCell.Col = c;
+ //if (!CheckGridCell(oCell))
+ // return false;
+ }
+ return true;
+ }
+
+ //甯姪鍑芥暟
+ private void Sub_GridKey(int sKeyCode, int sRow, int sCol, DataGridViewTextBoxEditingControl oEdit)
+ {
+ string sWhere = "";
+ DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//鐗╂枡
+ DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//璁￠噺鍗曚綅
+ DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//杈呭姪灞炴��
+ if (!grdStatus)
+ {
+ return;
+ }
+ oSumGrid.EditStatus = true;
+
+ switch (sKeyCode)
+ {
+ case 118: //F7
+ {
+ switch (sCol)
+ {
+ case HMaterNumberCol:
+ oMater.WherePart = "";
+ sWhere = " and HUSEORGID = " + HOrgID;
+ if (oMater.RefreshViewForBig(sWhere))
+ {
+ if (oMater.GetInfoByID(oMater.oModel.HItemID))
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = oMater.omodel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oMater.omodel.HUnitID.ToString();
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = oMater.omodel.HUnitNumber;
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = oMater.omodel.HUnitName;
+ grdMain.Rows[sRow].Cells[HAuxPropFlagCol].Value = oMater.omodel.HAuxPropFlag;
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oMater.omodel.HAuxPropID.ToString();
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oMater.omodel.HAuxPropNumber;
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
+ grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
+ grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = oMater.omodel.HBarCodeType;
+ grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
+ //鍚敤鎵规
+ if (oMater.omodel.HBatchManager)
+ {
+ grdMain.Rows[sRow].Cells[HBatchNoCol].Value = oMater.omodel.HBatchNo;
+ }
+ //鍚敤淇濊川鏈�
+ if (oMater.omodel.HISKFPERIOD)
+ {
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = oMater.omodel.HEXPUNIT;
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = oMater.omodel.HEXPPERIOD;
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //鑾峰彇鏈夋晥鏈熻嚦
+ if (GetExpiryDate(dtpHDate.Value, oMater.omodel.HEXPUNIT, DBUtility.ClsPub.isInt(oMater.omodel.HEXPPERIOD), ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ }
+ oEdit.Text = oMater.omodel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropFlagCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HBatchNoCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "";
+ grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ }
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropFlagCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HBatchNoCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "";
+ grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ }
+ break;
+
+ case HUnitNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByUnit(grdMain, sRow, HUnitIDCol, HUnitNumberCol, HUnitNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HUnitNumberCol].Value);
+ break;
+
+ case HAuxPropNumberCol:
+ oProperty.WherePart = "";
+ if (ERPMode == "CLOUD")
+ {
+ sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
+ }
+ else
+ {
+ sWhere = "";
+ }
+ if (oProperty.RefreshView(sWhere))
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
+ oEdit.Text = oProperty.oModel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ }
+ break;
+
+ case HDeptNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByDept(grdMain, sRow, HDeptIDCol, HDeptNumberCol, HDeptNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDeptNumberCol].Value);
+ break;
+
+ case HCusNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByCus(grdMain, sRow, HCusIDCol, HCusNumberCol, HCusNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HCusNumberCol].Value);
+ break;
+
+ case HProduceDateCol:
+ BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HProduceDateCol);
+ //鑾峰彇鏈夋晥鏈熻嚦
+ DateTime HProduceDate= DBUtility.ClsPub.isDate(grdMain.Rows[sRow].Cells[HProduceDateCol].Value); //鐢熶骇鏃ユ湡
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HProduceDateCol].Value);
+ break;
+
+ default:
+ break;
+ }
+ bc.Enabled = true;
+ break;
+ }
+ case 117: //F6
+ {
+ switch (sCol)
+ {
+
+
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ //缃戞牸缂栬緫鍓嶅垽鏂�
+ private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ int i = grdMain.CurrentCell.ColumnIndex;
+ if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid,i))
+ {
+ e.Cancel = true;
+ }
+ }
+
+ //缃戞牸缂栬緫鍚庡鐞�
+ private void grdMain_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ if (e.ColumnIndex == HProduceDateCol)
+ {
+ //鑾峰彇鏈夋晥鏈熻嚦
+ DateTime HProduceDate = DBUtility.ClsPub.isDate(grdMain.Rows[e.RowIndex].Cells[HProduceDateCol].Value); //鐢熶骇鏃ユ湡
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[e.RowIndex].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[e.RowIndex].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[e.RowIndex].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ //
+ if (this.EditingControl != null) //閲婃斁浜嬩欢
+ {
+ EditingControl.KeyDown -= new KeyEventHandler(this.EditingControl_KeyDown);
+ this.EditingControl = null;
+ }
+ }
+ DataGridViewTextBoxEditingControl EditingControl;
+
+ private void grdMain_CellLeave(object sender, DataGridViewCellEventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
+ {
+ if (grdMain.CurrentCell != null)
+ {
+ if (e.Control is DataGridViewTextBoxEditingControl)
+ {
+ this.EditingControl = (DataGridViewTextBoxEditingControl)e.Control;
+ //澧炲姞濮旀墭澶勭悊
+ this.EditingControl.KeyDown += new KeyEventHandler(this.EditingControl_KeyDown);
+ }
+ }
+ }
+
+ private void EditingControl_KeyDown(object sender, KeyEventArgs e)
+ {
+ //涓氬姟澶勭悊
+ Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
+ }
+
+ private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ private void grdMain_Scroll(object sender, ScrollEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ oSumGrid.DisplayCurRow();
+ }
+
+ #endregion
+
+
+ #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夋斁澶ч暅鍥炬爣杩斿洖
+
+ private void cmdSourceBillNo_Click(object sender, EventArgs e)
+ {
+ if (cmbSourceBillType.Text.Trim() == "璋冩嫧鐢宠鍗�")
+ {
+ string sWhere = " and HOrgID =" + HOrgID.ToString();
+ DAL.Cls_S_IF_MoveStockRequestBillList oIF_MoveStockRequestBillList = new DAL.Cls_S_IF_MoveStockRequestBillList();
+ if (oIF_MoveStockRequestBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_MoveStockRequestBillList.oBillSelectColl);
+ }
+ }
+ else
+ {
+
+ }
+ }
+
+ private void FillSelectData(List<DBUtility.BillSelect> oList)
+ {
+ DataSet Ds;
+ oSumGrid.Changelock = true;
+ initGrid();
+ int i = -1;
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ i = i + 1;
+ //璋冩嫧鐢宠鍗�
+ if (oSelectRow.BillType == "1243")
+ {
+ grdMain.Rows.Add();
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤杈呭姪灞炴��
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count-1].Cells[HAuxPropFlagCol] = oCell;
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = 0;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count-1].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count-1].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = 0;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[grdMain.Rows.Count-1].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("鍞竴鏉＄爜");
+ grdMain.Rows[grdMain.Rows.Count-1].Cells[HBarCodeTypeCol] = column;
+
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_MoveStockRequestBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString(), "h_p_Gy_BarCodeBill_MoveStockRequestBillList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm(Ds.Tables[0], i);
+ }
+ }
+ //
+ oSumGrid.Changelock = false;
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰
+ private void Sub_WriteInForm(DataTable oTable, int i)
+ {
+ //鍔犺浇琛ㄤ綋
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HSourceBillQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+ grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+ grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+ grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+ grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+ grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["HBatchManager"].ToString();
+ grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+ grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+ grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+ grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBarCodeTypeCol].Value = oTable.Rows[0]["HBarCodeType"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropFlagCol].Value = oTable.Rows[0]["HAuxPropFlag"].ToString();
+
+ //鍚敤杈呭姪灞炴��
+ if (DBUtility.ClsPub.isBool(oTable.Rows[0]["HAuxPropFlag"].ToString()))
+ {
+ grdMain.Rows[i].Cells[HAuxPropIDCol].Value = oTable.Rows[0]["HAuxPropID"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropNumberCol].Value = oTable.Rows[0]["杈呭姪灞炴�т唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropNameCol].Value = oTable.Rows[0]["杈呭姪灞炴��"].ToString();
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[i].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[i].Cells[HAuxPropNameCol].Value = "";
+ }
+
+ //鍚敤淇濊川鏈�
+ if (DBUtility.ClsPub.isBool(oTable.Rows[0]["HISKFPERIOD"].ToString()))
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = DBUtility.ClsPub.isInt(oTable.Rows[0]["HEXPPERIOD"]).ToString();
+ //婧愬崟涓婃湁鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷冲彇婧愬崟涓婏紝娌℃湁鐢熶骇鏃ユ湡鍙栫晫闈㈡墍閫夋棩鏈�
+ if (oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString() == "" || oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString() == "")
+ {
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //鑾峰彇鏈夋晥鏈熻嚦
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(dtpHDate.Value, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+ }
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
+ }
+
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HBarCodeTypeCol.ToString() +
+ "," + HProduceDateCol.ToString() +
+ "," + HRemarkCol.ToString();
+ grdMain.Columns[HBillNoCol].ReadOnly = true;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HMinQtyCol.ToString();
+ //
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ tabControl1.SelectedIndex = 0;
+ bc.Enabled = true;
+ }
+
+ #endregion
+
+
+ #region 閫夋簮鍗曡繑鍥炰俊鎭� 鎸夊洖杞﹂敭杩斿洖
+ private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
+ {
+ if (txtHSourceBillNo.Text.Length < 4)
+ {
+ MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
+ return;
+ }
+ //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
+ if (cmbSourceBillType.Text.Trim() == "璋冩嫧鐢宠鍗�")
+ {
+ DAL.Cls_S_IF_MoveStockRequestBillList oIF_MoveStockRequestBillList = new DAL.Cls_S_IF_MoveStockRequestBillList();
+ if (oIF_MoveStockRequestBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_MoveStockRequestBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else
+ {
+ MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
+ return;
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ string sBarCodeItemID = ""; //鏉＄爜鑷鍒�
+
+ #region 棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ #region 鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin()
+ {
+ string sHRemark = "";
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].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);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//
+ {
+ try
+ {
+ //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HRemark2Col].Value);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty_SD(HInterID);
+ }
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+ }
+
+ #region 璇曟墦鍗�
+ private void sdy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀娴忚锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin_SDY())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReportView(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin_SDY()
+ {
+ string sHRemark = "";
+ sBarCodeItemID = "";
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ }
+ sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ private void Sub_SetReportView(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].Cells[0].Value = "";
+ }
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ grdList.Rows[grdList.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);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd_SDY()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty(sBarCodeItemID);
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 閫夋嫨缁勭粐
+ private void cmbHOrgID_SelectionChangeCommitted(object sender, EventArgs e)
+ {
+ HOrgID = ClsPub.isLong(cmbHOrgID.SelectedValue);
+ //娓呯┖鍒濆鍖栧垪琛�
+ initGrid();
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ }
+
+ #endregion
+
+ #region 閫夋嫨鏃ユ湡
+ private void dtpHDate_ValueChanged(object sender, EventArgs e)
+ {
+ if (chkUpdateSubDate.Checked == true)
+ {
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
+ {
+ //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
+ DateTime HProduceDate = dtpHDate.Value; //鐢熶骇鏃ユ湡
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ //鐢熶骇鏃ユ湡
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+
+ if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ //鏈夋晥鏈熻嚦
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ }
+ }
+ }
+
+ #endregion
+
+ #region 鑾峰彇鏈夋晥鏈熻嚦
+ public bool GetExpiryDate(DateTime HProduceDate, string HEXPUNIT, int HEXPPERIOD, ref string sReturn, ref string HExpiryDate)
+ {
+ if (HEXPUNIT != "Y" && HEXPUNIT != "M" && HEXPUNIT != "D")
+ {
+ sReturn = "鐗╂枡鍚敤淇濊川鏈熺鐞嗭紝鐗╂枡鍩虹璧勬枡涓殑淇濊川鏈熷崟浣嶄笉鍏佽涓虹┖锛�";
+ return false;
+ }
+ else if (HEXPPERIOD == 0)
+ {
+ sReturn = "鐗╂枡鍚敤淇濊川鏈熺鐞嗭紝鐗╂枡鍩虹璧勬枡涓殑淇濊川鏈熶笉鍏佽涓虹┖锛�";
+ return false;
+ }
+ else if (HEXPUNIT == "Y")
+ {
+ HExpiryDate = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+ return true;
+ }
+ else if (HEXPUNIT == "M")
+ {
+ HExpiryDate = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+ return true;
+ }
+ else
+ {
+ HExpiryDate = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+ return true;
+ }
+ }
+
+ #endregion
+
+
+ #region 鎷嗚
+ private void spRow_Click(object sender, EventArgs e)
+ {
+ oDlg.ShowDialog();
+ if (oDlg.IsOk == 1)
+ {
+ grdMainData_CF(DBUtility.ClsPub.isInt(oDlg.txtHQ.Text));
+ }
+ }
+ private void grdMainData_CF(int HQty)
+ {
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佹媶鍒嗙殑琛岋紒", "鎻愮ず");
+ return;
+ }
+ int row = grdMain.CurrentCell.RowIndex;
+ grdMain.Rows.Insert(row + 1, HQty);
+
+ for (int i = 0; i < HQty; i++)
+ {
+ int r = i + 1;
+ grdMain.Rows[row + r].Cells[HTagCol].Value = grdMain.Rows[row].Cells[HTagCol].Value;
+ grdMain.Rows[row + r].Cells[HMainIDCol].Value = grdMain.Rows[row].Cells[HMainIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSubIDCol].Value = grdMain.Rows[row].Cells[HSubIDCol].Value;
+ grdMain.Rows[row + r].Cells[HBillNoCol].Value = grdMain.Rows[row].Cells[HBillNoCol].Value;
+ grdMain.Rows[row + r].Cells[HBillTypeCol].Value = grdMain.Rows[row].Cells[HBillTypeCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterIDCol].Value = grdMain.Rows[row].Cells[HMaterIDCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterNumberCol].Value = grdMain.Rows[row].Cells[HMaterNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterNameCol].Value = grdMain.Rows[row].Cells[HMaterNameCol].Value;
+ grdMain.Rows[row + r].Cells[HPinfanCol].Value = grdMain.Rows[row].Cells[HPinfanCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterModelCol].Value = grdMain.Rows[row].Cells[HMaterModelCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropIDCol].Value = grdMain.Rows[row].Cells[HAuxPropIDCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropNumberCol].Value = grdMain.Rows[row].Cells[HAuxPropNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropNameCol].Value = grdMain.Rows[row].Cells[HAuxPropNameCol].Value;
+ grdMain.Rows[row + r].Cells[HBatchManagerCol].Value = grdMain.Rows[row].Cells[HBatchManagerCol].Value;
+ grdMain.Rows[row + r].Cells[HBatchNoCol].Value = grdMain.Rows[row].Cells[HBatchNoCol].Value;
+ grdMain.Rows[row + r].Cells[HQtyCol].Value = grdMain.Rows[row].Cells[HQtyCol].Value;
+ grdMain.Rows[row + r].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[row + r].Cells[HBQtyCol].Value = grdMain.Rows[row].Cells[HBQtyCol].Value;
+ grdMain.Rows[row + r].Cells[HinitQtyCol].Value = grdMain.Rows[row].Cells[HinitQtyCol].Value;
+ grdMain.Rows[row + r].Cells[HISKFPERIODCol].Value = grdMain.Rows[row].Cells[HISKFPERIODCol].Value;
+ grdMain.Rows[row + r].Cells[HProduceDateCol].Value = grdMain.Rows[row].Cells[HProduceDateCol].Value;
+ grdMain.Rows[row + r].Cells[HExpiryDateCol].Value = grdMain.Rows[row].Cells[HExpiryDateCol].Value;
+ grdMain.Rows[row + r].Cells[HEXPUNITCol].Value = grdMain.Rows[row].Cells[HEXPUNITCol].Value;
+ grdMain.Rows[row + r].Cells[HEXPPERIODCol].Value = grdMain.Rows[row].Cells[HEXPPERIODCol].Value;
+ grdMain.Rows[row + r].Cells[HGiveAwayFlagCol].Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+ grdMain.Rows[row + r].Cells[HUnitIDCol].Value = grdMain.Rows[row].Cells[HUnitIDCol].Value;
+ grdMain.Rows[row + r].Cells[HUnitNumberCol].Value = grdMain.Rows[row].Cells[HUnitNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HUnitNameCol].Value = grdMain.Rows[row].Cells[HUnitNameCol].Value;
+ grdMain.Rows[row + r].Cells[HWhIDCol].Value = grdMain.Rows[row].Cells[HWhIDCol].Value;
+ grdMain.Rows[row + r].Cells[HWhNumberCol].Value = grdMain.Rows[row].Cells[HWhNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HWhNameCol].Value = grdMain.Rows[row].Cells[HWhNameCol].Value;
+ grdMain.Rows[row + r].Cells[HSPIDCol].Value = grdMain.Rows[row].Cells[HSPIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSPNumberCol].Value = grdMain.Rows[row].Cells[HSPNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HSPNameCol].Value = grdMain.Rows[row].Cells[HSPNameCol].Value;
+ grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
+ grdMain.Rows[row + r].Cells[HRemarkCol].Value = grdMain.Rows[row].Cells[HRemarkCol].Value;
+ grdMain.Rows[row + r].Cells[HDeptIDCol].Value = grdMain.Rows[row].Cells[HDeptIDCol].Value;
+ grdMain.Rows[row + r].Cells[HDeptNumberCol].Value = grdMain.Rows[row].Cells[HDeptNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HDeptNameCol].Value = grdMain.Rows[row].Cells[HDeptNameCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceIDCol].Value = grdMain.Rows[row].Cells[HSourceIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceNumberCol].Value = grdMain.Rows[row].Cells[HSourceNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceNameCol].Value = grdMain.Rows[row].Cells[HSourceNameCol].Value;
+ grdMain.Rows[row + r].Cells[HSupIDCol].Value = grdMain.Rows[row].Cells[HSupIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSupNumberCol].Value = grdMain.Rows[row].Cells[HSupNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HSupNameCol].Value = grdMain.Rows[row].Cells[HSupNameCol].Value;
+ grdMain.Rows[row + r].Cells[HGroupIDCol].Value = grdMain.Rows[row].Cells[HGroupIDCol].Value;
+ grdMain.Rows[row + r].Cells[HGroupNumberCol].Value = grdMain.Rows[row].Cells[HGroupNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HGroupNameCol].Value = grdMain.Rows[row].Cells[HGroupNameCol].Value;
+ grdMain.Rows[row + r].Cells[HCusIDCol].Value = grdMain.Rows[row].Cells[HCusIDCol].Value;
+ grdMain.Rows[row + r].Cells[HCusNumberCol].Value = grdMain.Rows[row].Cells[HCusNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HCusNameCol].Value = grdMain.Rows[row].Cells[HCusNameCol].Value;
+ grdMain.Rows[row + r].Cells[HCusTypeCol].Value = grdMain.Rows[row].Cells[HCusTypeCol].Value;
+ grdMain.Rows[row + r].Cells[HSeOrderBillNoCol].Value = grdMain.Rows[row].Cells[HSeOrderBillNoCol].Value;
+ grdMain.Rows[row + r].Cells[HSeOrderSEQCol].Value = grdMain.Rows[row].Cells[HSeOrderSEQCol].Value;
+ grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
+ grdMain.Rows[row + r].Cells[HEndDateCol].Value = grdMain.Rows[row].Cells[HEndDateCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceBillQtyCol].Value = grdMain.Rows[row].Cells[HSourceBillQtyCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropFlagCol].Value = grdMain.Rows[row].Cells[HAuxPropFlagCol].Value;
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤杈呭姪灞炴��
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = grdMain.Rows[row].Cells[HAuxPropFlagCol].Value;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HAuxPropFlagCol] = oCell;
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = grdMain.Rows[row].Cells[HBatchManagerCol].Value;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = grdMain.Rows[row].Cells[HISKFPERIODCol].Value;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("鍞竴鏉＄爜");
+ grdMain.Rows[row + r].Cells[HBarCodeTypeCol] = column;
+ grdMain.Rows[row + r].Cells[HBarCodeTypeCol].Value = grdMain.Rows[row].Cells[HBarCodeTypeCol].Value;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.designer.cs"
new file mode 100644
index 0000000..1b13632
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.designer.cs"
@@ -0,0 +1,975 @@
+锘縩amespace WarM
+{
+ partial class Gy_BarCodeBill_XiaBao
+ {
+ /// <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_BarCodeBill_XiaBao));
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.sdy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.AddRow = new System.Windows.Forms.ToolStripButton();
+ this.DelRow = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.bc = new System.Windows.Forms.ToolStripButton();
+ this.cz = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.lblCaption = new System.Windows.Forms.Label();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.pb1 = new System.Windows.Forms.ProgressBar();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.chkUpdateSubDate = new System.Windows.Forms.CheckBox();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.cmdHEmpID = new System.Windows.Forms.Button();
+ this.cmdSourceBillNo = new System.Windows.Forms.Button();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHDeleteDate = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.txtHDeleteMan = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.txtHUpDateDate = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.txtHUpDater = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.txtHCloseDate = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHCloseMan = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHCheckDate = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHChecker = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.txtHMakeDate = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.grdList = new System.Windows.Forms.DataGridView();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.Tool.SuspendLayout();
+ this.P1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+ this.gbUp.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dy,
+ this.sdy,
+ this.yl,
+ this.toolStripSeparator2,
+ this.AddRow,
+ this.DelRow,
+ this.toolStripSeparator1,
+ this.spRow,
+ this.toolStripSeparator3,
+ this.bc,
+ this.cz,
+ this.toolStripSeparator6,
+ this.toolStripSeparator5,
+ this.mrlk,
+ this.toolStripSeparator11,
+ this.bclk,
+ this.toolStripSeparator10,
+ this.tc});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1017, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 17;
+ this.Tool.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);
+ //
+ // sdy
+ //
+ this.sdy.AutoSize = false;
+ this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+ this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sdy.Name = "sdy";
+ this.sdy.Size = new System.Drawing.Size(35, 47);
+ this.sdy.Text = "娴忚";
+ this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sdy.Visible = false;
+ this.sdy.Click += new System.EventHandler(this.sdy_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);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ //
+ // AddRow
+ //
+ this.AddRow.AutoSize = false;
+ this.AddRow.Image = ((System.Drawing.Image)(resources.GetObject("AddRow.Image")));
+ this.AddRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.AddRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.AddRow.Name = "AddRow";
+ this.AddRow.Size = new System.Drawing.Size(35, 47);
+ this.AddRow.Text = "澧炶";
+ this.AddRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.AddRow.Click += new System.EventHandler(this.AddRow_Click);
+ //
+ // DelRow
+ //
+ this.DelRow.AutoSize = false;
+ this.DelRow.Image = ((System.Drawing.Image)(resources.GetObject("DelRow.Image")));
+ this.DelRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.DelRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.DelRow.Name = "DelRow";
+ this.DelRow.Size = new System.Drawing.Size(35, 47);
+ this.DelRow.Text = "鍒犺";
+ this.DelRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.DelRow.Click += new System.EventHandler(this.DelRow_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ //
+ // spRow
+ //
+ this.spRow.AutoSize = false;
+ this.spRow.Image = ((System.Drawing.Image)(resources.GetObject("spRow.Image")));
+ this.spRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.spRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.spRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.spRow.Name = "spRow";
+ this.spRow.Size = new System.Drawing.Size(35, 47);
+ this.spRow.Text = "鎷嗚";
+ this.spRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.spRow.Click += new System.EventHandler(this.spRow_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
+ // cz
+ //
+ this.cz.AutoSize = false;
+ this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+ this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.cz.Name = "cz";
+ this.cz.Size = new System.Drawing.Size(35, 47);
+ this.cz.Text = "閲嶇疆";
+ this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.cz.Click += new System.EventHandler(this.cz_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.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);
+ //
+ // toolStripSeparator11
+ //
+ this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator11.Name = "toolStripSeparator11";
+ this.toolStripSeparator11.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);
+ //
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.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);
+ //
+ // lblCaption
+ //
+ this.lblCaption.AutoSize = true;
+ this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblCaption.Location = new System.Drawing.Point(501, 12);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.TabIndex = 18;
+ this.lblCaption.Text = "鍗曟嵁缂栬緫";
+ //
+ // P1
+ //
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.pb1);
+ this.P1.Controls.Add(this.pic1);
+ this.P1.Controls.Add(this.lblCaption);
+ this.P1.Controls.Add(this.gbUp);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(41, 50);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(937, 137);
+ this.P1.TabIndex = 31;
+ //
+ // pb1
+ //
+ this.pb1.Location = new System.Drawing.Point(76, 12);
+ this.pb1.Name = "pb1";
+ this.pb1.Size = new System.Drawing.Size(256, 23);
+ this.pb1.TabIndex = 93;
+ //
+ // pic1
+ //
+ this.pic1.Location = new System.Drawing.Point(313, 3);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(78, 41);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 36;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.chkUpdateSubDate);
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Controls.Add(this.cmbHOrgID);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.cmdHEmpID);
+ this.gbUp.Controls.Add(this.cmdSourceBillNo);
+ this.gbUp.Controls.Add(this.txtHSourceBillNo);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.cmbSourceBillType);
+ this.gbUp.Controls.Add(this.label10);
+ this.gbUp.Location = new System.Drawing.Point(14, 39);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Size = new System.Drawing.Size(892, 80);
+ this.gbUp.TabIndex = 33;
+ this.gbUp.TabStop = false;
+ //
+ // chkUpdateSubDate
+ //
+ this.chkUpdateSubDate.AutoSize = true;
+ this.chkUpdateSubDate.Location = new System.Drawing.Point(596, 24);
+ this.chkUpdateSubDate.Margin = new System.Windows.Forms.Padding(2);
+ this.chkUpdateSubDate.Name = "chkUpdateSubDate";
+ this.chkUpdateSubDate.Size = new System.Drawing.Size(120, 16);
+ this.chkUpdateSubDate.TabIndex = 103;
+ this.chkUpdateSubDate.Text = "鎵归噺鏇存柊鐢熶骇鏃ユ湡";
+ this.chkUpdateSubDate.UseVisualStyleBackColor = true;
+ this.chkUpdateSubDate.Visible = false;
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.Location = new System.Drawing.Point(394, 17);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(188, 21);
+ this.dtpHDate.TabIndex = 96;
+ this.dtpHDate.ValueChanged += new System.EventHandler(this.dtpHDate_ValueChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(327, 21);
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.TabIndex = 95;
+ this.label2.Text = "鏃� 鏈�";
+ //
+ // cmbHOrgID
+ //
+ this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHOrgID.FormattingEnabled = true;
+ this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
+ this.cmbHOrgID.Name = "cmbHOrgID";
+ this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+ this.cmbHOrgID.TabIndex = 85;
+ this.cmbHOrgID.SelectionChangeCommitted += new System.EventHandler(this.cmbHOrgID_SelectionChangeCommitted);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(35, 21);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(53, 12);
+ this.label3.TabIndex = 84;
+ this.label3.Text = "缁� 缁�";
+ //
+ // 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(892, -7);
+ this.cmdHEmpID.Name = "cmdHEmpID";
+ this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHEmpID.TabIndex = 79;
+ this.cmdHEmpID.UseVisualStyleBackColor = false;
+ this.cmdHEmpID.Visible = false;
+ //
+ // cmdSourceBillNo
+ //
+ this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
+ this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
+ this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
+ this.cmdSourceBillNo.TabIndex = 42;
+ this.cmdSourceBillNo.UseVisualStyleBackColor = true;
+ this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
+ //
+ // txtHSourceBillNo
+ //
+ this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSourceBillNo.TabIndex = 41;
+ this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(327, 50);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(53, 12);
+ this.label14.TabIndex = 40;
+ this.label14.Text = "閫� 鍗� 鍙�";
+ //
+ // cmbSourceBillType
+ //
+ this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbSourceBillType.FormattingEnabled = true;
+ this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
+ this.cmbSourceBillType.Name = "cmbSourceBillType";
+ this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
+ this.cmbSourceBillType.TabIndex = 36;
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(35, 50);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.TabIndex = 35;
+ this.label10.Text = "婧愬崟绫诲瀷";
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.Lavender;
+ this.panel2.Controls.Add(this.txtHDeleteDate);
+ this.panel2.Controls.Add(this.label25);
+ this.panel2.Controls.Add(this.txtHDeleteMan);
+ this.panel2.Controls.Add(this.label27);
+ this.panel2.Controls.Add(this.txtHUpDateDate);
+ this.panel2.Controls.Add(this.label23);
+ this.panel2.Controls.Add(this.txtHUpDater);
+ this.panel2.Controls.Add(this.label21);
+ this.panel2.Controls.Add(this.txtHCloseDate);
+ this.panel2.Controls.Add(this.label19);
+ this.panel2.Controls.Add(this.txtHCloseMan);
+ this.panel2.Controls.Add(this.label17);
+ this.panel2.Controls.Add(this.txtHCheckDate);
+ this.panel2.Controls.Add(this.label15);
+ this.panel2.Controls.Add(this.txtHChecker);
+ this.panel2.Controls.Add(this.label13);
+ this.panel2.Controls.Add(this.txtHMakeDate);
+ this.panel2.Controls.Add(this.label11);
+ this.panel2.Controls.Add(this.txtHMaker);
+ this.panel2.Controls.Add(this.label8);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel2.Location = new System.Drawing.Point(41, 506);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(937, 93);
+ this.panel2.TabIndex = 32;
+ //
+ // txtHDeleteDate
+ //
+ this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
+ this.txtHDeleteDate.Name = "txtHDeleteDate";
+ this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteDate.TabIndex = 19;
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.BackColor = System.Drawing.Color.Transparent;
+ this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label25.Location = new System.Drawing.Point(666, 50);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(53, 12);
+ this.label25.TabIndex = 18;
+ this.label25.Text = "浣滃簾鏃ユ湡";
+ //
+ // txtHDeleteMan
+ //
+ this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
+ this.txtHDeleteMan.Name = "txtHDeleteMan";
+ this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHDeleteMan.TabIndex = 17;
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.BackColor = System.Drawing.Color.Transparent;
+ this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label27.Location = new System.Drawing.Point(666, 12);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(41, 12);
+ this.label27.TabIndex = 16;
+ this.label27.Text = "浣滃簾浜�";
+ //
+ // txtHUpDateDate
+ //
+ this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
+ this.txtHUpDateDate.Name = "txtHUpDateDate";
+ this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDateDate.TabIndex = 15;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.BackColor = System.Drawing.Color.Transparent;
+ this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label23.Location = new System.Drawing.Point(503, 47);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(53, 12);
+ this.label23.TabIndex = 14;
+ this.label23.Text = "淇敼鏃ユ湡";
+ //
+ // txtHUpDater
+ //
+ this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
+ this.txtHUpDater.Name = "txtHUpDater";
+ this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
+ this.txtHUpDater.TabIndex = 13;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.BackColor = System.Drawing.Color.Transparent;
+ this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label21.Location = new System.Drawing.Point(503, 12);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(41, 12);
+ this.label21.TabIndex = 12;
+ this.label21.Text = "淇敼浜�";
+ //
+ // txtHCloseDate
+ //
+ this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
+ this.txtHCloseDate.Name = "txtHCloseDate";
+ this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseDate.TabIndex = 11;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.BackColor = System.Drawing.Color.Transparent;
+ this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label19.Location = new System.Drawing.Point(338, 50);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(53, 12);
+ this.label19.TabIndex = 10;
+ this.label19.Text = "鍏抽棴鏃ユ湡";
+ //
+ // txtHCloseMan
+ //
+ this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
+ this.txtHCloseMan.Name = "txtHCloseMan";
+ this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
+ this.txtHCloseMan.TabIndex = 9;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.BackColor = System.Drawing.Color.Transparent;
+ this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label17.Location = new System.Drawing.Point(338, 16);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(41, 12);
+ this.label17.TabIndex = 8;
+ this.label17.Text = "鍏抽棴浜�";
+ //
+ // txtHCheckDate
+ //
+ this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
+ this.txtHCheckDate.Name = "txtHCheckDate";
+ this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHCheckDate.TabIndex = 7;
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.BackColor = System.Drawing.Color.Transparent;
+ this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label15.Location = new System.Drawing.Point(175, 50);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(53, 12);
+ this.label15.TabIndex = 6;
+ this.label15.Text = "瀹℃牳鏃ユ湡";
+ //
+ // txtHChecker
+ //
+ this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHChecker.Location = new System.Drawing.Point(234, 13);
+ this.txtHChecker.Name = "txtHChecker";
+ this.txtHChecker.Size = new System.Drawing.Size(98, 15);
+ this.txtHChecker.TabIndex = 5;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.BackColor = System.Drawing.Color.Transparent;
+ this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label13.Location = new System.Drawing.Point(175, 16);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(41, 12);
+ this.label13.TabIndex = 4;
+ this.label13.Text = "瀹℃牳浜�";
+ //
+ // txtHMakeDate
+ //
+ this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
+ this.txtHMakeDate.Name = "txtHMakeDate";
+ this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
+ this.txtHMakeDate.TabIndex = 3;
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label11.Location = new System.Drawing.Point(12, 50);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.TabIndex = 2;
+ this.label11.Text = "鍒跺崟鏃ユ湡";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMaker.Location = new System.Drawing.Point(71, 13);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(98, 15);
+ this.txtHMaker.TabIndex = 1;
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.BackColor = System.Drawing.Color.Transparent;
+ this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label8.Location = new System.Drawing.Point(12, 16);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(41, 12);
+ this.label8.TabIndex = 0;
+ this.label8.Text = "鍒跺崟浜�";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // panel1
+ //
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 50);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(41, 549);
+ this.panel1.TabIndex = 33;
+ //
+ // panel3
+ //
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(39, 549);
+ this.panel3.TabIndex = 34;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(41, 487);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(937, 19);
+ this.grdSum.TabIndex = 45;
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(809, 543);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.TabIndex = 46;
+ this.grdPrint.Visible = false;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.grdList);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Size = new System.Drawing.Size(929, 274);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "鏉＄爜鏄庣粏";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // grdList
+ //
+ this.grdList.AllowUserToAddRows = false;
+ this.grdList.AllowUserToDeleteRows = false;
+ this.grdList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdList.Location = new System.Drawing.Point(0, 0);
+ this.grdList.Name = "grdList";
+ this.grdList.ReadOnly = true;
+ this.grdList.RowHeadersWidth = 30;
+ this.grdList.RowTemplate.Height = 23;
+ this.grdList.Size = new System.Drawing.Size(929, 274);
+ this.grdList.TabIndex = 46;
+ //
+ // tabPage1
+ //
+ 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(929, 274);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鐗╂枡淇℃伅";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 30;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(923, 268);
+ this.grdMain.TabIndex = 44;
+ this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+ this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage3);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(41, 187);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(937, 300);
+ this.tabControl1.TabIndex = 47;
+ //
+ // Gy_BarCodeBill_XiaBao
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Lavender;
+ this.ClientSize = new System.Drawing.Size(1017, 599);
+ this.Controls.Add(this.tabControl1);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.P1);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.panel3);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.KeyPreview = true;
+ this.Name = "Gy_BarCodeBill_XiaBao";
+ this.Text = "鍗曟嵁缂栬緫";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_BarCodeBill_XiaBao_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_BarCodeBill_XiaBao_Load);
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_BarCodeBill_XiaBao_Paint);
+ this.Resize += new System.EventHandler(this.Gy_BarCodeBill_XiaBao_Resize);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ this.P1.ResumeLayout(false);
+ this.P1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ this.tabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton bc;
+ private System.Windows.Forms.ToolStripButton cz;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.Label lblCaption;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label txtHMaker;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label txtHUpDateDate;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label txtHUpDater;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Label txtHCloseDate;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label txtHCloseMan;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label txtHCheckDate;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label txtHChecker;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label txtHMakeDate;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label txtHDeleteDate;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label txtHDeleteMan;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripButton DelRow;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.ComboBox cmbSourceBillType;
+ private System.Windows.Forms.Button cmdSourceBillNo;
+ private System.Windows.Forms.TextBox txtHSourceBillNo;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.PictureBox pic1;
+ private System.Windows.Forms.Button cmdHEmpID;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.ComboBox cmbHOrgID;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.DataGridView grdList;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.ProgressBar pb1;
+ private System.Windows.Forms.ToolStripButton sdy;
+ private System.Windows.Forms.ToolStripButton spRow;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripButton AddRow;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.CheckBox chkUpdateSubDate;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.resx"
new file mode 100644
index 0000000..7577a36
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.resx"
@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+ GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+ Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+ EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+ U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+ w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+ AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+ M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+ eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+ 5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+ cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
+ 6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
+ x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
+ H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ DbT/AOM1xZ8HqOq0f8Iiv900v7Pp/wAofXZ/zHZf8NqeJe+m6L/4LbT/AOM0q/to+Je+naKP+4baf/Ga
+ 4z/hEV/umgeEAeimj+z4fyh9cn/Mdn/w2n4l/wCgdon/AILbT/4zR/w2n4l/6B2if+C20/8AjNcb/wAI
+ cP7po/4Q4f3TR/Z8P5UH1yf8x2P/AA2p4l/6Bui/+C20/wDjNH/DaniX/oG6L/4LbT/4zXHf8IcP7ppP
+ +ENH9yj+z4fyh9cn/MdmP21vEo66do3/AILbT/4zSj9tbxKemm6MT/2DbT/4zXF/8IcB/Cfyo/4RAf3T
+ +VCy+n/KH1uf8x2g/bT8SnrpmiD/ALhtp/8AGaD+2n4lH/MN0QY/6htn/wDGa4z/AIQ9f7rflSHwcp/h
+ P5U/7Pp/yjWMqfzM7Q/tp+Juo0zRP/BZZ/8AxmlX9tLxNj/kHaIP+4bZ/wDxmuK/4Q8eh/Kj/hDx6H8q
+ X9n0/wCUFjJ92ds37aPiY8HTtEx/2DbP/wCM0L+2l4lLZOnaJ/4LbP8A+M1xP/CHj0P5UDweOPlb8qP7
+ Pp/yieMn3Z2zftp+JP8AoG6Kf+4bZ/8Axmm/8Nq+Jf8AoF6L/wCC20/+M1xf/CID+435Uf8ACID+435U
+ f2fT/lD65PuztP8AhtXxJ/0DdG/8Ftp/8Zo/4bU8Rj/mG6MP+4Zaf/Ga4v8A4RH0Q4+lH/CI/wCyw+go
+ /s+n/Kg+tz7s7MftqeJP+gfop/7htp/8ZoP7aviUDjT9D/HTLT/4zXGDwgfRvypR4NY9FYj3WhZfT/lH
+ 9cn3Oy/4bU8Tf9A7Q/8AwWWn/wAZo/4bU8Tf9A7Q/wDwWWn/AMZrjv8AhDW/uH/vmk/4Q4/3f0oWX0/5
+ QWNn/Mzsv+G1fEv/AED9Fx7abaf/ABmj/htbxN/0D9F/8Ftn/wDGa40+Dj/dP5Un/CHH+6fyp/2fT/lF
+ 9bn3Oy/4bV8Tf9A7Rf8AwW2f/wAZpf8AhtXxP/0DtF/8Ftn/APGa4z/hDx/dP5Uf8IgP7p/Kl/Z9P+Uf
+ 1yp3Oz/4bU8S/wDQP0b/AMFtn/8AGaP+G1vE3bTtFx/2DbP/AOM1xn/CID+6fypR4OB/hIoWX0/5RfW5
+ 92dkf21fEx66fog/7hln/wDGaP8AhtbxP/0D9E/8Ftp/8Zrjf+EOHpS/8Id/s/pQsvp/yoFjJ/zHY/8A
+ Da3if/oH6J/4LbT/AOM0f8NqeJv+gfon/gttP/jNcePBuf4QPwo/4Qz2H5Uf2fT/AJR/XZ/zHXn9tXxL
+ 307RSf8AsG2n/wAZpR+2r4k/6B2ig/8AYNtP/jNcefBn+zTf+EOHpQsvp/yh9cqfzHZn9tPxKOPsGi/+
+ C20/+M0H9tLxKQSLDRCR2/s20/8AjNcZ/wAIcPSl/wCEOH90flR/Z9P+UX1up/Mzsf8AhtTxN/0DtD/8
+ Flp/8Zo/4bU8S99O0Q/TTbT/AOM1x3/CHj+6Pypf+ENH90/lQsvp/wAoLGVP5mdgf21PEo/5h2i/+C20
+ /wDjNJ/w2r4m3Z/s7RT9NMtP/jNcefBo/un8qP8AhDB/dYfhR/Z9P+UPrlT+Y7H/AIbW8S9Dp2igf9gy
+ 0/8AjNJ/w2r4l/6B2i/+Cyz/APjNcd/whwzjaRR/whw9KP7Ph/KCxlTudl/w2r4l/wCgdon/AILbT/4z
+ R/w2p4l/6B2if+C20/8AjNcb/wAIcPSl/wCEPH90flQsvp/ygsXU7nZf8Nq+JT007Rh/3DbT/wCM0f8A
+ Danic9NP0U5/6hlp/wDGa43/AIQ8f3R+VJ/who67Cc0LL6f8o/rlT+Y7M/tp+Jz00/RT/wBwy0H/ALRp
+ P+G0/E//AED9F/8ABZaf/Ga43/hDf9g0f8Ib/sGn/Z9P+VAsbP8AmZ2X/DaXif8A6B+in/uGWn/xmlH7
+ anicDjTtE/8ABXaf/Ga43/hDP9k0f8IZ/sml/Z8P5UL67P8AmOw/4bS8T/8AQO0X/wAFlp/8Zpf+G0/E
+ 46afon/grtP/AIzXHf8ACGf7Jo/4Qz/ZNP6hD+VB9dqfzHY/8NpeJ/8AoG6L/wCCu0/+M0v/AA2p4n/6
+ B+if+Cy0/wDjNcb/AMIZ/smj/hDP9k0ll9P+VB9dn/Mdl/w2l4nzn+ztEP8A3C7T/wCM0f8ADaXiftp2
+ iH/uF2n/AMZrjP8AhDf9g0f8Ib/sGhZfT/lQfXJ/zHZf8NpeJiMf2douf+wZaf8Axmj/AIbT8T/9A7Rf
+ /BZaf/Ga43/hDf8AYNH/AAhv+waay+H8qD65P+Y7H/htHxP/ANA3RP8AwW2n/wAZp3/DafifnOnaL/4L
+ bT/4zXF/8IkP7h/KlHhEHqhA+lDy+n/Kh/XKnc7P/htTxP207Rf/AAWWn/xmlP7anicgf6Boo/7hlp/8
+ ZrjP+EQX0P8A3zSf8Iev90n8KX9n0/5RfXKnc7P/AIbU8Tgc6fo2D/1DLT/4zSL+2n4l/wCfDRR/3C7T
+ /wCM1xv/AAh6/wB1vypf+ENX0P5Uf2fT/lQ/rlTuzsv+G1fEo/5cNF/8Flnj/wBE0p/bV8Sn/lw0XH/Y
+ Ms//AIzXGf8ACGr6H8qT/hDl9Dj6Uf2fT/lQvrdTuzs/+G0PEv8A0D9EI99MtP8A4zQf20PEwGRp2iE/
+ 9g20/wDjNcYfB6+hP4Uf8Iev91vyo/s+n/Kg+uVO7Oy/4bU8T/8AQO0X/wAFtp/8Zo/4bT8T/wDQO0X/
+ AMFtp/8AGa43/hER/dP5Uf8ACIjsp/Kj+z6f8ofXKnc7L/htLxP1Om6L/wCC20/+M0n/AA2p4l76foo/
+ 7h1p/wDGa43/AIREf3Dz7Uf8IgP7jflT/s+n/KCxlTuzs/8AhtTxKemn6If+4dZ//GaP+G0vEv8A0DtE
+ /wDBdaf/ABmuMHg8H+Aij/hEB/dP5Uv7Pp/yoPrdTudn/wANq+Jv+gdov/gttP8A4zR/w2p4m76fohH/
+ AGDbT/4zXGf8IgP7p/Kj/hEB/dP5U1l9P+UFjKnc7P8A4bW8Tf8AQO0X/wAFtp/8ZoH7aviYf8w7RR/3
+ DbT/AOM1xn/CID+6fypR4OB/hIpf2dT/AJUNYyp/Mzsx+2n4mPA07RMf9g20/wDjNB/bU8S9Dp+iZ/7B
+ tn/8ZrjP+EOHpR/whw9KP7Pp/wAqB4yf8zOy/wCG1vE//QP0T/wWWf8A8ZpT+2r4m76foo/7hln/APGa
+ 4z/hDQOi0f8ACHD+6aP7Pp9IoHjJ/wAzOzP7afiY9dP0Xj/qGWf/AMZpB+2n4m3f8g/RM/8AYNtP/jNc
+ aPBoPUYpf+ENHoKP7Ph/KhLGT/mOw/4bS8T5407RP/Bbaf8AxmlP7aXifHOn6Jj/ALBtp/8AGa43/hDh
+ 6Uf8IcPSj+z6f8qH9bqd2dl/w2n4m/6B2i49f7MtP/jNH/DafiXp/Z+iY/7Blp/8Zrjf+EOHpR/whw9K
+ f9n0/wCUPrlTudl/w2l4l/6B+if+Cy0/+M0f8NpeJP8AoH6J/wCCy0/+M1xv/CHD0o/4Q4elH1Cn/KH1
+ up3Z2Y/bV8Sr00/RP/BZaf8Axml/4bX8TdrDRef+oZaf/Ga4v/hDh6Uf8IcPShZfT/lD63U7s7P/AIbV
+ 8Tf9A/RP/BZaf/GaD+2r4mPA0/RSf+wbaf8AxmuM/wCEOHpR/wAIcPSj+z6f8ofW6ndnZf8ADanif/oH
+ aL/4LbT/AOM0f8NqeKP+gdon/gstP/jNcb/whw9KP+EOHpS/s+n/ACoFi6ndnZD9tPxOM507RB/3DbT/
+ AOM07/htTxMB/wAg7Rf/AAW2n/xmuLPg4dlo/wCEOHofyoeAp/yoPrlTudn/AMNp+Jcc6foo/wC4baf/
+ ABmg/to+JT107Rv/AAW2n/xmuMHg0Htj8KP+ENHpn8KFl9P+VCWMqfzHZ/8ADaHiT/oH6L/4LbT/AOM0
+ f8NpeJRnGnaKf+4Zaf8AxmuN/wCENX0P5Un/AAhw/un8qP7Pp/yoPrlT+Y7M/tqeJv8AoHaKf+4Zaf8A
+ xmk/4bU8T/8AQN0b/wAFtp/8Zrjf+EOH90/lSjwaPQCj+z6f8qGsZPuzsh+2n4mI507Rh/3DbT/4zTv+
+ G0fEpOf7P0Uf9wy0P/tGuL/4Q0ego/4Q0ego/s+n/Kg+t1O7Oz/4bT8Sj/mHaN/4LLQf+0aQ/to+Je2n
+ aKf+4Zaf/Ga4z/hDh6Uf8IcPSj+z6f8AKg+uVO7OzP7afiftp2ikf9gy0/8AjNJ/w2p4mHXTtFH/AHDL
+ T/4zXG/8IcPSg+DgP4SaP7Pp/wAqD65Puzsv+G1vEY66foo/7hlp/wDGaP8AhtbxIeP7P0Xn/qG2n/xm
+ uM/4RAf3T+VH/CID+6fyprL6f8oLGVO7OyP7a3iQH/kH6N/4LLT/AOM0f8Nq+Jf+gdov/gss/wD4zXG/
+ 8IgP7p/Kl/4RAf3f0pfUKf8AKH1yfdnY/wDDa3iUZP8AZ+ijH/UMs/8A4zSf8Nq+Jf8AoHaN/wCC20/+
+ M1x//CID+7+lH/CID+7+lNYCn/KCxk+7PVv+FeX/APz4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH
+ /gJH/hR/wgmh/wDQF0j/AMBI/wDCvDfGlD/ny/8AwJf5Hp/6sVf+fi+5/wCZ+S3/AAr6+/58J/zX/Gj/
+ AIV9ff8APhP+a/41+tP/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hS/10of8APl/+BL/IP9WK
+ v/P1fc/8z8lv+FfX3/PhP+a/40h+Hl9jmwn/ADX/ABr9av8AhBND/wCgLpH/AICR/wCFH/CCaH/0BdI/
+ 8BI/8KFxpQ/58v8A8CX+Qf6sVf8An6vuf+Z+So+HV8RkWE/5r/jS/wDCvL5ePsE/5r/jX60/8IJof/QF
+ 0j/wEj/wo/4QTQ/+gLpH/gJH/hT/ANdKH/Pl/wDgS/yF/qxV/wCfq+5/5n5Lf8K+vv8Anwn/ADX/ABo/
+ 4V9ff8+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBdKH/Pl/ev8g/1Yq/8
+ /V9z/wAz8lv+FfX3/PhP+a/40f8ACvr7/nwn/Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/
+ AMKP9dKH/Pl/ev8AIP8AVir/AM/V9z/zPyW/4V9ff8+E/wCa/wCNH/Cvr7/nwn/Nf8a/Wn/hBND/AOgL
+ pH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/
+ JUfDy/IOdPnP4r/jR/wru+/6B9x/47/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH/gJH/hQuNKH/AD5f
+ 3r/IP9WKv/P1fc/8z8lR8O77tp9x+a/40v8Awru//wCfC4/Nf8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9
+ AXSP/ASP/Cn/AK6UP+fL/wDAl/kP/Vir/wA/V9z/AMz8lv8AhXd//wA+FwfxX/Gk/wCFd33/AD43H/fS
+ /wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qv9WKv/P1fc/8AM/JX
+ /hXd9/z43H/fS/40f8K6viP+PCc/iv8AjX61f8IJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ
+ /wCfL/8AAl/kH+rFX/n6vuf+Z+Sv/Cur7/oHz/mv+NA+HeoDgWEwH1X/ABr9av8AhBND/wCgLpH/AICR
+ /wCFH/CCaH/0BdI/8BI/8KP9dKH/AD5f/gS/yGuGKv8Az9X3P/M/Jb/hXd//AM+M3/jv+NH/AAry/wD+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X/4Ev8AIP8AVmr/AM/V9z/z
+ PyWPw6vyedPn/Nf8aT/hXd8Dxp8+f+AnP61+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66
+ UP8Any//AAJf5D/1Zq/8/V9z/wAz8lf+Fe3/APz4T8f7v+NH/Cvb/wD58J//AB3/ABr9av8AhBND/wCg
+ LpH/AICR/wCFH/CCaH/0BdI/8BI/8KFxpQ/58v8A8CX+Qv8AVmr/AM/V9z/zPyV/4V7f/wDPhP8A+O/4
+ 0v8Awr+//wCgfN/47/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr+//wCgfN/47/jR/wAK/v8A/oHzf+O/41+tP/CCaH/0BdI/8BI/8KP+EE0P/oC6
+ R/4CR/4Uf66UP+fL/wDAl/kH+rFX/n4vuf8Amfkt/wAK/v8A/oHzf+O/40f8K/v/APoHzf8Ajv8AjX60
+ /wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf5B/qxV/5+L7n/mfkt/wr+/8A
+ +gfN/wCO/wCNH/Cv7/8A58Jh/wB8/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBd
+ KH/Pl/8AgS/yD/Vir/z9X3P/ADPyW/4V9fn/AJcZh/3yf60n/Cu9QPIsrgf98/41+tX/AAgmh/8AQF0j
+ /wABI/8ACj/hBND/AOgLpH/gJH/hTXGlD/ny/wDwJf5CXDFX/n6vuf8Amfkr/wAK71D/AJ8Z/wDx3/Gk
+ /wCFd3//AD4T/wDjv+NfrX/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+ulD/ny/8AwJf5D/1Yq/8A
+ P1fc/wDM/JQfDq/6/YJ8f8B/xpf+Fe32P+QfN+a/41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4U
+ f66UP+fL/wDAl/kL/Vir/wA/V9z/AMz8lv8AhXt/n/jwnz/wH/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0
+ j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8A
+ Gj/hXl//AM+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/k
+ H+rFX/n6vuf+Z+S3/CvL/wD58J/zX/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAu
+ kf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8AGj/hXl//AM+E/wCa/wCN
+ frT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n6vuf+Z+S3/CvL
+ /wD58J/zX/Gj/hXd9/0D5/8Ax3/Gv1p/4QTQ/wDoC6R/4CR/4Uf8IJof/QF0j/wEj/wo/wBdKH/Pl/8A
+ gS/yD/Vir/z9X3P/ADPyW/4V3ff9A+f/AMd/xpP+FfX/AEFhOMe6/wCNfrV/wgmh/wDQF0j/AMBI/wDC
+ j/hBND/6Aukf+Akf+FC40of8+X/4Ev8AIf8AqxV/5+L7n/mfkr/wr2//AOfGb81/xo/4V7f/APPjN+a/
+ 41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf660P+fL+9f5B/qxV/5+L7n/AJn5K/8ACvb/AP58
+ ZvzX/Gj/AIV7f/8APjN+a/41+tX/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hR/rrQ/58v71/
+ kH+rFX/n4vuf+Z+Sv/Cvb/8A58ZvzX/Gj/hXt/8A8+M35r/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH
+ /gJH/hR/rrQ/58v71/kH+rFX/n4vuf8Amfkr/wAK9v8A/nxm/Nf8aP8AhXt//wA+M35r/jX61f8ACCaH
+ /wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/5n5K/8K9v/wDnxm/Nf8aP
+ +Fe3/wDz4zfmv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/wCZ
+ +Sv/AAr2/wD+fGb81/xo/wCFe3//AD4zfmv+NfrV/wAIJof/AEBdI/8AASP/AAo/4QTQ/wDoC6R/4CR/
+ 4Uf660P+fL+9f5B/qxV/5+L7n/mfkt/wr+//AOgfN/47/jSH4f3/AE+wTf8Ajv8AjX61f8IJof8A0BdI
+ /wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n4vuf+Z+Sv/Cvb/wD58ZvzX/Gj/hXt
+ /wD8+M35r/jX61f8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIULjSh/z5f3r/IP9WKv/Pxfc/8A
+ M/JX/hXt/wD8+M35r/jR/wAK9v8A/nxm/Nf8a/Wr/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMKP
+ 9daH/Pl/ev8AIP8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/
+ 4CR/4Uf8IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+
+ fGb81/xr9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/
+ JX/hXt//AM+M35r/AI07/hXt/wD8+Ev/AI7/AI1+tH/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4
+ Uf66UP8Any/vX+Qf6sVf+fi+5/5n5L/8K81DnNjNj/gP+NN/4V9ff8+E5/Ff8a/Wn/hBND/6Auk/+Acf
+ +FH/AAgmh/8AQF0n/wAA4/8ACk+NKH/Pl/8AgS/yF/qxV/5+L7n/AJn5Lf8ACv77/nwn/Nf8aD8Pr/8A
+ 58Jx/wB8/wCNfrV/wguh/wDQF0j/AMA4/wDCj/hBdD/6Aukf+Acf+FH+ulD/AJ8v/wACX+QLhir/AM/F
+ 9z/zPyW/4V5f/wDPjP8A+O/40n/Cvr//AJ8Zv/Hf8a/Wr/hBdD/6Aukf+Acf+FH/AAguh/8AQF0j/wAA
+ 4/8ACj/XSh/z5f8A4Ev8g/1Yq/8AP1fd/wAE/JX/AIV9f/8APjN/47/jR/wr6/8A+fGb/wAd/wAa/Wr/
+ AIQXQ/8AoC6R/wCAcf8AhR/wguh/9AXSP/AOP/Cj/XSh/wA+X/4Ev8g/1Yq/8/V93/BPyV/4V9f/APPj
+ N/47/jR/wr6//wCfGb/x3/Gv1q/4QXQ/+gLpH/gHH/hR/wAILof/AEBdI/8AAOP/AAo/10of8+X/AOBL
+ /IP9WKv/AD9X3f8ABPyVPw71Dp9huB/3yP60f8K8vxx9inP4r/jX61f8ILof/QF0j/wDj/wo/wCEF0P/
+ AKAukf8AgHH/AIUf660P+fL/APAl/kC4Yq/8/V9z/wAz8lf+Fe34/wCXGf8A8d/xpP8AhX1//wA+M/8A
+ 47/jX61/8ILof/QF0j/wDj/wpP8AhBND/wCgLpP/AIBx/wCFNca0P+fL+9f5AuGKv/Pxfc/8z8lv+Ff3
+ /wDz4T/+O/40f8K9v/8Anxm/Nf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny
+ /vX+Q/8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/4CR/4Uf8
+ IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+fGb81/xr
+ 9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/JX/hXt//
+ AM+M35r/AI0f8K9v/wDnxm/Nf8a/Wr/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF1of8+X96/y
+ D/Vir/z8X3P/ADPyV/4V7f8A/PjN+a/40f8ACvb/AP58ZvzX/Gv1q/4QTQ/+gLpH/gJH/hR/wgmh/wDQ
+ F0j/AMBI/wDCj/XWh/z5f3r/ACD/AFYq/wDPxfc/8z8lf+Fe3/8Az4zfmv8AjR/wr2//AOfGb81/xr9a
+ v+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXWh/z5f3r/IP9WKv/Pxfc/8AM/JX/hXmof8APhN+
+ a/40v/Cvb/vYT5/4D/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr2//wCfCf8A8d/xo/4V7f8A/PhP/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4
+ QTQ/+gLpH/gJH/hR/rrR/wCfL/8AAl/kL/Vir/z9X3P/ADPyW/4V5f8A/PhP/wCO/wCNH/Cvr7/nwn/N
+ f8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1
+ 9/z4T/mv+NH/AAr2/wCMWE+Pqv8AjX60/wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8A
+ ny//AAJf5B/qxV/5+L7n/mfkt/wry/8A+fCf81/xo/4V5f8A/PhP+a/41+tP/CCaH/0BdI/8BI/8KP8A
+ hBND/wCgLpH/AICR/wCFH+ulD/ny/wDwJf5B/qxV/wCfq+5/5n5Lf8K8v/8Anwn/ADX/ABo/4V5qBGDY
+ T/mv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8AhR/rpQ/58v8A8CX+Qf6sVf8An6vuf+Z+
+ Sv8Awrq+/wCgfOD9V/xpR8O78dNPn/Nf8a/Wn/hBND/6Aukf+Akf+FH/AAgmh/8AQF0j/wABI/8ACl/r
+ pQ/58v8A8CX+Q/8AVir/AM/F9z/zPyW/4V5fnpYTj8V/xo/4V3f/APPjN/47/jX60/8ACCaH/wBAXSP/
+ AAEj/wAKP+EE0P8A6Aukf+Akf+FP/XSh/wA+X/4Ev8g/1Yq/8/F9z/zPyW/4V3f/APPjN/47/jR/wru/
+ /wCfGb/x3/Gv1p/4QTQ/+gLpH/gJH/hR/wAIJof/AEBdI/8AASP/AAo/10of8+X/AOBL/IP9Wav/AD8X
+ 3P8AzPyW/wCFd3//AD4zf+O/40f8K7v/APnxm/8AHf8AGv1p/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF
+ 0j/wEj/wo/10of8APl/+BL/IP9Wav/Pxfc/8zUwfQ/lRg+h/KvyDHxY8VZP/ABU3iD/wYzf/ABVH/C2f
+ FX/QzeIP/BjN/wDFV8N9W8z7C5+vmD6H8qMH0P5V+Qf/AAtnxV/0M3iD/wAGM3/xVH/C2fFX/QzeIP8A
+ wYzf/FUnh/MHI/XzB9D+VGD6H8q/IP8A4Wz4q/6GbxB/4MZv/iqR/i14rGMeJvEIx/1EZv8A4qj6v5i5
+ j9fcH0P5UYPofyr8gP8Ahbniv/oZ/EP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Kpew8w5z9f8AB9D+VGD6
+ H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPYeYKR+v8Ag+h/KjB9D+VfkB/wtrxX
+ /wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/wChm8Q/+DGb
+ /wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8La8V/wDQzeIf/BjN/wDFUf8AC2vF
+ f/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/AIMZ
+ v/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wUj9f8
+ H0P5UYPofyr8gP8Ahbfiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4Pofy
+ owfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8La8V/9DN4h/wDBjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/wCF
+ teK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/0M3iH/AMGM
+ 3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/4W14r/6GbxD/AODGb/4qj/hbXiv/
+ AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeIf/BjN/8AFUf8La8V/wDQzeIf/BjN
+ /wDFUew8wUj9f8H0P5UYPofyr8gP+FteK/8AoZvEP/gxm/8AiqP+FteK/wDoZvEP/gxm/wDiqPYeYKR+
+ v+D6H8qMH0P5V+QH/C2vFf8A0M3iH/wYzf8AxVH/AAtrxX/0M3iH/wAGM3/xVHsPMFI/X/B9D+VGD6H8
+ q/ID/hbXiv8A6GbxD/4MZv8A4qj/AIW14r/6GbxD/wCDGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wALa8V/
+ 9DN4h/8ABjN/8VR/wtrxX/0M3iH/AMGM3/xVHsPMFI/X/B9D+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4
+ qj/hbXiv/oZvEP8A4MZv/iqPYeYKR+v+D6H8qMH0P5V+QH/C2vFf/QzeIf8AwYzf/FUf8La8V/8AQzeI
+ f/BjN/8AFUew8wUj9f8AB9D+VGD6H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPY
+ eYKR+v8Ag+h/KjB9D+VfkB/wtrxX/wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/
+ lRg+h/KvyA/4W14r/wChm8Q/+DGb/wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8
+ La8V/wDQzeIf/BjN/wDFUf8AC2vFf/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP
+ /gxm/wDiqP8AhbXiv/oZvEP/AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtvxX/0M3iH/wAGM3/xVH/C
+ 2vFf/QzeIf8AwYzf/FUew8wUj9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDg
+ xm/+Ko9h5gpH6/4PofyowfQ/lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1
+ /wAH0P5UYPofyr8gP+FteK/+hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P
+ 5V+QH/C2vFf/AEM3iH/wYzf/ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/
+ AKGbxD/4MZv/AIqj/hbXiv8A6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/
+ AMVR/wALa8V/9DN4h/8ABjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/
+ +hm8Q/8Agxm/+Ko9h5gpH6/4PofyowfQ/lX5Af8AC2/Ff/Qz+If/AAYzf/FUf8La8V/9DN4h/wDBjN/8
+ VR7DzBSP1/wfQ/lRg+h/KvyA/wCFteK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h
+ /KjB9D+VfkB/wtrxX/0M3iH/AMGM3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/
+ 4W14r/6GbxD/AODGb/4qj/hbXiv/AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeI
+ f/BjN/8AFUf8La8V/wDQzeIf/BjN/wDFUew8wUj9f8H0P5UYPofyr8gP+Ft+K/8AoZvEP/gxm/8AiqP+
+ Ft+Kz18T+If/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/
+ AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wU
+ j9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/
+ lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+
+ hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/
+ ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A
+ 6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/
+ 8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4
+ PofyowfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8Lb8Vjp4n8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2/Ff/AEM/iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5i5/I/X/B9D
+ +VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//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="sdy.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="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="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ 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="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</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>
+ <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>
+ <data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>62</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index 5fe6f31..daf7c8f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -2244,6 +2244,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
index a9f4097..b132f92 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
@@ -2357,6 +2357,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index 0f192e4..c2dce87 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -1009,6 +1009,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index 42705a0..003b41e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -1156,6 +1156,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
@@ -1169,6 +1170,7 @@
{
sWMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HWMinQtyCol].Value);
}
+ sWMoney = Math.Round(sWMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sWMoney = Math.Ceiling(sWMoney);
grdMain.Rows[sRow].Cells[HWBQtyCol].Value = sWMoney;
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 04e789b..1a7a3a9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -65,24 +65,24 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- if (ds.Tables[0].Rows.Count > 0 && ds != null)
- {
+ //if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ヨ鍒伴儴闂ㄦ暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
- objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ヨ鍒伴儴闂ㄦ暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
+ // objJsonResult.data = ds.Tables[0];
+ // objJsonResult.list = columnNameList;
+ // return objJsonResult;
+ //}
}
@@ -522,6 +522,8 @@
//DateTime HCheckDate = list[0].HCheckDate;
string HDeleteMan = list[0].HDeleteMan;
//DateTime HDeleteDate = list[0].HDeleteDate;
+ bool HWorkShopFlag = list[0].HWorkShopFlag;
+ long HEmpQtys = list[0].HEmpQtys;
//鏈骇鏍囧織
bool HEndFlag = true;
long HEntityID = 1;
@@ -562,7 +564,7 @@
return objJsonResult;
}
}
-
+
//鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
@@ -591,7 +593,17 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Gy_Department Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUseOrgID, "Gy_Warehouse");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
@@ -600,10 +612,10 @@
oCN.BeginTran();
oCN.RunProc("Insert into Gy_Department " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime,HWorkShopFlag,HEmpQtys) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
- "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate(),"+ Convert.ToString(HWorkShopFlag ? 1 : 0) + ","+ HEmpQtys + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -611,6 +623,19 @@
else
{
oCN.BeginTran();
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Warehouse");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//涓昏〃
oCN.RunProc("Update Gy_Department set " +
" HNumber='" + HNumber + "'" +
@@ -626,6 +651,8 @@
",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
",HUpDater='" + HUpDater + "'" +
",HUpDateDate= getdate()" +
+ ",HWorkShopFlag=" + Convert.ToString(HWorkShopFlag ? 1 : 0) +
+ ",HEmpQtys=" + HEmpQtys.ToString() +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index 952f761..2e7ec97 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -349,7 +349,18 @@
if (HItemID == 0)
{
oCN.BeginTran();
-
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Group where HNumber='" + HNumber + "'", "Gy_Process");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_Group_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_Group_BeforeSaveCtrl");
@@ -418,7 +429,18 @@
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Group where HItemID=" + HItemID, "Gy_Group");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_Group_BeforeSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_Group_BeforeSaveCtrl");
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 132746f..a6522b0 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -771,6 +771,18 @@
if (HItemID == 0)
{
oCN.BeginTran();
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Process where HNumber='" + HNumber + "'", "Gy_Process");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count!=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_Process_BeforeSaveCtrl " + HMakeEmp + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_Process_BeforeSaveCtrl");
@@ -845,7 +857,18 @@
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Process where HItemID=" + HItemID, "Gy_Process");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "" )
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_Process_BeforeSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_Process_BeforeSaveCtrl");
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index 0ba8333..706209c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -216,6 +216,18 @@
}
else//缂栬緫鏃跺垽鏂�
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Source where HItemID=" + oItem.HItemID, "Gy_Source");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index bfffd0d..f0ac05c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -283,7 +283,7 @@
Single msg_HRate = float.Parse(sArray[3]);
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
//鑾峰彇鏈�澶D鍊艰祴鍊�
DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Unit ", "Gy_Unit");
if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
@@ -388,6 +388,18 @@
}
else//缂栬緫鏃跺垽鏂�
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Unit where HItemID=" + oItem.HItemID, "Gy_Unit");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -444,10 +456,37 @@
}
if (bResult)
{
+ //鑷姩瀹℃牳鍔熻兘
+ if(oBill.oModel.HItemID == 0)
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Unit where HStopflag=0 and HNumber='" + oBill.oModel.HNumber.Trim() + "'", "Gy_Unit");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛佽嚜鍔ㄥ鏍稿け璐ユ壘涓嶅埌瀵瑰簲鍗曟嵁";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Gy_Unit_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ if (sAutoCheck == "Y")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛";
+ objJsonResult.data = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ objJsonResult.Verify = "Y";
+ return objJsonResult;
+ }
+ }
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index b7a2c38..4e856a5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -386,6 +386,17 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Gy_Warehouse Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUSEORGID, "Gy_Warehouse");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
@@ -412,6 +423,19 @@
else {
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Warehouse where HItemID=" + HItemID, "Gy_Warehouse");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//涓昏〃
oCN.RunProc("Update Gy_Warehouse set " +
" HNumber='" + HNumber + "'" +
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 2d264f4..1729c44 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -697,6 +697,18 @@
if (HItemID == 0)
{
oCN.BeginTran();
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HNumber + "'", "Gy_WorkCenter");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_WorkCenter_BeforeSaveCtrl " + HMaker + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_WorkCenter_BeforeSaveCtrl");
@@ -767,7 +779,18 @@
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HItemID, "Gy_WorkCenter");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_WorkCenter_BeforeSaveCtrl " + HMaker + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_WorkCenter_BeforeSaveCtrl");
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index f92698d..699b9b2 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -171,6 +171,7 @@
long HMainSourceEntryID = mainList[0].HICMOEntryID;
string HMainSourceBillNo = mainList[0].HICMOBillNo;
+ //鍒ゆ柇鐢熶骇璐ㄩ噺姹囨姤鍗曟槸鍚﹀瓨鍦�
ds = oCN.RunProcReturn("select * from Sc_QualityReportBillMain WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Sc_QualityReportBillMain");
if (ds.Tables[0].Rows.Count != 0) {
objJsonResult.code = "0";
@@ -544,7 +545,7 @@
List<Model.ClsSc_AssemblyBillSub> sub = new List<Model.ClsSc_AssemblyBillSub>();
sub = JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(sSubStr);
-
+ //鏉＄爜涓婇亾宸ュ簭鏄惁杩囩珯
ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + omodel.HBarCode_P + "'," + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
{
@@ -563,6 +564,7 @@
return objJsonResult;
}
+ //鍒ゆ柇鏉＄爜鏄惁宸茬粡鍑虹珯
ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 浜у搧鏉＄爜='" + omodel.HBarCode_P + "' and HProcExchInterID="+ omodel .HProcExchInterID+ " and HProcExchEntryID="+ omodel.HProcExchEntryID + " and HProcID="+ omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
if (ds.Tables[0].Rows.Count > 0)
@@ -705,11 +707,13 @@
int HTemporaryAreaID = 0;//鏆傛斁鍖�
int HShiftsID = 0;
+ //鑾峰彇褰撳墠鐝
DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
if (set.Tables[0].Rows.Count > 0)
{
HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
}
+ //鍒ゆ柇褰撳ぉ褰撳墠鐨勬祦杞崱鏄惁鏈夊嚭绔欏崟
ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain a WITH(NOLOCK) left join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID where a.HInterID=" + HInterID + " and HBillNo='" + HBillNo + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "' ", "Sc_StationOutBillMain");
if (ds.Tables[0].Rows.Count == 0)
@@ -1164,6 +1168,7 @@
ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
+ //鏌ヨ娴佽浆鍗℃墍鏈夊伐搴忎俊鎭�
ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBillHICOMProcessExchange WITH(NOLOCK) where 鏉＄爜='" + HBarCode + "' ", "h_v_Gy_BarCodeBillHICOMProcessExchange");
if (ds.Tables[0].Rows.Count == 0)
@@ -1638,7 +1643,7 @@
Model.Sc_AssemblyBill_BindSourceTemp temp = new Model.Sc_AssemblyBill_BindSourceTemp();
temp = JsonConvert.DeserializeObject<Model.Sc_AssemblyBill_BindSourceTemp>(sSubStr);
-
+ //宸ュ簭杩斾慨璁板綍鍗� 閰嶄欢琛�
ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub_Mater where HInterID=" + model.HInterID+ " order by HEntryID desc", "Sc_SourceLineRepairBillSub_Mater");
oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub_Mater
@@ -1652,7 +1657,7 @@
oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);
//oCN.RunProc("exec h_p_AssemblyBill_Temp '" + temp.HProcExchBillNo + "'," + model.HProcess + "," + temp.HMaterID + ",'" + temp.HBatchNo + "'");
}
- else if (HResult == "NG"|| HResult == "OK") {
+ else if (HResult == "NG"|| HResult == "OK") {
Model.ClsSc_SourceLineRepairBillMain model = new Model.ClsSc_SourceLineRepairBillMain();
model = JsonConvert.DeserializeObject<Model.ClsSc_SourceLineRepairBillMain>(sMainStr);
@@ -2164,6 +2169,7 @@
List<object> columnNameList = new List<object>();
+ //鏌ヨ閰嶄欢娓呭崟淇℃伅
string sql = @"exec h_p_GZ_BarCodeBillList '" + HMaterNumber + "','" + HBatchNo + "','" + sWhere + "'";
ds = oCN.RunProcReturn(sql, "h_p_GZ_BarCodeBillList");
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
index 35c2687..1362eae 100644
--- a/WebAPI/Controllers/GG_NoticeController.cs
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -318,7 +318,7 @@
try
{
List<object> columnNameList = new List<object>();
- var sql = "select top(10) m.HMakeDate as 鏃ユ湡, m.HLevel as 鐘跺喌, m.HContext as 涓婚 " +
+ var sql = "select top(10) m.HInterID,s.HEntryID,m.HMakeDate as 鏃ユ湡, m.HLevel as 鐘跺喌, m.HContext as 涓婚 " +
", m.HContext as 鍐呭" +
", m.HSendMan as 鍙戦�佷汉, s.HReceiveMan as 鎺ユ敹浜�, d.HName as 鍙戦�侀儴闂� " +
" from OA_InformBillMain as m" +
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 85434fe..1cf9399 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -3601,7 +3601,7 @@
}
//鍒锋柊榛樿宸ヨ壓璺嚎
- oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID+",'" + user + "'");
+ oCN.RunProc("exec h_p_Gy_RoutingBillSetDefault " + HInterID+",'" + user + "'");
oCN.Commit();//鎻愪氦浜嬪姟
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index e716bed..16b14b6 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1387,7 +1387,7 @@
//==================================================================================
//瀹℃牳鎻愪氦
- if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (!oBill.CheckBill(int.Parse(HInterID), oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1444,7 +1444,7 @@
//===========================================================
//鍙嶅鏍告彁浜bandonCheck
- if (!oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (!oBill.AbandonCheck(int.Parse(HInterID), oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index badc91b..549598b 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -59,6 +59,46 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴鏍规嵁璐ｄ换浜虹瓫閫夊姞杞借祫婧愬垪琛�
+ [Route("ReportPlatForm/SearchGetLineBindBillListStatus")]
+ [HttpGet]
+ public object SearchGetLineBindBillListStatus(string HUserName,string HStatus)
+ {
+ try
+ {
+ //鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetSourceInfoByUser " + HUserName + ",'" + HStatus + "'", "h_p_JIT_GetSourceInfoByUser");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region 鎶ュ伐骞冲彴璧勬簮淇濆瓨
/// <summary>
/// 鎶ュ伐骞冲彴璧勬簮淇濆瓨
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index a438827..a5b53b3 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1614,8 +1614,166 @@
return objJsonResult;
}
#endregion
-
+
+ #region 鎶ュ伐骞冲彴蹇嵎寮�宸�
+ [Route("Sc_MESBeginWorkBill/FastBeginWorkBill")]
+ [HttpGet]
+ public object FastBeginWorkBill(string HBillType, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, string HSourceBillType,string user)
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID=" + HSourceEntryID + ",@HSourceBillNo='" + HSourceBillNo + "',@HSourceBillType='" + HBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
+
+ Models.ClsSc_MESBeginWorkBillMain ClsSc_MESBeginWorkBillMain = new Models.ClsSc_MESBeginWorkBillMain();
+ ClsSc_MESBeginWorkBillMain.HProcID = int.Parse(ds.Tables[0].Rows[0]["HProcID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HMaterID = int.Parse(ds.Tables[0].Rows[0]["HMaterID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HSourceID = int.Parse(ds.Tables[0].Rows[0]["HSourceID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HMainSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
+ ClsSc_MESBeginWorkBillMain.HMainSourceInterID = int.Parse(ds.Tables[0].Rows[0]["HSourceInterID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HMainSourceEntryID = ds.Tables[0].Rows[0]["HSourceEntryID"].ToString();
+ ClsSc_MESBeginWorkBillMain.HMainSourceBillType = HSourceBillType == null ? "" : HSourceBillType;
+ ClsSc_MESBeginWorkBillMain.HDeptID = int.Parse(ds.Tables[0].Rows[0]["HDeptID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HICMOInterID = int.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HICMOEntryID = int.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
+
+ ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser where 鐢ㄦ埛鍚嶇О='" + user + "'", "h_v_xt_UserAssociationSelect");
+
+ //if (ds.Tables[0].Rows[0]["HGroupID"].ToString() == "0")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺敤鎴锋病鏈夌粦瀹氱彮缁�!";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+
+ if (ds.Tables[0].Rows[0]["HEmpID"].ToString() == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺敤鎴锋病鏈夌粦瀹氳亴鍛�!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ClsSc_MESBeginWorkBillMain.HGroupID = int.Parse(ds.Tables[0].Rows[0]["HGroupID"].ToString());
+ ClsSc_MESBeginWorkBillMain.HEmpID = int.Parse(ds.Tables[0].Rows[0]["HEmpID"].ToString());
+
+ DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
+ List<Models.ClsSc_MESBeginWorkBillMain> lsmain = new List<Models.ClsSc_MESBeginWorkBillMain>();
+ lsmain.Add(ClsSc_MESBeginWorkBillMain);
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+
+ DBUtility.ClsPub.CurUserName = user;
+
+ foreach (Models.ClsSc_MESBeginWorkBillMain oItem in lsmain)
+ {
+ oItem.HBillNo = DBUtility.ClsPub.CreateBillCode("3787", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ oItem.HBillType = "3787";
+ oItem.HBillSubType = "3787";
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMaker = user;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //鎵弿鏃ユ湡锛堝勾-鏈�-鏃�-鏃�-鍒�-绉掞級
+ oItem.HRemark = "蹇嵎寮�宸�";
+ oBill.omodel = oItem;
+ }
+
+ oCN.BeginTran();
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult = false;
+ if (oBill.omodel.HInterID == 0)
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ }
+ ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鍗曟嵁!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (sAutoCheck == "Y")
+ {
+
+ if (!oBill.CheckBill(long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()), ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();
+
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
index 82c05ac..bfe1069 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
@@ -592,5 +592,168 @@
}
}
#endregion
+
+
+ #region 鎶ュ伐骞冲彴蹇嵎瀹屽伐
+ [Route("Sc_MESEndWorkBill/FastEndWorkBill")]
+ [HttpGet]
+ public object FastBeginWorkBill(string HBillType, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, string HSourceBillType, string user)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID=" + HSourceEntryID + ",@HSourceBillNo='" + HSourceBillNo + "',@HSourceBillType='" + HBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
+
+ Models.ClsSc_MESEndWorkBillMain ClsSc_MESEndWorkBillMain = new Models.ClsSc_MESEndWorkBillMain();
+ ClsSc_MESEndWorkBillMain.HProcID = int.Parse(ds.Tables[0].Rows[0]["HProcID"].ToString());
+ ClsSc_MESEndWorkBillMain.HMaterID = int.Parse(ds.Tables[0].Rows[0]["HMaterID"].ToString());
+ ClsSc_MESEndWorkBillMain.HSourceID = int.Parse(ds.Tables[0].Rows[0]["HSourceID"].ToString());
+ ClsSc_MESEndWorkBillMain.HMainSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
+ ClsSc_MESEndWorkBillMain.HMainSourceInterID = int.Parse(ds.Tables[0].Rows[0]["HSourceInterID"].ToString());
+ ClsSc_MESEndWorkBillMain.HMainSourceEntryID = long.Parse(ds.Tables[0].Rows[0]["HSourceEntryID"].ToString());
+ ClsSc_MESEndWorkBillMain.HMainSourceBillType = HSourceBillType == null ? "" : HSourceBillType;
+ ClsSc_MESEndWorkBillMain.HDeptID = int.Parse(ds.Tables[0].Rows[0]["HDeptID"].ToString());
+ ClsSc_MESEndWorkBillMain.HICMOInterID = int.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
+ ClsSc_MESEndWorkBillMain.HICMOEntryID = int.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
+ ClsSc_MESEndWorkBillMain.HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
+
+ ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser where 鐢ㄦ埛鍚嶇О='" + user + "'", "h_v_xt_UserAssociationSelect");
+
+ //if (ds.Tables[0].Rows[0]["HGroupID"].ToString() == "0")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺敤鎴锋病鏈夌粦瀹氱彮缁�!";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+
+ if (ds.Tables[0].Rows[0]["HEmpID"].ToString() == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺敤鎴锋病鏈夌粦瀹氳亴鍛�!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ClsSc_MESEndWorkBillMain.HGroupID = int.Parse(ds.Tables[0].Rows[0]["HGroupID"].ToString());
+ ClsSc_MESEndWorkBillMain.HEmpID = int.Parse(ds.Tables[0].Rows[0]["HEmpID"].ToString());
+
+ DLL.ClsSc_MESEndWorkBill oBill = new DLL.ClsSc_MESEndWorkBill();
+ List<Models.ClsSc_MESEndWorkBillMain> lsmain = new List<Models.ClsSc_MESEndWorkBillMain>();
+ lsmain.Add(ClsSc_MESEndWorkBillMain);
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+
+ DBUtility.ClsPub.CurUserName = user;
+
+ foreach (Models.ClsSc_MESEndWorkBillMain oItem in lsmain)
+ {
+ oItem.HBillNo = DBUtility.ClsPub.CreateBillCode("3788", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ oItem.HBillType = "3788";
+ oItem.HBillSubType = "3788";
+ oItem.HReportType = "3";//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMaker = user;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //鎵弿鏃ユ湡锛堝勾-鏈�-鏃�-鏃�-鍒�-绉掞級
+ oItem.HRemark = "蹇嵎瀹屽伐";
+ oBill.omodel = oItem;
+ }
+
+ oCN.BeginTran();
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult = false;
+ if (oBill.omodel.HInterID == 0)
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ }
+ ds = oCN.RunProcReturn("select * from Sc_MESEndWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESEndWorkBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鍗曟嵁!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESEndWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (sAutoCheck == "Y")
+ {
+
+ if (!oBill.CheckBill(long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()), ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();
+
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
index 83fa34d..b66e111 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
@@ -585,5 +585,170 @@
}
}
#endregion
+
+ #region 鎶ュ伐骞冲彴蹇嵎鍋滃伐
+ [Route("Sc_MESStopWorkBill/FastStopWorkBill")]
+ [HttpGet]
+ public object FastStopWorkBill(string HBillType, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, string HSourceBillType, string user)
+ {
+
+
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID=" + HSourceEntryID + ",@HSourceBillNo='" + HSourceBillNo + "',@HSourceBillType='" + HBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
+
+ Models.ClsSc_MESStopWorkBillMain ClsSc_MESStopWorkBillMain = new Models.ClsSc_MESStopWorkBillMain();
+ ClsSc_MESStopWorkBillMain.HProcID = int.Parse(ds.Tables[0].Rows[0]["HProcID"].ToString());
+ ClsSc_MESStopWorkBillMain.HMaterID = int.Parse(ds.Tables[0].Rows[0]["HMaterID"].ToString());
+ ClsSc_MESStopWorkBillMain.HSourceID = int.Parse(ds.Tables[0].Rows[0]["HSourceID"].ToString());
+ ClsSc_MESStopWorkBillMain.HMainSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
+ ClsSc_MESStopWorkBillMain.HMainSourceInterID = int.Parse(ds.Tables[0].Rows[0]["HSourceInterID"].ToString());
+ ClsSc_MESStopWorkBillMain.HMainSourceEntryID = long.Parse(ds.Tables[0].Rows[0]["HSourceEntryID"].ToString());
+ ClsSc_MESStopWorkBillMain.HMainSourceBillType = HSourceBillType == null ? "" : HSourceBillType;
+ ClsSc_MESStopWorkBillMain.HDeptID = int.Parse(ds.Tables[0].Rows[0]["HDeptID"].ToString());
+ ClsSc_MESStopWorkBillMain.HICMOInterID = int.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
+ ClsSc_MESStopWorkBillMain.HICMOEntryID = int.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
+ ClsSc_MESStopWorkBillMain.HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
+
+ ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser where 鐢ㄦ埛鍚嶇О='" + user + "'", "h_v_xt_UserAssociationSelect");
+
+ //if (ds.Tables[0].Rows[0]["HGroupID"].ToString() == "0")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺敤鎴锋病鏈夌粦瀹氱彮缁�!";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+
+ if (ds.Tables[0].Rows[0]["HEmpID"].ToString() == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺敤鎴锋病鏈夌粦瀹氳亴鍛�!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ClsSc_MESStopWorkBillMain.HGroupID = int.Parse(ds.Tables[0].Rows[0]["HGroupID"].ToString());
+ ClsSc_MESStopWorkBillMain.HEmpID = int.Parse(ds.Tables[0].Rows[0]["HEmpID"].ToString());
+
+ DLL.ClsSc_MESStopWorkBill oBill = new DLL.ClsSc_MESStopWorkBill();
+ List<Models.ClsSc_MESStopWorkBillMain> lsmain = new List<Models.ClsSc_MESStopWorkBillMain>();
+ lsmain.Add(ClsSc_MESStopWorkBillMain);
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+
+ DBUtility.ClsPub.CurUserName = user;
+
+ foreach (Models.ClsSc_MESStopWorkBillMain oItem in lsmain)
+ {
+ oItem.HBillNo = DBUtility.ClsPub.CreateBillCode("3789", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ oItem.HBillType = "3789";
+ oItem.HBillSubType = "3789";
+ oItem.HReportType = "3";//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMaker = user;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //鎵弿鏃ユ湡锛堝勾-鏈�-鏃�-鏃�-鍒�-绉掞級
+ oItem.HStopBeginWorkTime = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")));
+ oItem.HStopEndWorkTime = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.AddDays(30).ToString("yyyy-MM-dd")));
+ oItem.HRemark = "蹇嵎鍋滃伐";
+ oBill.omodel = oItem;
+ }
+
+ oCN.BeginTran();
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult = false;
+ if (oBill.omodel.HInterID == 0)
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ }
+ ds = oCN.RunProcReturn("select * from Sc_MESStopWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESStopWorkBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鍗曟嵁!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESStopWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (sAutoCheck == "Y")
+ {
+
+ if (!oBill.CheckBill(long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()), ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();
+
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 3725e1f..3b363f1 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -242,7 +242,7 @@
LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
- if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧"&& oSystemParameter.omodel.WMS_CampanyName != "涓夊崌") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
if (HSourceID == "" || HSourceID == "0")
{
@@ -333,7 +333,7 @@
LogService.CustomWriteLog("2.1:"+i, DateTime.Now.ToString("yyyy-MM-dd"));
- if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "涓夊崌") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
if (HSourceID == "" || HSourceID == "0")
{
@@ -2973,6 +2973,56 @@
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 瑕佹枡杩愮畻
+
+ [Route("JIT_DayPlanPlatFormBill/JIT_YLYS")]
+ [HttpGet]
+ public object JIT_YLYS(string sWhere, string user)
+ {
+ try
+ {
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+ string HWorkShopID = omdelMian.HWorkShopID.ToString();
+ var HStockOrgID = omdelMian.HProdORGID;
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_WorkDemandPlanBill_MOMaterReady " + HWorkShopID.ToString() + ",'" + user + "'," + HStockOrgID.ToString(), "h_p_JIT_WorkDemandPlanBill_MOMaterReady");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瑕佹枡杩愮畻鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); //杩愮畻鎴愬姛
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瑕佹枡杩愮畻澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay")]
[HttpGet]
@@ -3224,6 +3274,74 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏁版嵁鍑嗗 璁剧疆浠诲姟鍗曠浉鍏充俊鎭�(涓夊崌)
+ [Route("JIT_DayPlanPlatFormBill/ReadyData_SS")]
+ [HttpGet]
+ public object ReadyData_SS(string SWhere)
+ {
+ try
+ {
+ var list = SWhere.Split(',');
+ DataTable dt = new DataTable("date");
+ dt.Columns.Add("HICMOInterID", typeof(string));
+ dt.Columns.Add("HICMOEntryID", typeof(string));
+ dt.Columns.Add("灏忔椂浜ц兘", typeof(string));
+ dt.Columns.Add("鐢熶骇鍛ㄦ湡", typeof(decimal));
+ dt.Columns.Add("寮�宸ヤ綑閲�", typeof(decimal));
+ dt.Columns.Add("鏈�杩熷紑宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("鏈�杩熷畬宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("璁㈠崟闇�姹傛暟閲�", typeof(decimal));
+ dt.Columns.Add("璁㈠崟浜よ揣鏈�", typeof(DateTime));
+ dt.Columns.Add("HSourceID", typeof(decimal));
+ dt.Columns.Add("鐢熶骇璧勬簮", typeof(string));
+
+ for (int i = 0; i < list.Length; i++)
+ {
+ string HICMOInterID = list[i].Split(';')[0].ToString();
+ string HICMOEntryID = list[i].Split(';')[1].ToString();
+ string HSourceID = list[i].Split(';')[2].ToString();
+
+ Thread.Sleep(100);
+ ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID + "," + HICMOEntryID + "," + HSourceID, "h_p_Sc_GetInfoByICMOBillNo");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ DataRow dr = dt.NewRow();
+ dr["HSourceID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HSourceID"]);
+ dr["鐢熶骇璧勬簮"] = ds.Tables[0].Rows[0]["鐢熶骇璧勬簮"].ToString();
+ dr["灏忔椂浜ц兘"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["浜ц兘"]);
+ dr["鐢熶骇鍛ㄦ湡"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["鐢熶骇鍛ㄦ湡"]);
+ dr["寮�宸ヤ綑閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["寮�宸ヤ綑閲�"]);
+ dr["鏈�杩熷紑宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷紑宸ユ棩鏈�"]);
+ dr["鏈�杩熷畬宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷畬宸ユ棩鏈�"]);
+ dr["璁㈠崟闇�姹傛暟閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟"]);
+ dr["璁㈠崟浜よ揣鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["璁㈠崟浜よ揣鏈�"]);
+ dr["HICMOInterID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOInterID"]);
+ dr["HICMOEntryID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOEntryID"]);
+ dt.Rows.Add(dr);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 缂烘枡鍒嗘瀽鎶ヨ〃
public class MaterialShorAnalysis
{
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
index cc094e4..5630795 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
@@ -809,7 +809,7 @@
string msg = "";
oSystemParameter.ShowBill(ref msg);
- if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐"|| oSystemParameter.omodel.WMS_CampanyName == "涓夊崌")
{
//JIT渚涜揣鎻愬墠鏈燂紙澶╋級
if (JISLT == "")
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 7e43c66..914c003 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -7234,6 +7234,18 @@
}
else//缂栬緫鏃跺垽鏂�
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_PostSkill where HItemID=" + oItem.HItemID, "Gy_Group");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -7864,6 +7876,18 @@
}
else//缂栬緫鏃跺垽鏂�
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Post where HItemID=" + oItem.HItemID, "Gy_Post");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -19298,12 +19322,12 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 300 * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
+ ds = oCN.RunProcReturn("select top 300 * from h_v_Sc_ProcessExchangeBillList_PDA where 1=1 order by 鍗曟嵁鍙� desc,hsubid", "h_v_Sc_ProcessExchangeBillList_PDA");
}
else
{
- string sql = "select * from h_v_Sc_ProcessExchangeBillList where 1=1 " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList");
+ string sql = "select * from h_v_Sc_ProcessExchangeBillList_PDA where 1=1 " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList_PDA");
}
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -20967,6 +20991,33 @@
return objJsonResult;
}
}
+
+ //鑾峰彇鎵�鏈夋ā鍧楅〉闈�
+ [Route("Web/ModePageList")]
+ [HttpGet]
+ public object ModePageList()
+ {
+ try
+ {
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏�
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
#endregion
#region 淇濆瓨鑷畾涔夋暟鎹�
@@ -21066,7 +21117,7 @@
//蹇嵎鏂瑰紡鑷畾涔夎彍鍗曪細鑾峰彇鏍戠粍浠舵暟鎹�
[Route("Web/Xt_UserFastMenu_Display")]
[HttpGet]
- public object Xt_UserFastMenu_Display(string HMakeName, string HType)
+ public object Xt_UserFastMenu_Display(string HMakeName, string HType,string HModelAtributos)
{
try
{
@@ -21091,7 +21142,7 @@
menuInit.HSelected = false;
//鍒ゆ柇鐢ㄦ埛鏄惁閫変腑鏄剧ず璇ヨ彍鍗�
- String sql = "Select * from Xt_UserFastMenu where HSubFuncID = '" + ds.Tables[0].Rows[i]["HItemID"] + "' and HUserID='" + HMakeName + "'";
+ String sql = "Select * from Xt_UserFastMenu where HSubFuncID = '" + ds.Tables[0].Rows[i]["HItemID"] + "' and HUserID='" + HMakeName + "' and HModelAtributos='" + HModelAtributos + "'";
ds1 = oCn.RunProcReturn(sql, "Xt_UserFastMenu");
if (ds1.Tables[0].Rows.Count > 0) //瀵逛簬Gy_Menu_1琛ㄤ腑鐨勮彍鍗曡妭鐐癸紝閫氳繃妫�绱㈠湪Gy_MenuDefineSet琛ㄤ腑瀵瑰簲鐢ㄦ埛鏄惁瀛樺湪璇ヨ妭鐐圭殑淇℃伅锛屽垽鏂鐢ㄦ埛鏄惁閫変腑璇ヨ妭鐐归渶瑕佸姞杞芥樉绀哄湪渚ц彍鍗曟爮
{
@@ -21159,6 +21210,7 @@
string HMakeName = sArray[1].ToString();
string saveData = sArray[0].ToString();
string HTypes = sArray[2].ToString();
+ string HModelAtributos = sArray[3].ToString();
List<SaveDefineMenu> saveDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SaveDefineMenu>>(saveData);
//澹版槑鏁版嵁搴撴搷浣滃伐鍏�
@@ -21168,7 +21220,7 @@
oCN.BeginTran();
//鍒犻櫎褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鏁版嵁
- string sql = "delete from Xt_UserFastMenu where HUserID = '" + HMakeName + "' and HType = '" + HTypes + "'";
+ string sql = "delete from Xt_UserFastMenu where HUserID = '" + HMakeName + "' and HType = '" + HTypes + "' and HModelAtributos = '" + HModelAtributos + "'";
oCN.RunProc(sql);
//鎻掑叆褰撳墠鐢ㄦ埛鏈�鏂扮殑鑷畾涔夋暟鎹�
@@ -21187,7 +21239,7 @@
string HCaption = ds.Tables[0].Rows[0]["HName"].ToString();
string HType = ds.Tables[0].Rows[0]["HType"].ToString();
- sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "')";
+ sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','"+ HModelAtributos + "')";
oCN.RunProc(sql);
}
}
@@ -21217,17 +21269,17 @@
//蹇嵎鏂瑰紡鑷畾涔夎彍鍗曪細鑾峰彇鏍戠粍浠舵暟鎹�
[Route("Web/Xt_UserFastMenu_Init")]
[HttpGet]
- public object Xt_UserFastMenu_Init(string HMakeName, string HType)
+ public object Xt_UserFastMenu_Init(string HMakeName, string HType,string HModelAtributos)
{
try
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
+ string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' and a.HModelAtributos = '" + HModelAtributos + "' Order by a.HItemID";
ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
+ sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' and a.HModelAtributos = '" + HModelAtributos + "' Order by a.HItemID";
ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
index 670382b..5a382c6 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
@@ -138,6 +138,21 @@
return objJsonResult;
}
}
+ if (oItem.HItemID != 0)
+ {
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_MaterType where HItemID=" + oItem.HItemID, "Gy_MaterType");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationBillController.cs"
index 93f2ac6..fc0da8a 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationBillController.cs"
@@ -134,12 +134,24 @@
if (HItemID == 0)
{
oCN.BeginTran();
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_WorkStation where HNumber='" + HNumber + "'", "Gy_WorkStation");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("Insert into Gy_WorkStation " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark," +
- "HUSEORGID,HCREATEORGID) " +
+ "HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HUSEORGID + ",'" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HUSEORGID + ",'" + HCREATEORGID + "','" + msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -148,6 +160,18 @@
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_WorkStation where HItemID=" + HItemID, "Gy_WorkStation");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//涓昏〃
oCN.RunProc("Update Gy_WorkStation set " +
" HNumber='" + HNumber + "'" +
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsController.cs"
index c6104b1..7501441 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsController.cs"
@@ -606,6 +606,33 @@
objJsonResult.data = 1;
return objJsonResult;
}
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCn.RunProcReturn("select * from Gy_WorkShift where HInterID=" + oItem.HInterID, "Gy_Group");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else if (refSav == "Add")
+ {
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCn.RunProcReturn("select * from Gy_WorkShift where HNumber='" + oItem.HNumber + "'", "Gy_WorkShift");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
oBill.omodel = oItem;
}
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 90fb3c9..6bfacd5 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -1572,6 +1572,53 @@
}
}
+ /// <summary>
+ /// 缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭� 20250513
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetKf_PonderationBillMain_TempList_Other_Json")]
+ [HttpGet]
+ public object GetKf_PonderationBillMain_TempList_Other_Json(string HBillType, string HMaker, Int64 HStockOrgID, string HSubBillType)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_Other '" + HBillType + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + HSubBillType + "'", "h_p_KF_GetPonderationBillMain_TempList_Other");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁缂撳瓨鍒楄〃淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁缂撳瓨鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
@@ -4635,6 +4682,44 @@
}
}
+ /// <summary>
+ /// 澶忓疂涓撶敤璋冩嫧 鎵弿婧愬崟鏉＄爜 20250513
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/get_SourceBarCode_MoveStock_XiaBao_Json")]
+ [HttpGet]
+ public object get_SourceBarCode_MoveStock_XiaBao_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HOWNERID)
+ {
+ try
+ {
+ WebSoBar = oWebs.get_SourceBarCode_MoveStock_XiaBao(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
#region 鍒嗘寮忚皟鍑� 鎵弿婧愬崟鏉＄爜
@@ -5084,6 +5169,44 @@
//}
}
+ /// <summary>
+ /// 鐗╂枡鏉＄爜鏂囨湰妗� 璋冩嫧鎵爜璋冪敤 澶忓疂 鎵弿鐗╂枡鏉＄爜鑷姩甯﹀嚭婧愬崟淇℃伅 20250506
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/get_BarCode_MoveStock_AddSource_Json")]
+ [HttpGet]
+ public Object get_BarCode_MoveStock_AddSource_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, string HCustom1, string HCustom2)
+ {
+ try
+ {
+ WebSoBar = oWebs.get_BarCode_MoveStock_AddSource(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo, HCustom1, HCustom2);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
index 748f631..d4b670e 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
@@ -5751,7 +5751,7 @@
#region 宸ョ▼椤圭洰璐圭敤寰呭鏍稿垪琛�
[Route("PM_ProjectBill/NeedCheckQuery")]
[HttpGet]
- public object PM_ProjectBillNeedCheckQuery(string user)
+ public object PM_ProjectBillNeedCheckQuery(string user,string sWhere)
{
DataSet ds;
try
@@ -5767,7 +5767,7 @@
// return objJsonResult;
//}
//sWhere = sWhere.Replace("'", "''");
- ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery ", "h_p_PM_ProjectBillNeedCheckQuery");
+ ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery " + sWhere, "h_p_PM_ProjectBillNeedCheckQuery");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -5941,7 +5941,7 @@
#region 宸ョ▼椤圭洰璐圭敤寰呬繚瀛樺垪琛�
[Route("PM_ProjectBill/NeedSaveQuery")]
[HttpGet]
- public object PM_ProjectBillNeedSaveQuery(string user)
+ public object PM_ProjectBillNeedSaveQuery(string user,string sWhere)
{
DataSet ds;
try
@@ -5957,7 +5957,7 @@
// return objJsonResult;
//}
//sWhere = sWhere.Replace("'", "''");
- ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery ", "h_p_PM_ProjectBillNeedSaveQuery");
+ ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery "+sWhere, "h_p_PM_ProjectBillNeedSaveQuery");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Models/Department.cs b/WebAPI/Models/Department.cs
index 05723c7..32cf86a 100644
--- a/WebAPI/Models/Department.cs
+++ b/WebAPI/Models/Department.cs
@@ -26,5 +26,9 @@
public string HUpDater { get; set; }
public string HChecker { get; set; }
public string HDeleteMan { get; set; }
+
+ public bool HWorkShopFlag { get; set; }
+
+ public Int64 HEmpQtys { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 52683a7..af89843 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>02/08/2023 09:47:46</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -117,7 +117,7 @@
<publishTime>05/08/2025 08:32:33</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -312,58 +312,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>08/15/2022 15:46:13</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/06/2023 15:57:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>02/08/2023 09:47:46</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -372,7 +372,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,115 +381,115 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/12/2023 08:14:21</publishTime>
+ <publishTime>07/18/2023 17:26:29</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/19/2024 10:10:46</publishTime>
+ <publishTime>09/19/2024 08:47:56</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:09</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/06/2023 15:57:02</publishTime>
+ <publishTime>03/31/2023 09:57:08</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>05/06/2024 13:47:57</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml
new file mode 100644
index 0000000..440308f
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\publish\WebAPI</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
new file mode 100644
index 0000000..19ae082
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
@@ -0,0 +1,9 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <History>False|2025-04-21T05:33:56.4956482Z;False|2025-04-21T13:31:43.8736158+08:00;</History>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index f7aca59..b1b2ef0 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-04-21T07:28:15.2307697Z;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2025-05-12T07:58:42.3279365Z;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/21/2025 15:27:39</publishTime>
+ <publishTime>05/12/2025 15:58:22</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/21/2025 15:27:39</publishTime>
+ <publishTime>05/12/2025 15:58:22</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/21/2025 15:27:37</publishTime>
+ <publishTime>05/12/2025 15:58:19</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/21/2025 15:27:37</publishTime>
+ <publishTime>05/12/2025 15:58:19</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/21/2025 15:27:31</publishTime>
+ <publishTime>05/12/2025 15:58:12</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/21/2025 15:27:31</publishTime>
+ <publishTime>05/12/2025 15:58:12</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>04/21/2025 15:27:32</publishTime>
+ <publishTime>05/12/2025 15:58:14</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/21/2025 15:27:32</publishTime>
+ <publishTime>05/12/2025 15:58:14</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/21/2025 15:27:29</publishTime>
+ <publishTime>05/12/2025 15:58:10</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/21/2025 15:27:29</publishTime>
+ <publishTime>05/12/2025 15:58:10</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/21/2025 15:27:30</publishTime>
+ <publishTime>05/12/2025 15:58:12</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/21/2025 15:27:30</publishTime>
+ <publishTime>05/12/2025 15:58:12</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/21/2025 15:27:31</publishTime>
+ <publishTime>05/12/2025 15:58:10</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/21/2025 15:27:31</publishTime>
+ <publishTime>05/12/2025 15:58:10</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>04/21/2025 15:27:26</publishTime>
+ <publishTime>05/12/2025 15:58:09</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>04/21/2025 15:27:26</publishTime>
+ <publishTime>05/12/2025 15:58:09</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/21/2025 15:27:33</publishTime>
+ <publishTime>04/25/2025 13:15:32</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/21/2025 15:27:33</publishTime>
+ <publishTime>04/25/2025 13:15:32</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/21/2025 15:27:46</publishTime>
+ <publishTime>05/12/2025 15:58:31</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/21/2025 15:27:46</publishTime>
+ <publishTime>05/12/2025 15:58:31</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/21/2025 15:28:13</publishTime>
+ <publishTime>05/12/2025 15:58:40</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml
deleted file mode 100644
index fb0a584..0000000
--- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml
+++ /dev/null
@@ -1,17 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-鎮� Web 椤圭洰鐨勫彂甯�/鎵撳寘杩涚▼灏嗕娇鐢ㄦ鏂囦欢銆傛偍鍙互閫氳繃缂栬緫姝� MSBuild 鏂囦欢
-鏉ヨ嚜瀹氫箟璇ヨ繘绋嬬殑琛屼负銆傝嫢瑕佷簡瑙ｄ笌姝ょ浉鍏崇殑璇︾粏淇℃伅锛岃璁块棶 http://go.microsoft.com/fwlink/?LinkID=208121銆�
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <WebPublishMethod>FileSystem</WebPublishMethod>
- <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
- <LastUsedPlatform>Any CPU</LastUsedPlatform>
- <SiteUrlToLaunchAfterPublish />
- <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <ExcludeApp_Data>False</ExcludeApp_Data>
- <publishUrl>D:\澶囦唤\fabu</publishUrl>
- <DeleteExistingFiles>True</DeleteExistingFiles>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
deleted file mode 100644
index 0b92574..0000000
--- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
+++ /dev/null
@@ -1,391 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-鎮� Web 椤圭洰鐨勫彂甯�/鎵撳寘杩涚▼灏嗕娇鐢ㄦ鏂囦欢銆傛偍鍙互閫氳繃缂栬緫姝� MSBuild 鏂囦欢
-鏉ヨ嚜瀹氫箟璇ヨ繘绋嬬殑琛屼负銆傝嫢瑕佷簡瑙ｄ笌姝ょ浉鍏崇殑璇︾粏淇℃伅锛岃璁块棶 http://go.microsoft.com/fwlink/?LinkID=208121銆�
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <TimeStampOfAssociatedLegacyPublishXmlFile />
- <_PublishTargetUrl>D:\澶囦唤\fabu</_PublishTargetUrl>
- </PropertyGroup>
- <ItemGroup>
- <File Include="apiapp.json">
- <publishTime>12/12/2019 22:48:32</publishTime>
- </File>
- <File Include="bin/Antlr3.Runtime.dll">
- <publishTime>03/16/2020 13:10:04</publishTime>
- </File>
- <File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>03/16/2020 13:10:04</publishTime>
- </File>
- <File Include="bin/AxInterop.gregn6Lib.dll">
- <publishTime>11/11/2020 11:01:12</publishTime>
- </File>
- <File Include="bin/BLL.dll">
- <publishTime>12/23/2020 23:22:37</publishTime>
- </File>
- <File Include="bin/DAL.dll">
- <publishTime>08/18/2020 13:09:08</publishTime>
- </File>
- <File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
- </File>
- <File Include="bin/DBUtility.dll">
- <publishTime>07/15/2019 16:38:47</publishTime>
- </File>
- <File Include="bin/Interop.Excel.dll">
- <publishTime>12/03/2012 22:08:24</publishTime>
- </File>
- <File Include="bin/Interop.gregn6Lib.dll">
- <publishTime>11/11/2020 11:01:12</publishTime>
- </File>
- <File Include="bin/Interop.VBIDE.dll">
- <publishTime>07/11/2013 21:48:44</publishTime>
- </File>
- <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>09/20/2018 19:08:18</publishTime>
- </File>
- <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
- <publishTime>09/20/2018 19:23:20</publishTime>
- </File>
- <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll">
- <publishTime>09/20/2018 19:28:34</publishTime>
- </File>
- <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>12/12/2019 22:48:26</publishTime>
- </File>
- <File Include="bin/Microsoft.CSharp.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>12/12/2019 22:48:28</publishTime>
- </File>
- <File Include="bin/Model.dll">
- <publishTime>01/13/2021 18:41:32</publishTime>
- </File>
- <File Include="bin/Newtonsoft.Json.dll">
- <publishTime>12/12/2019 22:01:06</publishTime>
- </File>
- <File Include="bin/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
- </File>
- <File Include="bin/Pub_Control.dll">
- <publishTime>07/15/2019 16:38:45</publishTime>
- </File>
- <File Include="bin/SQLHelper.dll">
- <publishTime>07/15/2019 16:38:46</publishTime>
- </File>
- <File Include="bin/Swashbuckle.Core.dll">
- <publishTime>12/12/2019 22:48:28</publishTime>
- </File>
- <File Include="bin/System.ComponentModel.DataAnnotations.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Configuration.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Data.DataSetExtensions.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Data.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Drawing.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.EnterpriseServices.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>12/12/2019 22:48:26</publishTime>
- </File>
- <File Include="bin/System.Net.Http.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
- </File>
- <File Include="bin/System.Runtime.Serialization.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.ApplicationServices.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
- </File>
- <File Include="bin/System.Web.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.DynamicData.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Entity.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Extensions.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Helpers.dll">
- <publishTime>03/16/2020 13:10:00</publishTime>
- </File>
- <File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
- </File>
- <File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
- </File>
- <File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>03/26/2019 14:23:20</publishTime>
- </File>
- <File Include="bin/System.Web.Mvc.dll">
- <publishTime>03/16/2020 13:10:02</publishTime>
- </File>
- <File Include="bin/System.Web.Optimization.dll">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="bin/System.Web.Razor.dll">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="bin/System.Web.Services.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>03/16/2020 13:10:00</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.dll">
- <publishTime>03/16/2020 13:10:00</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>03/16/2020 13:10:00</publishTime>
- </File>
- <File Include="bin/System.Xml.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Xml.Linq.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/TeeChart.dll">
- <publishTime>05/24/2007 17:47:50</publishTime>
- </File>
- <File Include="bin/WebActivatorEx.dll">
- <publishTime>12/12/2019 22:48:28</publishTime>
- </File>
- <File Include="bin/WebAPI.dll">
- <publishTime>01/26/2021 22:01:53</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>01/26/2021 22:01:53</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/26/2021 22:01:55</publishTime>
- </File>
- <File Include="bin/WebGrease.dll">
- <publishTime>03/16/2020 13:10:04</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
- <publishTime>03/26/2019 14:23:20</publishTime>
- </File>
- <File Include="Content/bootstrap.css">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Content/bootstrap.min.css">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Content/Site.css">
- <publishTime>03/16/2020 13:09:48</publishTime>
- </File>
- <File Include="DLL/BLL.dll">
- <publishTime>12/23/2020 23:22:37</publishTime>
- </File>
- <File Include="DLL/DAL.dll">
- <publishTime>08/18/2020 13:09:08</publishTime>
- </File>
- <File Include="DLL/DBUtility.dll">
- <publishTime>07/15/2019 16:38:47</publishTime>
- </File>
- <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>09/20/2018 19:08:18</publishTime>
- </File>
- <File Include="DLL/Model.dll">
- <publishTime>01/13/2021 18:41:32</publishTime>
- </File>
- <File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>12/27/2019 13:55:48</publishTime>
- </File>
- <File Include="DLL/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
- </File>
- <File Include="DLL/Pub_Control.dll">
- <publishTime>07/15/2019 16:38:45</publishTime>
- </File>
- <File Include="DLL/SQLHelper.dll">
- <publishTime>07/15/2019 16:38:46</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Global.asax">
- <publishTime>12/12/2019 22:01:04</publishTime>
- </File>
- <File Include="Index.html">
- <publishTime>12/24/2020 11:27:24</publishTime>
- </File>
- <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>12/12/2019 22:48:32</publishTime>
- </File>
- <File Include="packages.config">
- <publishTime>01/21/2021 10:16:57</publishTime>
- </File>
- <File Include="Scripts/bootstrap.js">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Scripts/bootstrap.min.js">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Scripts/jquery-1.10.2.js">
- <publishTime>03/16/2020 13:09:52</publishTime>
- </File>
- <File Include="Scripts/jquery-1.10.2.min.js">
- <publishTime>03/16/2020 13:09:52</publishTime>
- </File>
- <File Include="Scripts/jquery-1.10.2.min.map">
- <publishTime>03/16/2020 13:09:52</publishTime>
- </File>
- <File Include="Scripts/jquery.validate.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Scripts/jquery.validate.min.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Scripts/modernizr-2.6.2.js">
- <publishTime>03/16/2020 13:10:04</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/16/2020 13:09:50</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/16/2020 13:09:52</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/16/2020 13:09:52</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/16/2020 13:09:52</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/16/2020 13:09:58</publishTime>
- </File>
- <File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/16/2020 13:10:04</publishTime>
- </File>
- <File Include="Views/Shared/Error.cshtml">
- <publishTime>03/16/2020 13:09:44</publishTime>
- </File>
- <File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/16/2020 13:09:48</publishTime>
- </File>
- <File Include="Views/web.config">
- <publishTime>03/16/2020 13:09:48</publishTime>
- </File>
- <File Include="Views/_ViewStart.cshtml">
- <publishTime>03/16/2020 13:09:48</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>01/26/2021 11:24:27</publishTime>
- </File>
- <File Include="Web References/WebS/Reference.map">
- <publishTime>11/16/2020 15:22:37</publishTime>
- </File>
- <File Include="Web.config">
- <publishTime>01/26/2021 22:01:56</publishTime>
- </File>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index f4be136..e444cc8 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -34,6 +34,12 @@
[System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsXt_BaseBillMain))]
public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol {
+ private System.Threading.SendOrPostCallback DeleteMouldOperationCompleted;
+
+ private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted;
+
+ private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockStepInOperationCompleted;
+
private System.Threading.SendOrPostCallback get_SourceBarCode_POStockInBackOperationCompleted;
private System.Threading.SendOrPostCallback get_SourceBarCode_MateOutBackOperationCompleted;
@@ -61,6 +67,10 @@
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_MoveStock_SenKaiOperationCompleted;
private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiOperationCompleted;
+
+ private System.Threading.SendOrPostCallback get_BarCode_MoveStock_AddSourceOperationCompleted;
+
+ private System.Threading.SendOrPostCallback get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceOperationCompleted;
private System.Threading.SendOrPostCallback GetJXBarCode_SiMoErOperationCompleted;
@@ -197,10 +207,6 @@
private System.Threading.SendOrPostCallback set_BarCodeAutoWMSOperationCompleted;
private System.Threading.SendOrPostCallback get_CheckTypeByBarCode_MouldOperationCompleted;
-
- private System.Threading.SendOrPostCallback DeleteMouldOperationCompleted;
-
- private System.Threading.SendOrPostCallback set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted;
private System.Threading.SendOrPostCallback get_ORGANIZATIONS_UserByOrgRelationOperationCompleted;
@@ -366,9 +372,9 @@
private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockOperationCompleted;
- private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockStepOutOperationCompleted;
+ private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStock_XiaBaoOperationCompleted;
- private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockStepInOperationCompleted;
+ private System.Threading.SendOrPostCallback get_SourceBarCode_MoveStockStepOutOperationCompleted;
private System.Threading.SendOrPostCallback set_CheckEntrustInBillOperationCompleted;
@@ -1209,6 +1215,15 @@
}
/// <remarks/>
+ public event DeleteMouldCompletedEventHandler DeleteMouldCompleted;
+
+ /// <remarks/>
+ public event set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_MouldCompleted;
+
+ /// <remarks/>
+ public event get_SourceBarCode_MoveStockStepInCompletedEventHandler get_SourceBarCode_MoveStockStepInCompleted;
+
+ /// <remarks/>
public event get_SourceBarCode_POStockInBackCompletedEventHandler get_SourceBarCode_POStockInBackCompleted;
/// <remarks/>
@@ -1249,6 +1264,12 @@
/// <remarks/>
public event set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompleted;
+
+ /// <remarks/>
+ public event get_BarCode_MoveStock_AddSourceCompletedEventHandler get_BarCode_MoveStock_AddSourceCompleted;
+
+ /// <remarks/>
+ public event get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompletedEventHandler get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompleted;
/// <remarks/>
public event GetJXBarCode_SiMoErCompletedEventHandler GetJXBarCode_SiMoErCompleted;
@@ -1453,12 +1474,6 @@
/// <remarks/>
public event get_CheckTypeByBarCode_MouldCompletedEventHandler get_CheckTypeByBarCode_MouldCompleted;
-
- /// <remarks/>
- public event DeleteMouldCompletedEventHandler DeleteMouldCompleted;
-
- /// <remarks/>
- public event set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler set_SavePonderationBillMain_Temp_BarCode_MouldCompleted;
/// <remarks/>
public event get_ORGANIZATIONS_UserByOrgRelationCompletedEventHandler get_ORGANIZATIONS_UserByOrgRelationCompleted;
@@ -1707,10 +1722,10 @@
public event get_SourceBarCode_MoveStockCompletedEventHandler get_SourceBarCode_MoveStockCompleted;
/// <remarks/>
- public event get_SourceBarCode_MoveStockStepOutCompletedEventHandler get_SourceBarCode_MoveStockStepOutCompleted;
+ public event get_SourceBarCode_MoveStock_XiaBaoCompletedEventHandler get_SourceBarCode_MoveStock_XiaBaoCompleted;
/// <remarks/>
- public event get_SourceBarCode_MoveStockStepInCompletedEventHandler get_SourceBarCode_MoveStockStepInCompleted;
+ public event get_SourceBarCode_MoveStockStepOutCompletedEventHandler get_SourceBarCode_MoveStockStepOutCompleted;
/// <remarks/>
public event set_CheckEntrustInBillCompletedEventHandler set_CheckEntrustInBillCompleted;
@@ -2913,6 +2928,243 @@
public event GetSc_ICMOBackBillListCompletedEventHandler GetSc_ICMOBackBillListCompleted;
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteMould", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool DeleteMould(long HInterID, long HItemID, string HBillType, ref string sErrMsg) {
+ object[] results = this.Invoke("DeleteMould", new object[] {
+ HInterID,
+ HItemID,
+ HBillType,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void DeleteMouldAsync(long HInterID, long HItemID, string HBillType, string sErrMsg) {
+ this.DeleteMouldAsync(HInterID, HItemID, HBillType, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void DeleteMouldAsync(long HInterID, long HItemID, string HBillType, string sErrMsg, object userState) {
+ if ((this.DeleteMouldOperationCompleted == null)) {
+ this.DeleteMouldOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteMouldOperationCompleted);
+ }
+ this.InvokeAsync("DeleteMould", new object[] {
+ HInterID,
+ HItemID,
+ HBillType,
+ sErrMsg}, this.DeleteMouldOperationCompleted, userState);
+ }
+
+ private void OnDeleteMouldOperationCompleted(object arg) {
+ if ((this.DeleteMouldCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.DeleteMouldCompleted(this, new DeleteMouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SavePonderationBillMain_Temp_BarCode_Mould(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ double HQty,
+ bool HRedBlueFlag,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HOWNERID,
+ string HExpressNumber,
+ long SCWhID,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ ref string sHSourceBillNo,
+ ref string sHSourceBillType,
+ ref long sHSupID,
+ ref string sHSupName,
+ ref long sHDeptID,
+ ref string sHDeptName,
+ ref string sErrMsg) {
+ object[] results = this.Invoke("set_SavePonderationBillMain_Temp_BarCode_Mould", new object[] {
+ sBarCode,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HQty,
+ HRedBlueFlag,
+ SourceFlag,
+ HSourceBillNo,
+ HSourceBillType,
+ HOWNERID,
+ HExpressNumber,
+ SCWhID,
+ HStockInOrgID,
+ HStockOutOrgID,
+ sHSourceBillNo,
+ sHSourceBillType,
+ sHSupID,
+ sHSupName,
+ sHDeptID,
+ sHDeptName,
+ sErrMsg});
+ sHSourceBillNo = ((string)(results[1]));
+ sHSourceBillType = ((string)(results[2]));
+ sHSupID = ((long)(results[3]));
+ sHSupName = ((string)(results[4]));
+ sHDeptID = ((long)(results[5]));
+ sHDeptName = ((string)(results[6]));
+ sErrMsg = ((string)(results[7]));
+ return ((bool)(results[0]));
+ }
+
+ /// <remarks/>
+ public void set_SavePonderationBillMain_Temp_BarCode_MouldAsync(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ double HQty,
+ bool HRedBlueFlag,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HOWNERID,
+ string HExpressNumber,
+ long SCWhID,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string sHSourceBillNo,
+ string sHSourceBillType,
+ long sHSupID,
+ string sHSupName,
+ long sHDeptID,
+ string sHDeptName,
+ string sErrMsg) {
+ this.set_SavePonderationBillMain_Temp_BarCode_MouldAsync(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, SCWhID, HStockInOrgID, HStockOutOrgID, sHSourceBillNo, sHSourceBillType, sHSupID, sHSupName, sHDeptID, sHDeptName, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void set_SavePonderationBillMain_Temp_BarCode_MouldAsync(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ double HQty,
+ bool HRedBlueFlag,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HOWNERID,
+ string HExpressNumber,
+ long SCWhID,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string sHSourceBillNo,
+ string sHSourceBillType,
+ long sHSupID,
+ string sHSupName,
+ long sHDeptID,
+ string sHDeptName,
+ string sErrMsg,
+ object userState) {
+ if ((this.set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted == null)) {
+ this.set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted);
+ }
+ this.InvokeAsync("set_SavePonderationBillMain_Temp_BarCode_Mould", new object[] {
+ sBarCode,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HQty,
+ HRedBlueFlag,
+ SourceFlag,
+ HSourceBillNo,
+ HSourceBillType,
+ HOWNERID,
+ HExpressNumber,
+ SCWhID,
+ HStockInOrgID,
+ HStockOutOrgID,
+ sHSourceBillNo,
+ sHSourceBillType,
+ sHSupID,
+ sHSupName,
+ sHDeptID,
+ sHDeptName,
+ sErrMsg}, this.set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted, userState);
+ }
+
+ private void Onset_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted(object arg) {
+ if ((this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_MoveStockStepIn", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_WMS get_SourceBarCode_MoveStockStepIn(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockInOrgID, long HStockOutOrgID, ref string sErrMsg) {
+ object[] results = this.Invoke("get_SourceBarCode_MoveStockStepIn", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HStockInOrgID,
+ HStockOutOrgID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_WMS)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_MoveStockStepInAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockInOrgID, long HStockOutOrgID, string sErrMsg) {
+ this.get_SourceBarCode_MoveStockStepInAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockInOrgID, HStockOutOrgID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_MoveStockStepInAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockInOrgID, long HStockOutOrgID, string sErrMsg, object userState) {
+ if ((this.get_SourceBarCode_MoveStockStepInOperationCompleted == null)) {
+ this.get_SourceBarCode_MoveStockStepInOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_MoveStockStepInOperationCompleted);
+ }
+ this.InvokeAsync("get_SourceBarCode_MoveStockStepIn", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HStockInOrgID,
+ HStockOutOrgID,
+ sErrMsg}, this.get_SourceBarCode_MoveStockStepInOperationCompleted, userState);
+ }
+
+ private void Onget_SourceBarCode_MoveStockStepInOperationCompleted(object arg) {
+ if ((this.get_SourceBarCode_MoveStockStepInCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_SourceBarCode_MoveStockStepInCompleted(this, new get_SourceBarCode_MoveStockStepInCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_POStockInBack", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public ClsKf_ICStockBill_WMS get_SourceBarCode_POStockInBack(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockOrgID, ref string sErrMsg) {
object[] results = this.Invoke("get_SourceBarCode_POStockInBack", new object[] {
@@ -4038,6 +4290,249 @@
if ((this.set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_BarCode_MoveStock_AddSource", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_WMS get_BarCode_MoveStock_AddSource(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ long HSCWHID,
+ long HSCSPID,
+ double HQty,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string HScanStyle,
+ ref string sErrMsg,
+ string HCustom1,
+ string HCustom2) {
+ object[] results = this.Invoke("get_BarCode_MoveStock_AddSource", new object[] {
+ sBarCode,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HSCWHID,
+ HSCSPID,
+ HQty,
+ SourceFlag,
+ HSourceBillNo,
+ HSourceBillType,
+ HStockInOrgID,
+ HStockOutOrgID,
+ HScanStyle,
+ sErrMsg,
+ HCustom1,
+ HCustom2});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_WMS)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_BarCode_MoveStock_AddSourceAsync(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ long HSCWHID,
+ long HSCSPID,
+ double HQty,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string HScanStyle,
+ string sErrMsg,
+ string HCustom1,
+ string HCustom2) {
+ this.get_BarCode_MoveStock_AddSourceAsync(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, sErrMsg, HCustom1, HCustom2, null);
+ }
+
+ /// <remarks/>
+ public void get_BarCode_MoveStock_AddSourceAsync(
+ string sBarCode,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ long HSCWHID,
+ long HSCSPID,
+ double HQty,
+ bool SourceFlag,
+ string HSourceBillNo,
+ string HSourceBillType,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string HScanStyle,
+ string sErrMsg,
+ string HCustom1,
+ string HCustom2,
+ object userState) {
+ if ((this.get_BarCode_MoveStock_AddSourceOperationCompleted == null)) {
+ this.get_BarCode_MoveStock_AddSourceOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_BarCode_MoveStock_AddSourceOperationCompleted);
+ }
+ this.InvokeAsync("get_BarCode_MoveStock_AddSource", new object[] {
+ sBarCode,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HSCWHID,
+ HSCSPID,
+ HQty,
+ SourceFlag,
+ HSourceBillNo,
+ HSourceBillType,
+ HStockInOrgID,
+ HStockOutOrgID,
+ HScanStyle,
+ sErrMsg,
+ HCustom1,
+ HCustom2}, this.get_BarCode_MoveStock_AddSourceOperationCompleted, userState);
+ }
+
+ private void Onget_BarCode_MoveStock_AddSourceOperationCompleted(object arg) {
+ if ((this.get_BarCode_MoveStock_AddSourceCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_BarCode_MoveStock_AddSourceCompleted(this, new get_BarCode_MoveStock_AddSourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_WMS get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource(
+ ClsGy_BarCodeBill_WMS_Model_View omodel_View,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ long HSCWHID,
+ long HSCSPID,
+ double HQty,
+ bool SourceFlag,
+ string HSourceBillType,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string HCustom1,
+ string HCustom2,
+ ClsXt_SystemParameterMain oSystemParameterMain,
+ ref string sErrMsg) {
+ object[] results = this.Invoke("get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource", new object[] {
+ omodel_View,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HSCWHID,
+ HSCSPID,
+ HQty,
+ SourceFlag,
+ HSourceBillType,
+ HStockInOrgID,
+ HStockOutOrgID,
+ HCustom1,
+ HCustom2,
+ oSystemParameterMain,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_WMS)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceAsync(
+ ClsGy_BarCodeBill_WMS_Model_View omodel_View,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ long HSCWHID,
+ long HSCSPID,
+ double HQty,
+ bool SourceFlag,
+ string HSourceBillType,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string HCustom1,
+ string HCustom2,
+ ClsXt_SystemParameterMain oSystemParameterMain,
+ string sErrMsg) {
+ this.get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceAsync(omodel_View, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillType, HStockInOrgID, HStockOutOrgID, HCustom1, HCustom2, oSystemParameterMain, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceAsync(
+ ClsGy_BarCodeBill_WMS_Model_View omodel_View,
+ long HBillID,
+ string HBillType,
+ string HBillNo,
+ string HMaker,
+ long HWhID,
+ long HSPID,
+ long HSCWHID,
+ long HSCSPID,
+ double HQty,
+ bool SourceFlag,
+ string HSourceBillType,
+ long HStockInOrgID,
+ long HStockOutOrgID,
+ string HCustom1,
+ string HCustom2,
+ ClsXt_SystemParameterMain oSystemParameterMain,
+ string sErrMsg,
+ object userState) {
+ if ((this.get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceOperationCompleted == null)) {
+ this.get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceOperationCompleted);
+ }
+ this.InvokeAsync("get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource", new object[] {
+ omodel_View,
+ HBillID,
+ HBillType,
+ HBillNo,
+ HMaker,
+ HWhID,
+ HSPID,
+ HSCWHID,
+ HSCSPID,
+ HQty,
+ SourceFlag,
+ HSourceBillType,
+ HStockInOrgID,
+ HStockOutOrgID,
+ HCustom1,
+ HCustom2,
+ oSystemParameterMain,
+ sErrMsg}, this.get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceOperationCompleted, userState);
+ }
+
+ private void Onget_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceOperationCompleted(object arg) {
+ if ((this.get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompleted(this, new get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -6734,197 +7229,6 @@
if ((this.get_CheckTypeByBarCode_MouldCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.get_CheckTypeByBarCode_MouldCompleted(this, new get_CheckTypeByBarCode_MouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteMould", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool DeleteMould(long HInterID, long HItemID, string HBillType, ref string sErrMsg) {
- object[] results = this.Invoke("DeleteMould", new object[] {
- HInterID,
- HItemID,
- HBillType,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void DeleteMouldAsync(long HInterID, long HItemID, string HBillType, string sErrMsg) {
- this.DeleteMouldAsync(HInterID, HItemID, HBillType, sErrMsg, null);
- }
-
- /// <remarks/>
- public void DeleteMouldAsync(long HInterID, long HItemID, string HBillType, string sErrMsg, object userState) {
- if ((this.DeleteMouldOperationCompleted == null)) {
- this.DeleteMouldOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteMouldOperationCompleted);
- }
- this.InvokeAsync("DeleteMould", new object[] {
- HInterID,
- HItemID,
- HBillType,
- sErrMsg}, this.DeleteMouldOperationCompleted, userState);
- }
-
- private void OnDeleteMouldOperationCompleted(object arg) {
- if ((this.DeleteMouldCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.DeleteMouldCompleted(this, new DeleteMouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SavePonderationBillMain_Temp_BarCode_Mould(
- string sBarCode,
- long HBillID,
- string HBillType,
- string HBillNo,
- string HMaker,
- long HWhID,
- long HSPID,
- double HQty,
- bool HRedBlueFlag,
- bool SourceFlag,
- string HSourceBillNo,
- string HSourceBillType,
- long HOWNERID,
- string HExpressNumber,
- long SCWhID,
- long HStockInOrgID,
- long HStockOutOrgID,
- ref string sHSourceBillNo,
- ref string sHSourceBillType,
- ref long sHSupID,
- ref string sHSupName,
- ref long sHDeptID,
- ref string sHDeptName,
- ref string sErrMsg) {
- object[] results = this.Invoke("set_SavePonderationBillMain_Temp_BarCode_Mould", new object[] {
- sBarCode,
- HBillID,
- HBillType,
- HBillNo,
- HMaker,
- HWhID,
- HSPID,
- HQty,
- HRedBlueFlag,
- SourceFlag,
- HSourceBillNo,
- HSourceBillType,
- HOWNERID,
- HExpressNumber,
- SCWhID,
- HStockInOrgID,
- HStockOutOrgID,
- sHSourceBillNo,
- sHSourceBillType,
- sHSupID,
- sHSupName,
- sHDeptID,
- sHDeptName,
- sErrMsg});
- sHSourceBillNo = ((string)(results[1]));
- sHSourceBillType = ((string)(results[2]));
- sHSupID = ((long)(results[3]));
- sHSupName = ((string)(results[4]));
- sHDeptID = ((long)(results[5]));
- sHDeptName = ((string)(results[6]));
- sErrMsg = ((string)(results[7]));
- return ((bool)(results[0]));
- }
-
- /// <remarks/>
- public void set_SavePonderationBillMain_Temp_BarCode_MouldAsync(
- string sBarCode,
- long HBillID,
- string HBillType,
- string HBillNo,
- string HMaker,
- long HWhID,
- long HSPID,
- double HQty,
- bool HRedBlueFlag,
- bool SourceFlag,
- string HSourceBillNo,
- string HSourceBillType,
- long HOWNERID,
- string HExpressNumber,
- long SCWhID,
- long HStockInOrgID,
- long HStockOutOrgID,
- string sHSourceBillNo,
- string sHSourceBillType,
- long sHSupID,
- string sHSupName,
- long sHDeptID,
- string sHDeptName,
- string sErrMsg) {
- this.set_SavePonderationBillMain_Temp_BarCode_MouldAsync(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, SCWhID, HStockInOrgID, HStockOutOrgID, sHSourceBillNo, sHSourceBillType, sHSupID, sHSupName, sHDeptID, sHDeptName, sErrMsg, null);
- }
-
- /// <remarks/>
- public void set_SavePonderationBillMain_Temp_BarCode_MouldAsync(
- string sBarCode,
- long HBillID,
- string HBillType,
- string HBillNo,
- string HMaker,
- long HWhID,
- long HSPID,
- double HQty,
- bool HRedBlueFlag,
- bool SourceFlag,
- string HSourceBillNo,
- string HSourceBillType,
- long HOWNERID,
- string HExpressNumber,
- long SCWhID,
- long HStockInOrgID,
- long HStockOutOrgID,
- string sHSourceBillNo,
- string sHSourceBillType,
- long sHSupID,
- string sHSupName,
- long sHDeptID,
- string sHDeptName,
- string sErrMsg,
- object userState) {
- if ((this.set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted == null)) {
- this.set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted);
- }
- this.InvokeAsync("set_SavePonderationBillMain_Temp_BarCode_Mould", new object[] {
- sBarCode,
- HBillID,
- HBillType,
- HBillNo,
- HMaker,
- HWhID,
- HSPID,
- HQty,
- HRedBlueFlag,
- SourceFlag,
- HSourceBillNo,
- HSourceBillType,
- HOWNERID,
- HExpressNumber,
- SCWhID,
- HStockInOrgID,
- HStockOutOrgID,
- sHSourceBillNo,
- sHSourceBillType,
- sHSupID,
- sHSupName,
- sHDeptID,
- sHDeptName,
- sErrMsg}, this.set_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted, userState);
- }
-
- private void Onset_SavePonderationBillMain_Temp_BarCode_MouldOperationCompleted(object arg) {
- if ((this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.set_SavePonderationBillMain_Temp_BarCode_MouldCompleted(this, new set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -11026,6 +11330,52 @@
}
/// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_MoveStock_XiaBao", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public ClsKf_ICStockBill_WMS get_SourceBarCode_MoveStock_XiaBao(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, ref string sErrMsg) {
+ object[] results = this.Invoke("get_SourceBarCode_MoveStock_XiaBao", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HFIFOWhID,
+ HOWNERID,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((ClsKf_ICStockBill_WMS)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_MoveStock_XiaBaoAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, string sErrMsg) {
+ this.get_SourceBarCode_MoveStock_XiaBaoAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, sErrMsg, null);
+ }
+
+ /// <remarks/>
+ public void get_SourceBarCode_MoveStock_XiaBaoAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HOWNERID, string sErrMsg, object userState) {
+ if ((this.get_SourceBarCode_MoveStock_XiaBaoOperationCompleted == null)) {
+ this.get_SourceBarCode_MoveStock_XiaBaoOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_MoveStock_XiaBaoOperationCompleted);
+ }
+ this.InvokeAsync("get_SourceBarCode_MoveStock_XiaBao", new object[] {
+ HInterID,
+ HBillNo,
+ HBillType,
+ HSourceBillNo,
+ HSourceBillType,
+ HMaker,
+ HFIFOWhID,
+ HOWNERID,
+ sErrMsg}, this.get_SourceBarCode_MoveStock_XiaBaoOperationCompleted, userState);
+ }
+
+ private void Onget_SourceBarCode_MoveStock_XiaBaoOperationCompleted(object arg) {
+ if ((this.get_SourceBarCode_MoveStock_XiaBaoCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_SourceBarCode_MoveStock_XiaBaoCompleted(this, new get_SourceBarCode_MoveStock_XiaBaoCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_MoveStockStepOut", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public ClsKf_ICStockBill_WMS get_SourceBarCode_MoveStockStepOut(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HFIFOWhID, long HStockInOrgID, long HStockOutOrgID, ref string sErrMsg) {
object[] results = this.Invoke("get_SourceBarCode_MoveStockStepOut", new object[] {
@@ -11070,52 +11420,6 @@
if ((this.get_SourceBarCode_MoveStockStepOutCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.get_SourceBarCode_MoveStockStepOutCompleted(this, new get_SourceBarCode_MoveStockStepOutCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- /// <remarks/>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SourceBarCode_MoveStockStepIn", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public ClsKf_ICStockBill_WMS get_SourceBarCode_MoveStockStepIn(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockInOrgID, long HStockOutOrgID, ref string sErrMsg) {
- object[] results = this.Invoke("get_SourceBarCode_MoveStockStepIn", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HMaker,
- HStockInOrgID,
- HStockOutOrgID,
- sErrMsg});
- sErrMsg = ((string)(results[1]));
- return ((ClsKf_ICStockBill_WMS)(results[0]));
- }
-
- /// <remarks/>
- public void get_SourceBarCode_MoveStockStepInAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockInOrgID, long HStockOutOrgID, string sErrMsg) {
- this.get_SourceBarCode_MoveStockStepInAsync(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockInOrgID, HStockOutOrgID, sErrMsg, null);
- }
-
- /// <remarks/>
- public void get_SourceBarCode_MoveStockStepInAsync(long HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, long HStockInOrgID, long HStockOutOrgID, string sErrMsg, object userState) {
- if ((this.get_SourceBarCode_MoveStockStepInOperationCompleted == null)) {
- this.get_SourceBarCode_MoveStockStepInOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SourceBarCode_MoveStockStepInOperationCompleted);
- }
- this.InvokeAsync("get_SourceBarCode_MoveStockStepIn", new object[] {
- HInterID,
- HBillNo,
- HBillType,
- HSourceBillNo,
- HSourceBillType,
- HMaker,
- HStockInOrgID,
- HStockOutOrgID,
- sErrMsg}, this.get_SourceBarCode_MoveStockStepInOperationCompleted, userState);
- }
-
- private void Onget_SourceBarCode_MoveStockStepInOperationCompleted(object arg) {
- if ((this.get_SourceBarCode_MoveStockStepInCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.get_SourceBarCode_MoveStockStepInCompleted(this, new get_SourceBarCode_MoveStockStepInCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -51255,6 +51559,156 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void DeleteMouldCompletedEventHandler(object sender, DeleteMouldCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class DeleteMouldCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal DeleteMouldCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler(object sender, set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public bool Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHSourceBillNo {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHSourceBillType {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[2]));
+ }
+ }
+
+ /// <remarks/>
+ public long sHSupID {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((long)(this.results[3]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHSupName {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[4]));
+ }
+ }
+
+ /// <remarks/>
+ public long sHDeptID {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((long)(this.results[5]));
+ }
+ }
+
+ /// <remarks/>
+ public string sHDeptName {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[6]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[7]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_SourceBarCode_MoveStockStepInCompletedEventHandler(object sender, get_SourceBarCode_MoveStockStepInCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_SourceBarCode_MoveStockStepInCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_SourceBarCode_MoveStockStepInCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_WMS Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_WMS)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
public delegate void get_SourceBarCode_POStockInBackCompletedEventHandler(object sender, get_SourceBarCode_POStockInBackCompletedEventArgs e);
/// <remarks/>
@@ -51789,6 +52243,74 @@
get {
this.RaiseExceptionIfNecessary();
return ((bool)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_BarCode_MoveStock_AddSourceCompletedEventHandler(object sender, get_BarCode_MoveStock_AddSourceCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_BarCode_MoveStock_AddSourceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_BarCode_MoveStock_AddSourceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_WMS Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_WMS)(this.results[0]));
+ }
+ }
+
+ /// <remarks/>
+ public string sErrMsg {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((string)(this.results[1]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ public delegate void get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompletedEventHandler(object sender, get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public ClsKf_ICStockBill_WMS Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((ClsKf_ICStockBill_WMS)(this.results[0]));
}
}
@@ -54069,122 +54591,6 @@
get {
this.RaiseExceptionIfNecessary();
return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void DeleteMouldCompletedEventHandler(object sender, DeleteMouldCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class DeleteMouldCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal DeleteMouldCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
- }
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventHandler(object sender, set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs e);
-
- /// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal set_SavePonderationBillMain_Temp_BarCode_MouldCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- /// <remarks/>
- public bool Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((bool)(this.results[0]));
- }
- }
-
- /// <remarks/>
- public string sHSourceBillNo {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[1]));
- }
- }
-
- /// <remarks/>
- public string sHSourceBillType {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[2]));
- }
- }
-
- /// <remarks/>
- public long sHSupID {
- get {
- this.RaiseExceptionIfNecessary();
- return ((long)(this.results[3]));
- }
- }
-
- /// <remarks/>
- public string sHSupName {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[4]));
- }
- }
-
- /// <remarks/>
- public long sHDeptID {
- get {
- this.RaiseExceptionIfNecessary();
- return ((long)(this.results[5]));
- }
- }
-
- /// <remarks/>
- public string sHDeptName {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[6]));
- }
- }
-
- /// <remarks/>
- public string sErrMsg {
- get {
- this.RaiseExceptionIfNecessary();
- return ((string)(this.results[7]));
}
}
}
@@ -57275,17 +57681,17 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void get_SourceBarCode_MoveStockStepOutCompletedEventHandler(object sender, get_SourceBarCode_MoveStockStepOutCompletedEventArgs e);
+ public delegate void get_SourceBarCode_MoveStock_XiaBaoCompletedEventHandler(object sender, get_SourceBarCode_MoveStock_XiaBaoCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class get_SourceBarCode_MoveStockStepOutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class get_SourceBarCode_MoveStock_XiaBaoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal get_SourceBarCode_MoveStockStepOutCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal get_SourceBarCode_MoveStock_XiaBaoCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
@@ -57309,17 +57715,17 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
- public delegate void get_SourceBarCode_MoveStockStepInCompletedEventHandler(object sender, get_SourceBarCode_MoveStockStepInCompletedEventArgs e);
+ public delegate void get_SourceBarCode_MoveStockStepOutCompletedEventHandler(object sender, get_SourceBarCode_MoveStockStepOutCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.3752.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
- public partial class get_SourceBarCode_MoveStockStepInCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class get_SourceBarCode_MoveStockStepOutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- internal get_SourceBarCode_MoveStockStepInCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ internal get_SourceBarCode_MoveStockStepOutCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index 424b76f..c872e22 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,7 +2,69 @@
<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
- <s:element name="get_SourceBarCode_POStockInBack">
+ <s:element name="DeleteMould">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HItemID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="DeleteMouldResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="DeleteMouldResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SavePonderationBillMain_Temp_BarCode_Mould">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HBillID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
+ <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+ <s:element minOccurs="1" maxOccurs="1" name="SourceFlag" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HExpressNumber" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="SCWhID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="set_SavePonderationBillMain_Temp_BarCode_MouldResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="set_SavePonderationBillMain_Temp_BarCode_MouldResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SourceBarCode_MoveStockStepIn">
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
@@ -11,15 +73,16 @@
<s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
</s:element>
- <s:element name="get_SourceBarCode_POStockInBackResponse">
+ <s:element name="get_SourceBarCode_MoveStockStepInResponse">
<s:complexType>
<s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_POStockInBackResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_MoveStockStepInResult" type="tns:ClsKf_ICStockBill_WMS" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -66,6 +129,28 @@
<s:element minOccurs="1" maxOccurs="1" name="HSourceBarCodeFlag" type="s:boolean" />
</s:sequence>
</s:complexType>
+ <s:element name="get_SourceBarCode_POStockInBack">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SourceBarCode_POStockInBackResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_POStockInBackResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="get_SourceBarCode_MateOutBack">
<s:complexType>
<s:sequence>
@@ -1062,6 +1147,71 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiResult" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_BarCode_MoveStock_AddSource">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HBillID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCSPID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
+ <s:element minOccurs="1" maxOccurs="1" name="SourceFlag" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HScanStyle" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HCustom1" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HCustom2" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_BarCode_MoveStock_AddSourceResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_BarCode_MoveStock_AddSourceResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="omodel_View" type="tns:ClsGy_BarCodeBill_WMS_Model_View" />
+ <s:element minOccurs="1" maxOccurs="1" name="HBillID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSCSPID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
+ <s:element minOccurs="1" maxOccurs="1" name="SourceFlag" type="s:boolean" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HCustom1" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HCustom2" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceResult" type="tns:ClsKf_ICStockBill_WMS" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -2581,68 +2731,6 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="get_CheckTypeByBarCode_MouldResult" type="tns:ClsKf_ICStockBill_Mould" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="DeleteMould">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HItemID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="DeleteMouldResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="DeleteMouldResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SavePonderationBillMain_Temp_BarCode_Mould">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="sBarCode" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HBillID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HWhID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HSPID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HQty" type="s:double" />
- <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
- <s:element minOccurs="1" maxOccurs="1" name="SourceFlag" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HExpressNumber" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="SCWhID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="set_SavePonderationBillMain_Temp_BarCode_MouldResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="set_SavePonderationBillMain_Temp_BarCode_MouldResult" type="s:boolean" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSourceBillType" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHSupID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHSupName" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="sHDeptID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sHDeptName" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -4593,6 +4681,29 @@
</s:sequence>
</s:complexType>
</s:element>
+ <s:element name="get_SourceBarCode_MoveStock_XiaBao">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HFIFOWhID" type="s:long" />
+ <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SourceBarCode_MoveStock_XiaBaoResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_MoveStock_XiaBaoResult" type="tns:ClsKf_ICStockBill_WMS" />
+ <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="get_SourceBarCode_MoveStockStepOut">
<s:complexType>
<s:sequence>
@@ -4613,29 +4724,6 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_MoveStockStepOutResult" type="tns:ClsKf_ICStockBill_WMS" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="get_SourceBarCode_MoveStockStepIn">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillNo" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HSourceBillType" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockInOrgID" type="s:long" />
- <s:element minOccurs="1" maxOccurs="1" name="HStockOutOrgID" type="s:long" />
- <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="get_SourceBarCode_MoveStockStepInResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="get_SourceBarCode_MoveStockStepInResult" type="tns:ClsKf_ICStockBill_WMS" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
</s:complexType>
@@ -14175,6 +14263,24 @@
</s:element>
</s:schema>
</wsdl:types>
+ <wsdl:message name="DeleteMouldSoapIn">
+ <wsdl:part name="parameters" element="tns:DeleteMould" />
+ </wsdl:message>
+ <wsdl:message name="DeleteMouldSoapOut">
+ <wsdl:part name="parameters" element="tns:DeleteMouldResponse" />
+ </wsdl:message>
+ <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_MouldSoapIn">
+ <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_Mould" />
+ </wsdl:message>
+ <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut">
+ <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_MouldResponse" />
+ </wsdl:message>
+ <wsdl:message name="get_SourceBarCode_MoveStockStepInSoapIn">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepIn" />
+ </wsdl:message>
+ <wsdl:message name="get_SourceBarCode_MoveStockStepInSoapOut">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepInResponse" />
+ </wsdl:message>
<wsdl:message name="get_SourceBarCode_POStockInBackSoapIn">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_POStockInBack" />
</wsdl:message>
@@ -14258,6 +14364,18 @@
</wsdl:message>
<wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiSoapOut">
<wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiResponse" />
+ </wsdl:message>
+ <wsdl:message name="get_BarCode_MoveStock_AddSourceSoapIn">
+ <wsdl:part name="parameters" element="tns:get_BarCode_MoveStock_AddSource" />
+ </wsdl:message>
+ <wsdl:message name="get_BarCode_MoveStock_AddSourceSoapOut">
+ <wsdl:part name="parameters" element="tns:get_BarCode_MoveStock_AddSourceResponse" />
+ </wsdl:message>
+ <wsdl:message name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceSoapIn">
+ <wsdl:part name="parameters" element="tns:get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource" />
+ </wsdl:message>
+ <wsdl:message name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceSoapOut">
+ <wsdl:part name="parameters" element="tns:get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceResponse" />
</wsdl:message>
<wsdl:message name="GetJXBarCode_SiMoErSoapIn">
<wsdl:part name="parameters" element="tns:GetJXBarCode_SiMoEr" />
@@ -14666,18 +14784,6 @@
</wsdl:message>
<wsdl:message name="get_CheckTypeByBarCode_MouldSoapOut">
<wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_MouldResponse" />
- </wsdl:message>
- <wsdl:message name="DeleteMouldSoapIn">
- <wsdl:part name="parameters" element="tns:DeleteMould" />
- </wsdl:message>
- <wsdl:message name="DeleteMouldSoapOut">
- <wsdl:part name="parameters" element="tns:DeleteMouldResponse" />
- </wsdl:message>
- <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_MouldSoapIn">
- <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_Mould" />
- </wsdl:message>
- <wsdl:message name="set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut">
- <wsdl:part name="parameters" element="tns:set_SavePonderationBillMain_Temp_BarCode_MouldResponse" />
</wsdl:message>
<wsdl:message name="get_ORGANIZATIONS_UserByOrgRelationSoapIn">
<wsdl:part name="parameters" element="tns:get_ORGANIZATIONS_UserByOrgRelation" />
@@ -15171,17 +15277,17 @@
<wsdl:message name="get_SourceBarCode_MoveStockSoapOut">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockResponse" />
</wsdl:message>
+ <wsdl:message name="get_SourceBarCode_MoveStock_XiaBaoSoapIn">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStock_XiaBao" />
+ </wsdl:message>
+ <wsdl:message name="get_SourceBarCode_MoveStock_XiaBaoSoapOut">
+ <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStock_XiaBaoResponse" />
+ </wsdl:message>
<wsdl:message name="get_SourceBarCode_MoveStockStepOutSoapIn">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepOut" />
</wsdl:message>
<wsdl:message name="get_SourceBarCode_MoveStockStepOutSoapOut">
<wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepOutResponse" />
- </wsdl:message>
- <wsdl:message name="get_SourceBarCode_MoveStockStepInSoapIn">
- <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepIn" />
- </wsdl:message>
- <wsdl:message name="get_SourceBarCode_MoveStockStepInSoapOut">
- <wsdl:part name="parameters" element="tns:get_SourceBarCode_MoveStockStepInResponse" />
</wsdl:message>
<wsdl:message name="set_CheckEntrustInBillSoapIn">
<wsdl:part name="parameters" element="tns:set_CheckEntrustInBill" />
@@ -17584,6 +17690,18 @@
<wsdl:part name="parameters" element="tns:GetSc_ICMOBackBillListResponse" />
</wsdl:message>
<wsdl:portType name="WebService1Soap">
+ <wsdl:operation name="DeleteMould">
+ <wsdl:input message="tns:DeleteMouldSoapIn" />
+ <wsdl:output message="tns:DeleteMouldSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
+ <wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapIn" />
+ <wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_MoveStockStepIn">
+ <wsdl:input message="tns:get_SourceBarCode_MoveStockStepInSoapIn" />
+ <wsdl:output message="tns:get_SourceBarCode_MoveStockStepInSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_POStockInBack">
<wsdl:input message="tns:get_SourceBarCode_POStockInBackSoapIn" />
<wsdl:output message="tns:get_SourceBarCode_POStockInBackSoapOut" />
@@ -17639,6 +17757,14 @@
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLi">
<wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiSoapIn" />
<wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLiSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="get_BarCode_MoveStock_AddSource">
+ <wsdl:input message="tns:get_BarCode_MoveStock_AddSourceSoapIn" />
+ <wsdl:output message="tns:get_BarCode_MoveStock_AddSourceSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource">
+ <wsdl:input message="tns:get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceSoapIn" />
+ <wsdl:output message="tns:get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSourceSoapOut" />
</wsdl:operation>
<wsdl:operation name="GetJXBarCode_SiMoEr">
<wsdl:input message="tns:GetJXBarCode_SiMoErSoapIn" />
@@ -17911,14 +18037,6 @@
<wsdl:operation name="get_CheckTypeByBarCode_Mould">
<wsdl:input message="tns:get_CheckTypeByBarCode_MouldSoapIn" />
<wsdl:output message="tns:get_CheckTypeByBarCode_MouldSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="DeleteMould">
- <wsdl:input message="tns:DeleteMouldSoapIn" />
- <wsdl:output message="tns:DeleteMouldSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
- <wsdl:input message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapIn" />
- <wsdl:output message="tns:set_SavePonderationBillMain_Temp_BarCode_MouldSoapOut" />
</wsdl:operation>
<wsdl:operation name="get_ORGANIZATIONS_UserByOrgRelation">
<wsdl:input message="tns:get_ORGANIZATIONS_UserByOrgRelationSoapIn" />
@@ -18248,13 +18366,13 @@
<wsdl:input message="tns:get_SourceBarCode_MoveStockSoapIn" />
<wsdl:output message="tns:get_SourceBarCode_MoveStockSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_MoveStock_XiaBao">
+ <wsdl:input message="tns:get_SourceBarCode_MoveStock_XiaBaoSoapIn" />
+ <wsdl:output message="tns:get_SourceBarCode_MoveStock_XiaBaoSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_MoveStockStepOut">
<wsdl:input message="tns:get_SourceBarCode_MoveStockStepOutSoapIn" />
<wsdl:output message="tns:get_SourceBarCode_MoveStockStepOutSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_MoveStockStepIn">
- <wsdl:input message="tns:get_SourceBarCode_MoveStockStepInSoapIn" />
- <wsdl:output message="tns:get_SourceBarCode_MoveStockStepInSoapOut" />
</wsdl:operation>
<wsdl:operation name="set_CheckEntrustInBill">
<wsdl:input message="tns:set_CheckEntrustInBillSoapIn" />
@@ -19859,6 +19977,33 @@
</wsdl:portType>
<wsdl:binding name="WebService1Soap" type="tns:WebService1Soap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DeleteMould">
+ <soap:operation soapAction="http://tempuri.org/DeleteMould" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
+ <soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_MoveStockStepIn">
+ <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepIn" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_POStockInBack">
<soap:operation soapAction="http://tempuri.org/get_SourceBarCode_POStockInBack" style="document" />
<wsdl:input>
@@ -19978,6 +20123,24 @@
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLi">
<soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLi" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_BarCode_MoveStock_AddSource">
+ <soap:operation soapAction="http://tempuri.org/get_BarCode_MoveStock_AddSource" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource">
+ <soap:operation soapAction="http://tempuri.org/get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -20590,24 +20753,6 @@
</wsdl:operation>
<wsdl:operation name="get_CheckTypeByBarCode_Mould">
<soap:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_Mould" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="DeleteMould">
- <soap:operation soapAction="http://tempuri.org/DeleteMould" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
- <soap:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -21353,8 +21498,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_MoveStockStepOut">
- <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepOut" style="document" />
+ <wsdl:operation name="get_SourceBarCode_MoveStock_XiaBao">
+ <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStock_XiaBao" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -21362,8 +21507,8 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_MoveStockStepIn">
- <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepIn" style="document" />
+ <wsdl:operation name="get_SourceBarCode_MoveStockStepOut">
+ <soap:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepOut" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -24974,6 +25119,33 @@
</wsdl:binding>
<wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DeleteMould">
+ <soap12:operation soapAction="http://tempuri.org/DeleteMould" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
+ <soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SourceBarCode_MoveStockStepIn">
+ <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepIn" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="get_SourceBarCode_POStockInBack">
<soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_POStockInBack" style="document" />
<wsdl:input>
@@ -25093,6 +25265,24 @@
</wsdl:operation>
<wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLi">
<soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Pack_MoveStock_ZhuoLi" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_BarCode_MoveStock_AddSource">
+ <soap12:operation soapAction="http://tempuri.org/get_BarCode_MoveStock_AddSource" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource">
+ <soap12:operation soapAction="http://tempuri.org/get_SavePonderationBillMain_Temp_BarCode_MoveStock_AddSource" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -25705,24 +25895,6 @@
</wsdl:operation>
<wsdl:operation name="get_CheckTypeByBarCode_Mould">
<soap12:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_Mould" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="DeleteMould">
- <soap12:operation soapAction="http://tempuri.org/DeleteMould" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="set_SavePonderationBillMain_Temp_BarCode_Mould">
- <soap12:operation soapAction="http://tempuri.org/set_SavePonderationBillMain_Temp_BarCode_Mould" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -26468,8 +26640,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_MoveStockStepOut">
- <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepOut" style="document" />
+ <wsdl:operation name="get_SourceBarCode_MoveStock_XiaBao">
+ <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStock_XiaBao" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@@ -26477,8 +26649,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="get_SourceBarCode_MoveStockStepIn">
- <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepIn" style="document" />
+ <wsdl:operation name="get_SourceBarCode_MoveStockStepOut">
+ <soap12:operation soapAction="http://tempuri.org/get_SourceBarCode_MoveStockStepOut" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index f5b636d..213433e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -20,7 +20,8 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<TargetFrameworkProfile />
- <Use64BitIISExpress />
+ <Use64BitIISExpress>
+ </Use64BitIISExpress>
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@@ -1080,7 +1081,7 @@
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
<Compile Include="Models\椤圭洰绠＄悊\椤圭洰闃舵\ClsPM_CustomerProInfoBillSub.cs" />
<Compile Include="Models\椤圭洰绠＄悊\椤圭洰闃舵\ClsPM_CustomerProInfoBillMain.cs" />
- <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
+ <!-- <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" /> -->
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -1137,7 +1138,6 @@
<Content Include="fonts\glyphicons-halflings-regular.woff" />
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
<Content Include="fonts\glyphicons-halflings-regular.eot" />
- <None Include="Properties\PublishProfiles\PDAWeb.pubxml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
diff --git a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..1b397c4
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index e9ac1dc..3507199 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -9,9 +9,25 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+>>>>>>> 23dbc5b616dfa1a2bcb1fa4302637b8df701f43c
+>>>>>>> ebb5a4cabce43b6eff66a1f46f9adecb337ed820
+>>>>>>> 1a6e71bfdc0c4385f1c93984d211c710cc711d54
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index b3a6f35..87085ee 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.1