From c0663fd653ae7aafad06d4f583f9a3b6faeb52d4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 一月 2026 16:50:57 +0800
Subject: [PATCH] 1
---
DAL/基础资料/公用基础资料/ClsGy_CostItem_Ctl_2.cs | 113 ++
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
NETERPNoWin/bin/x86/Debug/WebAPI.pdb | 0
BLL/bin/Release/DAL.dll | 0
DAL/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/QC_ManagementController.cs | 2
WebAPI/WebAPI.csproj.user | 30
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
NETERPNoWin/bin/x86/Debug/WebAPI.XmlSerializers.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll.config | 72 +
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 27
NETERPNoWin/bin/x86/Debug/WebAPI.dll | 0
DAL/bin/Release/DAL.pdb | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 4
BLL/bin/Release/Model.dll | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
BLL/bin/Release/DAL.pdb | 0
mintty.2026-01-20_10-06-17.png | 0
DAL/基础资料/公用基础资料/ClsGy_CostCenter_Ctl_2.cs | 109 ++
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
WebAPI/Controllers/基础资料/基础资料/Gy_CostItemController.cs | 836 ++++++++++++++++++++
DAL/bin/Release/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/WebAPIController.cs | 4
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
WebAPI/Controllers/基础资料/基础资料/Gy_CostCenterController.cs | 835 ++++++++++++++++++++
WebAPI/ListModels.cs | 24
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
DAL/DAL.csproj | 2
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
Model/基础资料/基础资料/ClsGy_CostCenter_Model_2.cs | 51 +
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
WebAPI/WebAPI.csproj | 2
BLL/bin/Release/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
Model/bin/Release/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 2
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
Model/Model.csproj | 2
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config | 25
NETERPNoWin/bin/x86/Debug/WarM.dll.config | 25
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 110 ++
BLL/bin/Release/DBUtility.dll | 0
BLL/bin/Release/BLL.dll | 0
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
NETERPNoWin/bin/x86/Debug/WebAPI.dll.config | 10
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 4
WebAPI/Controllers/物流管理/运单费用结算单/Pay_WayBillPaymentBillController.cs | 6
DBUtility/obj/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
Model/基础资料/基础资料/ClsGy_CostItem_Model_2.cs | 51 +
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll.config | 23
NETERPNoWin/bin/x86/Debug/Kanban.dll.config | 23
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
Model/bin/Release/Model.pdb | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll | 0
Model/bin/Release/Model.dll | 0
NETERPNoWin/bin/x86/Debug/TopSdk.pdb | 0
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
NETERPNoWin/bin/x86/Debug/Fleck.dll | 0
NETERPNoWin/bin/x86/Debug/Google.ProtocolBuffers.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 28
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs | 10
NETERPNoWin/bin/x86/Debug/TopSdk.dll | 0
92 files changed, 2,355 insertions(+), 75 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 48a73ef..5a7cf82 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index 06c20c0..385665d 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index 6fa1dff..8716785 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 8fa11fa..2a9b88e 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index 370ef51..351bff9 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index d39389a..f7d49ba 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index 672290f..a0f1f26 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index 89f5ef5..fb569a7 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 5758b6f..d992fac 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -86,6 +86,8 @@
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CostCenter_Ctl_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CostItem_Ctl_2.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Driver_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Car_Ctl_2.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsCg_ContractTransportBillList.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 6fa1dff..8716785 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 8fa11fa..2a9b88e 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index 370ef51..351bff9 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index d39389a..f7d49ba 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index 672290f..a0f1f26 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index 89f5ef5..fb569a7 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
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_CostCenter_Ctl_2.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_CostCenter_Ctl_2.cs"
new file mode 100644
index 0000000..2108b87
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostCenter_Ctl_2.cs"
@@ -0,0 +1,109 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_CostCenter_Ctl_2 : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_CostCenter_Model_2 oModel = new Model.ClsGy_CostCenter_Model_2();
+ //鏂板
+ public override bool AddNew(ref string sReturn)
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc($@"
+ INSERT INTO {MvarItemKey} (HNumber, HName, HShortNumber, HParentID, HLevel, HEndFlag,
+ HStopflag, HRemark, HHelpCode, HUseFlag, HMakeTime, HMakeEmp, HUSEORGID,
+ HCREATEORGID)
+ VALUES ('{oModel.HNumber}', '{oModel.HName}', '{oModel.HShortNumber}',
+ '{oModel.HParentID}', '{oModel.HLevel}', '{oModel.HEndFlag}',
+ '{oModel.HStopflag}', '{oModel.HRemark}', '{oModel.HHelpCode}',
+ '{oModel.HUseFlag}', getdate(), '{oModel.HMakeEmp}',
+ '{oModel.HUSEORGID}', '{oModel.HCREATEORGID}')
+ ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc($@"
+ UPDATE {MvarItemKey} SET
+ HNumber='{oModel.HNumber}',
+ HName='{oModel.HName}',
+ HShortNumber='{oModel.HShortNumber}',
+ HParentID='{oModel.HParentID}',
+ HLevel='{oModel.HLevel}',
+ HEndFlag='{oModel.HEndFlag}',
+ HStopflag='{oModel.HStopflag}',
+ HRemark='{oModel.HRemark}',
+ HHelpCode='{oModel.HHelpCode}',
+ HUseFlag='{oModel.HUseFlag}',
+ HModifyEmp='{oModel.HModifyEmp}',
+ HModifyTime=getdate(),
+ HUSEORGID='{oModel.HUSEORGID}',
+ HCREATEORGID= '{oModel.HCREATEORGID}'
+ WHERE HItemID='{oModel.HItemID}'
+ ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ // oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_CostCenter_Ctl_2()
+ {
+ MvarItemKey = "Gy_CostCenter_1";
+ MvarReportTitle = "鎴愭湰涓績璁剧疆";
+ oModel = new Model.ClsGy_CostCenter_Model_2();
+ }
+ }
+}
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_CostItem_Ctl_2.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_CostItem_Ctl_2.cs"
new file mode 100644
index 0000000..18c61b9
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostItem_Ctl_2.cs"
@@ -0,0 +1,113 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_CostItem_Ctl_2 : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_CostItem_Model_2 oModel = new Model.ClsGy_CostItem_Model_2();
+ //鏂板
+ public override bool AddNew(ref string sReturn)
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc($@"
+ INSERT INTO {MvarItemKey} (HNumber, HName, HShortNumber, HParentID, HLevel, HEndFlag,
+ HStopflag, HRemark, HHelpCode, HUseFlag, HMakeTime, HMakeEmp, HUSEORGID,
+ HCREATEORGID,HAccountID,HCostType,HCostObj)
+ VALUES ('{oModel.HNumber}', '{oModel.HName}', '{oModel.HShortNumber}',
+ '{oModel.HParentID}', '{oModel.HLevel}', '{oModel.HEndFlag}',
+ '{oModel.HStopflag}', '{oModel.HRemark}', '{oModel.HHelpCode}',
+ '{oModel.HUseFlag}', getdate(), '{oModel.HMakeEmp}',
+ '{oModel.HUSEORGID}', '{oModel.HCREATEORGID}', '{oModel.HAccountID}',
+ '{oModel.HCostType}', '{oModel.HCostObj}')
+ ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc($@"
+ UPDATE {MvarItemKey} SET
+ HNumber='{oModel.HNumber}',
+ HName='{oModel.HName}',
+ HShortNumber='{oModel.HShortNumber}',
+ HParentID='{oModel.HParentID}',
+ HLevel='{oModel.HLevel}',
+ HEndFlag='{oModel.HEndFlag}',
+ HStopflag='{oModel.HStopflag}',
+ HRemark='{oModel.HRemark}',
+ HHelpCode='{oModel.HHelpCode}',
+ HUseFlag='{oModel.HUseFlag}',
+ HModifyEmp='{oModel.HModifyEmp}',
+ HModifyTime=getdate(),
+ HUSEORGID='{oModel.HUSEORGID}',
+ HCREATEORGID= '{oModel.HCREATEORGID}',
+ HAccountID= '{oModel.HAccountID}',
+ HCostType= '{oModel.HCostType}',
+ HCostObj= '{oModel.HCostObj}'
+ WHERE HItemID='{oModel.HItemID}'
+ ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ // oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_CostItem_Ctl_2()
+ {
+ MvarItemKey = "Gy_CostItem_1";
+ MvarReportTitle = "鎴愭湰椤圭洰璁剧疆";
+ oModel = new Model.ClsGy_CostItem_Model_2();
+ }
+ }
+}
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 370ef51..351bff9 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index d39389a..f7d49ba 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 4aad987..056769a 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 370ef51..351bff9 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index d39389a..f7d49ba 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 859cbb0..61bb725 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -106,6 +106,8 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_TrolleyPositionBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_PurPrice_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CostCenter_Model_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CostItem_Model_2.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantData.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantDataEntry.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 370ef51..351bff9 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index d39389a..f7d49ba 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index 672290f..a0f1f26 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index 89f5ef5..fb569a7 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 6d28566..d30318c 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index 672290f..a0f1f26 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index 89f5ef5..fb569a7 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
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_CostCenter_Model_2.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_CostCenter_Model_2.cs"
new file mode 100644
index 0000000..3a714e4
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostCenter_Model_2.cs"
@@ -0,0 +1,51 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_CostCenter_Model_2
+ {
+ public long HItemID { get; set; } = 1;
+ public string HNumber { get; set; }
+ public string HHelpCode { get; set; }
+ public string HName { get; set; }
+ public string HShortNumber { get; set; }
+ public bool HEndFlag { get; set; }
+ public bool HStopflag { get; set; }
+ public string HRemark { get; set; }
+ public long HLevel { get; set; }
+ public long HParentID { get; set; }
+ public string HModel { get; set; }
+ public long HUnitID { get; set; }
+ public string HUnitNumber { get; set; }
+ public string HUnitName { get; set; }
+ public string HUseFlag { get; set; } = "鏈娇鐢�";
+ public long HEntryID { get; set; }
+ public string HMakeEmp { get; set; } // varchar(100) //鍒涘缓浜�
+ public string HMakeTime { get; set; } // datetime //鍒涘缓鏃ユ湡(getdate())
+ public string HCheckEmp { get; set; } // varchar(100) //瀹℃牳浜�
+ public string HCheckTime { get; set; } // datetime //瀹℃牳鏃ユ湡
+ public string HModifyEmp { get; set; } // varchar(100) //淇敼浜�
+ public string HModifyTime { get; set; } // datetime //淇敼鏃ユ湡
+ public string HStopEmp { get; set; } // varchar(100) //绂佺敤浜�
+ public string HStopTime { get; set; } // datetime //绂佺敤鏃ユ湡
+ public Int64 HUSEORGID { get; set; } // int //浣跨敤缁勭粐锛圶t_ORGANIZATIONS锛�
+ public Int64 HCREATEORGID { get; set; } // int //鍒涘缓缁勭粐锛圶t_ORGANIZATIONS锛�
+
+ public long HInterID { get; set; }
+ public string HModClass { get; set; }
+ public string HKey { get; set; }
+ public string HCaption { get; set; }
+ public string HValue { get; set; }
+ public bool HReadonly { get; set; }
+ public string HExplanation { get; set; }
+
+ public Int64 HAccountID { get; set; }
+
+ public string HCostType { get; set; }
+
+ public string HCostObj { get; set; }
+
+ }
+}
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_CostItem_Model_2.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_CostItem_Model_2.cs"
new file mode 100644
index 0000000..caf1d25
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostItem_Model_2.cs"
@@ -0,0 +1,51 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_CostItem_Model_2
+ {
+ public long HItemID { get; set; } = 1;
+ public string HNumber { get; set; }
+ public string HHelpCode { get; set; }
+ public string HName { get; set; }
+ public string HShortNumber { get; set; }
+ public bool HEndFlag { get; set; }
+ public bool HStopflag { get; set; }
+ public string HRemark { get; set; }
+ public long HLevel { get; set; }
+ public long HParentID { get; set; }
+ public string HModel { get; set; }
+ public long HUnitID { get; set; }
+ public string HUnitNumber { get; set; }
+ public string HUnitName { get; set; }
+ public string HUseFlag { get; set; } = "鏈娇鐢�";
+ public long HEntryID { get; set; }
+ public string HMakeEmp { get; set; } // varchar(100) //鍒涘缓浜�
+ public string HMakeTime { get; set; } // datetime //鍒涘缓鏃ユ湡(getdate())
+ public string HCheckEmp { get; set; } // varchar(100) //瀹℃牳浜�
+ public string HCheckTime { get; set; } // datetime //瀹℃牳鏃ユ湡
+ public string HModifyEmp { get; set; } // varchar(100) //淇敼浜�
+ public string HModifyTime { get; set; } // datetime //淇敼鏃ユ湡
+ public string HStopEmp { get; set; } // varchar(100) //绂佺敤浜�
+ public string HStopTime { get; set; } // datetime //绂佺敤鏃ユ湡
+ public Int64 HUSEORGID { get; set; } // int //浣跨敤缁勭粐锛圶t_ORGANIZATIONS锛�
+ public Int64 HCREATEORGID { get; set; } // int //鍒涘缓缁勭粐锛圶t_ORGANIZATIONS锛�
+
+ public long HInterID { get; set; }
+ public string HModClass { get; set; }
+ public string HKey { get; set; }
+ public string HCaption { get; set; }
+ public string HValue { get; set; }
+ public bool HReadonly { get; set; }
+ public string HExplanation { get; set; }
+
+ public Int64 HAccountID { get; set; }
+
+ public string HCostType { get; set; }
+
+ public string HCostObj { get; set; }
+
+ }
+}
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index fffc341..86940c7 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index 9fe52ac..224c219 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index 1c8f7c3..cede386 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index 135bea9..43e9945 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index c85e329..ae72c90 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index 25ced69..4d72f34 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index 41ccb64..cacc03f 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index 0188c89..65b6308 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Fleck.dll b/NETERPNoWin/bin/x86/Debug/Fleck.dll
new file mode 100644
index 0000000..8879ec4
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Fleck.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll b/NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll
new file mode 100644
index 0000000..3d84f93
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll.config b/NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll.config
new file mode 100644
index 0000000..8a2a34c
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/GetuiServerApiSDK.dll.config
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <configSections>
+ <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,
+ log4net-net-1.0"/>
+ </configSections>
+
+
+ <log4net>
+ <root>
+ <level value="ALL"/>
+ <appender-ref ref="RollingFileAppender-error"/>
+ <appender-ref ref="RollingFileAppender-debug"/>
+ <appender-ref ref="RollingFileAppender-info"/>
+ </root>
+
+
+ <appender name="RollingFileAppender-error" type="log4net.Appender.RollingFileAppender">
+ <file value="gt_error_" />
+ <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+ <datePattern value="yyyyMMdd".log"" />
+ <rollingStyle value="Date" />
+ <appendToFile value="true" />
+ <staticLogFileName value="false" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/>
+ </layout>
+ <filter type="log4net.Filter.LevelRangeFilter">
+ <param name="LevelMin" value="ERROR"/>
+ <param name="LevelMax" value="ERROR"/>
+ </filter>
+ </appender>
+
+ <appender name="RollingFileAppender-debug" type="log4net.Appender.RollingFileAppender">
+ <file value="gt_debug_" />
+ <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+ <datePattern value="yyyyMMdd".log"" />
+ <rollingStyle value="Date" />
+ <appendToFile value="true" />
+ <staticLogFileName value="false" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/>
+ </layout>
+ <filter type="log4net.Filter.LevelRangeFilter">
+ <param name="LevelMin" value="DEBUG"/>
+ <param name="LevelMax" value="DEBUG"/>
+ </filter>
+ </appender>
+
+ <appender name="RollingFileAppender-info" type="log4net.Appender.RollingFileAppender">
+ <file value="gt_info_" />
+ <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+ <datePattern value="yyyyMMdd".log"" />
+ <rollingStyle value="Date" />
+ <appendToFile value="true" />
+ <staticLogFileName value="false" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/>
+ </layout>
+ <filter type="log4net.Filter.LevelRangeFilter">
+ <param name="LevelMin" value="INFO"/>
+ <param name="LevelMax" value="INFO"/>
+ </filter>
+ </appender>
+
+
+ </log4net>
+ <startup>
+
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+ </startup>
+</configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/Google.ProtocolBuffers.dll b/NETERPNoWin/bin/x86/Debug/Google.ProtocolBuffers.dll
new file mode 100644
index 0000000..bf6cc70
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Google.ProtocolBuffers.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..ec3a2de
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index a296f9b..515782f 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll.config b/NETERPNoWin/bin/x86/Debug/Kanban.dll.config
new file mode 100644
index 0000000..7ca9f4c
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll.config
@@ -0,0 +1,23 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index 5498965..6a92b1b 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index 034c842..93484ef 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 7c7300a..eed4ec7 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index b743dd4..0013c9c 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
index 51278a4..8b8fb46 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe.config
@@ -1,3 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index b45811a..75ff626 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index aaf6127..2bd6904 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index 3de35ec..a0f31b5 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index 01c4115..c857595 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index 1fac519..29ef1ad 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
index 2e4ce6d..51c1cd4 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
index e7464b6..f209bb9 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
index 643e03b..855f2e8 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
index e7229eb..388caf1 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
index b9087fe..bee06d9 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
index 411f8a7..966a52a 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/TopSdk.dll b/NETERPNoWin/bin/x86/Debug/TopSdk.dll
index 1140893..0effc9e 100644
--- a/NETERPNoWin/bin/x86/Debug/TopSdk.dll
+++ b/NETERPNoWin/bin/x86/Debug/TopSdk.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/TopSdk.pdb b/NETERPNoWin/bin/x86/Debug/TopSdk.pdb
index d810b82..faffd24 100644
--- a/NETERPNoWin/bin/x86/Debug/TopSdk.pdb
+++ b/NETERPNoWin/bin/x86/Debug/TopSdk.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index b18b06a..db51213 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll.config b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
index d9658be..cc86fd1 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll.config
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll.config
@@ -1,5 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index 0c14d43..bf052a7 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WebAPI.XmlSerializers.dll b/NETERPNoWin/bin/x86/Debug/WebAPI.XmlSerializers.dll
index b4a52ae..7878441 100644
--- a/NETERPNoWin/bin/x86/Debug/WebAPI.XmlSerializers.dll
+++ b/NETERPNoWin/bin/x86/Debug/WebAPI.XmlSerializers.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WebAPI.dll b/NETERPNoWin/bin/x86/Debug/WebAPI.dll
index 1a0b4fd..b76e859 100644
--- a/NETERPNoWin/bin/x86/Debug/WebAPI.dll
+++ b/NETERPNoWin/bin/x86/Debug/WebAPI.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config b/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config
index 965144f..a22bfa5 100644
--- a/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config
+++ b/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config
@@ -30,11 +30,11 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>-->
<!--娴嬭瘯鏈嶅姟鍣�-->
- <add key="surl" value="http://localhost:8082/webs/webservice1.asmx" />
+ <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> -->
<!--鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->
<!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />-->
+ <!--<add key="surl" value="http://localhost/WEBS-WMS/webservice1.asmx" /> -->
<!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>-->
@@ -42,7 +42,7 @@
<!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
<!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />-->
<!--閲戝竻-->
- <add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx" />
+ <add key="sUrl" value="http://localhost:8082/webs/webservice1.asmx" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
@@ -117,13 +117,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://localhost:8082/WEBS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://localhost:8082/webs/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost:8082/WEBS/WebService1.asmx</value>
+ <value>http://localhost:8082/webs/webservice1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/NETERPNoWin/bin/x86/Debug/WebAPI.pdb b/NETERPNoWin/bin/x86/Debug/WebAPI.pdb
index ef401d7..40dbb8a 100644
--- a/NETERPNoWin/bin/x86/Debug/WebAPI.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WebAPI.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index a23b28e..da63f9c 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll.config b/NETERPNoWin/bin/x86/Debug/WorkM.dll.config
new file mode 100644
index 0000000..7ca9f4c
--- /dev/null
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll.config
@@ -0,0 +1,23 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index 982ddc8..f8b3f51 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index 112c37c..318faf8 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -544,3 +544,113 @@
D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MESMain.resources
D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.GenerateResource.cache
D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CoreCompileInputs.cache
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\grpc_csharp_ext.x86.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\grpc_csharp_ext.x64.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\libgrpc_csharp_ext.x64.so
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\libgrpc_csharp_ext.x64.dylib
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Models\ClsSc_MouldScrapOutBillMain.cs
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe.config
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.exe
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NETERPNoWin.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.gregn6Lib.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WebAPI.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.grdes6Lib.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\ICSharpCode.SharpZipLib.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BouncyCastle.Crypto.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WebActivatorEx.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Fleck.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Optimization.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Mvc.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Swashbuckle.Core.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Http.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Http.Cors.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\GetuiServerApiSDK.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\RestSharp.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.SDK.Dingtalk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.OpenApiClient.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Tea.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\TopSdk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Http.WebHost.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Net.Http.Formatting.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Dapper.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.TeaUtil.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Microsoft.Web.Infrastructure.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Razor.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.Razor.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Cors.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Google.ProtocolBuffers.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.GatewayDingTalk.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.GatewaySpi.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.OpenApiUtil.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AlibabaCloud.TeaXML.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.Deployment.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Aliyun.Credentials.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BLL.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DAL.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\DBUtility.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Kanban.dll.config
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Model.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\OAM.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\PlanM.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Class.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Pub_Control.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\SQLHelper.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll.config
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.dll.config
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OOXML.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WebAPI.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WebAPI.dll.config
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\ICSharpCode.SharpZipLib.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\ICSharpCode.SharpZipLib.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BouncyCastle.Crypto.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Optimization.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Mvc.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Http.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Http.Cors.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\GetuiServerApiSDK.dll.config
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\RestSharp.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\TopSdk.pdb
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Net.Http.Formatting.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Dapper.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.Razor.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.Razor.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\System.Web.WebPages.Deployment.xml
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\zh-Hans\System.Web.Http.resources.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\zh-Hans\System.Net.Http.Formatting.resources.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WebAPI.XmlSerializers.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
+D:\gz\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index df6d0c2..e6d535b 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f5fa917..37a42e5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -4024,6 +4024,8 @@
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
DataRow dr = ds.Tables[0].Rows[0];
+ dr["HPrintQty"] = 0;
+
string Num = dr["HBarCode"].ToString();
string Num1 = Num.Substring(0, (Num.Length) - 5);
oCN.BeginTran();
diff --git a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
index 1bf08df..37b8e55 100644
--- a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
@@ -22,11 +22,11 @@
#region 涓夌爜鍚堜竴锛屽垽鏂壂鎻忕墿鏂欐潯鐮佺粦瀹氫俊鎭槸鍚︿竴鑷�
[Route("CheckBarcodeController/Get_BarCode_BarcodeCheck")]
[HttpGet]
- public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType,int HInterID, string HBillNo,string HMaker)
+ public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType,int HInterID, string HBillNo,string HMaker,string HBillType)
{
try
{
- ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "'", "h_p_Cj_CheckBarcodeBing");
+ ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "','" + HBillType + "'", "h_p_Cj_CheckBarcodeBing");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -68,12 +68,12 @@
[Route("CheckBarcodeController/Save_BarCode_BarcodeCheck")]
[HttpGet]
- public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo)
+ public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo,string HBillType)
{
try
{
oCn.BeginTran();
- DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -93,7 +93,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString(); //澶辫触锛�
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 21207d6..e5ecba2 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -2132,7 +2132,7 @@
UserName = oItem.HMaker;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HDate=oItem.HDate.ToString()==""? DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
oItem.HBillType = "7506";
oItem.HBillSubType = "7506";
oItem.HBillStatus = 0;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e83bff7..0aeb3f8 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1492,11 +1492,11 @@
{
if (Employee != "")
{
- sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
+ sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
}
else
{
- sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString();
+ sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString();
}
}
try
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index d2f4023..987795d 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -698,7 +698,7 @@
}
}
- oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+ oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID=" + HInterID);
//瀹℃牳鍚庢帶鍒�
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_FirstPieceCheckBill_AfterCheckCtrl " + HInterID.ToString() + ",'"+ ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", "h_p_QC_FirstPieceCheckBill_AfterCheckCtrl");
@@ -752,7 +752,7 @@
}
}
- oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+ oCN.RunProc("update QC_FirstPieceCheckBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
//鍙嶅鏍稿悗鎺у埗
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_FirstPieceCheckBill_AfterUnCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", " h_p_QC_FirstPieceCheckBill_AfterUnCheckCtrl");
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_CostCenterController.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_CostCenterController.cs"
new file mode 100644
index 0000000..bc2d0f2
--- /dev/null
+++ "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_CostCenterController.cs"
@@ -0,0 +1,835 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+using WebAPI.Service;
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_CostCenterController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鎴愭湰涓績 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+ /// <summary>
+ /// 渚涘簲鍟嗗垎绫� 鏌ヨ
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Gy_CostCenter/Gy_CostCenterList")]
+ [HttpGet]
+ public object Gy_CostCenterList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostCenter_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql1 = "SELECT * from h_v_Gy_CostCenter_1 where 1 = 1";
+ string sql = sql1 + sWhere + " order by 鎴愭湰涓績浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_CostCenter_1");
+
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鎴愭湰涓績 瀹℃牳銆佸弽瀹℃牳
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_CostCenter/AuditGy_CostCenter")]
+ [HttpGet]
+ public object AuditGy_CostItem(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CostCenter_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + HInterID, "Gy_CostCenter_1");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostCenter_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostCenter_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostCenter_1 set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostCenter_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostCenter_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_CostCenter_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostCenter_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostCenter_1 set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ //鍙嶅鏍稿悗鎺у埗========================h_p_Gy_CostCenter_AfterUnCheckCtrl=================
+ string sql2 = "exec h_p_Gy_CostCenter_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostCenter_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鎴愭湰涓績 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_CostCenter")]
+ [HttpGet]
+ public object DeltetGy_ItemMoney(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostCenter_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ ds = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + HItemID, "Gy_CostCenter_1 ");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostCenter_BeforeDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostCenter_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("delete Gy_CostCenter_1 where HItemID=" + HItemID);
+
+
+ //鍒犻櫎鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostCenter_AfterDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostCenter_AfterDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜锛氬垹闄ゅ悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
+ 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 绂佺敤
+ /// <summary>
+ /// 鎴愭湰涓績 绂佺敤銆佸弽绂佺敤
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_CostCenter/StopGy_CostCenter")]
+ [HttpGet]
+ public object StopGy_CostCenter(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //绂佺敤鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CostCenter_Close", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + HInterID, "Gy_CostCenter_1");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+
+ //绂佺敤鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostCenter_BeforeStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostCenter_BeforeStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:绂佺敤鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostCenter_1 set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ //绂佺敤鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostCenter_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostCenter_AfterStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:绂佺敤鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+
+ //鍙嶇鐢ㄥ墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_CostCenter_BeforeUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostCenter_BeforeUnStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:鍙嶇鐢ㄥ墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostCenter_1 set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ //鍙嶇鐢ㄥ悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_CostCenter_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostItem_AfterUnStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:鍙嶇鐢ㄥ悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇濆瓨 鎴愭湰涓績
+ /// <summary>
+ /// 淇濆瓨鎴愭湰涓績
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Gy_CostCenter/SaveGy_CostCenter")]
+ [HttpPost]
+ public object SaveGy_CostCenter([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostCenter_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsGy_CostCenter_Ctl_2 oBill = new DAL.ClsGy_CostCenter_Ctl_2();
+ List<Model.ClsGy_CostCenter_Model_2 > lsmain = new List<Model.ClsGy_CostCenter_Model_2>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_CostCenter(msg1);
+ foreach (Model.ClsGy_CostCenter_Model_2 oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+
+ ds = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostCenter_1");
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈唬鐮佷负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏂板鏃跺垽鏂�
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_CostCenter_1 where HItemID=" + oItem.HItemID, "Gy_CostCenter_1");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ 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());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg2;//鍒涘缓浜�
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+
+ bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ oBill.oModel.HModifyEmp = msg2;
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ 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.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
+ #region 缂栬緫鎴愭湰涓績鑾峰彇
+ [Route("Gy_CostCenter/Gety_CostCenter")]
+ [HttpGet]
+ public object GetGy_CarDetail(int HID)
+ {
+
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string sql1 = $@"select * from h_v_Gy_CostCenter_1 where HItemID = {HID}";
+ ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostCenter_1");
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
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_CostItemController.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_CostItemController.cs"
new file mode 100644
index 0000000..1490405
--- /dev/null
+++ "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_CostItemController.cs"
@@ -0,0 +1,836 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+using WebAPI.Service;
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_CostItemController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鎴愭湰椤圭洰 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+ /// <summary>
+ /// 渚涘簲鍟嗗垎绫� 鏌ヨ
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Gy_CostItem/Gy_CostItemList")]
+ [HttpGet]
+ public object Gy_CostItemList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostItem_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql1 = "SELECT * from h_v_Gy_CostItem_1 where 1 = 1";
+ string sql = sql1 + sWhere + " order by 鎴愭湰椤圭洰浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_CostItem_1");
+
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 椤圭洰璐圭敤 瀹℃牳銆佸弽瀹℃牳
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_CostItem/AuditGy_CostItem")]
+ [HttpGet]
+ public object AuditGy_CostItem(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CostItem_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ var ds = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + HInterID, "Gy_CostItem_1");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostItem_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostItem_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostItem_1 set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostItem_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostItem_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_CostItem_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostItem_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostItem_1 set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_CostItem_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostItem_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鎴愭湰椤圭洰 鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_CostItem")]
+ [HttpGet]
+ public object DeltetGy_CostItem(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostItem_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ ds = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + HItemID, "Gy_CostItem_1 ");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_ItemMoney_BeforeDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_ItemMoney_BeforeDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("delete Gy_CostItem_1 where HItemID=" + HItemID);
+
+
+ //鍒犻櫎鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_ItemMoney_AfterDelCtrl " + HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_ItemMoney_AfterDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜锛氬垹闄ゅ悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
+ 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 绂佺敤
+ /// <summary>
+ /// 椤圭洰璐圭敤 绂佺敤銆佸弽绂佺敤
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_CostItem/StopGy_CostItem")]
+ [HttpGet]
+ public object StopGy_CostItem(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //绂佺敤鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_CostItem_Close", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + HInterID, "Gy_CostItem_1");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+
+ //绂佺敤鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_CostItem_BeforeStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostItem_BeforeStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:绂佺敤鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostItem_1 set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ //绂佺敤鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_CostItem_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostItem_AfterStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:绂佺敤鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+
+ //鍙嶇鐢ㄥ墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_CostItem_BeforeUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_CostItem_BeforeUnStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:鍙嶇鐢ㄥ墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oCN.RunProc("update Gy_CostItem_1 set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ //鍙嶇鐢ㄥ悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_CostItem_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_CostItem_AfterUnStopCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:鍙嶇鐢ㄥ悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄥけ璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇濆瓨 鎴愭湰椤圭洰
+ /// <summary>
+ /// 淇濆瓨鎴愭湰椤圭洰
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Gy_CostItem/SaveGy_CostItem")]
+ [HttpPost]
+ public object SaveGy_CostItem([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_CostItem_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsGy_CostItem_Ctl_2 oBill = new DAL.ClsGy_CostItem_Ctl_2();
+ List<Model.ClsGy_CostItem_Model_2> lsmain = new List<Model.ClsGy_CostItem_Model_2>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_CostItem(msg1);
+ foreach (Model.ClsGy_CostItem_Model_2 oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+
+ ds = oCN.RunProcReturn("select * from Gy_CostItem_1 where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CostItem_1");
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈唬鐮佷负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏂板鏃跺垽鏂�
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹垚鏈唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_CostItem_1 where HItemID=" + oItem.HItemID, "Gy_CostItem_1");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ 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());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg2;//鍒涘缓浜�
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+
+ bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ oBill.oModel.HModifyEmp = msg2;
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ 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.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
+ #region 缂栬緫鎴愭湰椤圭洰鑾峰彇
+ [Route("Gy_CostItem/Gety_CostItem")]
+ [HttpGet]
+ public object GetGy_CarDetail(int HID)
+ {
+
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string sql1 = $@"select * from h_v_Gy_CostItem_1 where HItemID = {HID}";
+ ds = oCN.RunProcReturn(sql1, "h_v_Gy_CostItem_1");
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs" "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
index 6031ceb..bc2881e 100644
--- "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
+++ "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
@@ -97,8 +97,8 @@
string msg3 = sArray[1].ToString(); //瀛愯〃
string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
string msg4 = sArray[3].ToString();//鐢ㄦ埛鍚�
- string msg5 = sArray[4].ToString();
- if (msg5 != null || msg5 != "")
+ string msg5 = sArray[5].ToString();
+ if (msg5 != null && msg5 != ""&& msg5 != "undefined")
{
msg5 = msg5.Substring(1);
@@ -232,7 +232,7 @@
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- if (msg5 != "")
+ if (msg5 != null && msg5 != "" && msg5 != "undefined")
{
oCN.RunProc("update WL_YayBillMain set HDate_Accounting=getdate() , HSurer_Accounting='" + msg4 +"'" +" where HInterID in (" + msg5 + ")");
}
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index a130ae3..29c7a58 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -127,8 +127,8 @@
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "','" + oSub.HQCNote1_SN + "','" + oSub.HQCNote2_SN + "','" + oSub.HQCNote3_SN + "','" + oSub.HQCNote4_SN + "','" + oSub.HQCNote5_SN + "','" + oSub.HQCNote6_SN + "','" + oSub.HQCNote7_SN + "','" + oSub.HQCNote8_SN + "','" + oSub.HQCNote9_SN + "','" + oSub.HQCNote10_SN + "'" +
- "," + oSub.HTargetVal + "," + oSub.HInspectMethodID + "," + oSub.HDownLimit + "," + oSub.HUpLimit + ",'" + oSub.HAnalysisMethod + "'" +
- "," + oSub.HTargetVal2 + "," + oSub.HTargetVal3 + "," + oSub.HTargetVal4 + "," + oSub.HTargetVal5 + "," + oSub.HTargetVal6 +
+ ",'" + oSub.HTargetVal + "'," + oSub.HInspectMethodID + "," + oSub.HDownLimit + "," + oSub.HUpLimit + ",'" + oSub.HAnalysisMethod + "'" +
+ ",'" + oSub.HTargetVal2 + "','" + oSub.HTargetVal3 + "','" + oSub.HTargetVal4 + "','" + oSub.HTargetVal5 + "','" + oSub.HTargetVal6 +"'"+
") ");
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index f23da1f..977f41b 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -5405,5 +5405,29 @@
return list;
}
+ /// <summary>
+ /// 鎴愭湰椤圭洰鍙嶅簭鍒楀寲
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_CostItem_Model_2> getObjectByJson_Gy_CostItem(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_CostItem_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostItem_Model_2>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 鎴愭湰涓績鍙嶅簭鍒楀寲
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_CostCenter_Model_2> getObjectByJson_Gy_CostCenter(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_CostCenter_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostCenter_Model_2>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index a77e421..640573b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-01-19T09:23:36.9963060Z;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2026-01-22T11:26:11.1120981Z;False|2026-01-22T19:21:59.7591077+08:00;True|2026-01-21T20:10:38.2264542+08:00;True|2026-01-21T20:05:52.6769930+08:00;False|2026-01-21T20:04:52.2864808+08:00;True|2026-01-20T10:09:22.6558754+08:00;True|2026-01-20T09:43:16.9535139+08:00;False|2026-01-20T09:40:14.5080297+08:00;True|2026-01-19T17:23:36.9963060+08:00;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,19 +45,19 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/19/2026 17:18:35</publishTime>
+ <publishTime>01/20/2026 09:42:10</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/19/2026 17:18:35</publishTime>
+ <publishTime>01/20/2026 09:42:10</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/19/2026 17:18:27</publishTime>
+ <publishTime>01/20/2026 09:41:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/19/2026 17:18:27</publishTime>
+ <publishTime>01/20/2026 09:41:54</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -70,6 +70,15 @@
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll">
+ <publishTime>01/19/2026 18:29:10</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll.config">
+ <publishTime>01/19/2026 18:29:10</publishTime>
+ </File>
+ <File Include="bin/Google.ProtocolBuffers.dll">
+ <publishTime>01/19/2026 18:29:10</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -114,10 +123,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/19/2026 17:18:24</publishTime>
+ <publishTime>01/20/2026 09:41:24</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/19/2026 17:18:24</publishTime>
+ <publishTime>01/20/2026 09:41:24</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -297,10 +306,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/19/2026 17:23:35</publishTime>
+ <publishTime>01/22/2026 19:26:03</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/19/2026 17:23:35</publishTime>
+ <publishTime>01/22/2026 19:26:03</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
index 7f76b6c..1f9f32f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2026-01-19T08:39:45.2711197Z;True|2026-01-19T16:21:02.6483395+08:00;False|2026-01-19T16:20:38.8982697+08:00;</History>
+ <History>True|2026-01-22T08:22:54.7532646Z;True|2026-01-22T15:20:35.8786912+08:00;True|2026-01-22T15:05:45.5847432+08:00;True|2026-01-22T14:30:51.3737117+08:00;True|2026-01-22T14:27:07.3723210+08:00;True|2026-01-22T14:15:47.5371528+08:00;True|2026-01-22T11:23:57.8496413+08:00;True|2026-01-22T11:21:57.8847886+08:00;False|2026-01-22T11:17:40.8281638+08:00;True|2026-01-22T11:07:36.5601512+08:00;True|2026-01-22T10:59:27.4506851+08:00;True|2026-01-22T10:32:38.7652468+08:00;True|2026-01-22T10:16:56.7567817+08:00;False|2026-01-22T10:12:28.3322522+08:00;True|2026-01-22T10:10:06.8615667+08:00;True|2026-01-22T09:43:12.7110339+08:00;True|2026-01-22T09:40:45.5823227+08:00;True|2026-01-22T09:31:34.0508221+08:00;True|2026-01-22T08:11:37.9818815+08:00;False|2026-01-22T08:11:04.8101514+08:00;True|2026-01-19T16:39:45.2711197+08:00;True|2026-01-19T16:21:02.6483395+08:00;False|2026-01-19T16:20:38.8982697+08:00;</History>
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/19/2026 16:20:52</publishTime>
+ <publishTime>01/22/2026 14:15:35</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/19/2026 16:20:52</publishTime>
+ <publishTime>01/22/2026 14:15:35</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/19/2026 16:20:50</publishTime>
+ <publishTime>01/22/2026 14:15:32</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/19/2026 16:20:50</publishTime>
+ <publishTime>01/22/2026 14:15:32</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/19/2026 16:20:47</publishTime>
+ <publishTime>01/22/2026 08:11:16</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/19/2026 16:20:47</publishTime>
+ <publishTime>01/22/2026 08:11:16</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
@@ -123,10 +123,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/19/2026 16:20:48</publishTime>
+ <publishTime>01/22/2026 14:15:29</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/19/2026 16:20:48</publishTime>
+ <publishTime>01/22/2026 14:15:29</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>11/12/2025 10:43:47</publishTime>
@@ -174,10 +174,10 @@
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/19/2026 16:20:47</publishTime>
+ <publishTime>01/20/2026 10:05:54</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/19/2026 16:20:47</publishTime>
+ <publishTime>01/20/2026 10:05:54</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -306,13 +306,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/19/2026 16:39:41</publishTime>
+ <publishTime>01/22/2026 16:22:48</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/19/2026 16:39:41</publishTime>
+ <publishTime>01/22/2026 16:22:48</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/19/2026 16:39:44</publishTime>
+ <publishTime>01/22/2026 16:22:51</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a364f5e..b889da3 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -681,6 +681,8 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PlanImplementation_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostItemController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostCenterController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍏朵粬缁撶畻鍗昞YF_PayMentOtherBillTranController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍑鸿繍鍗昞WLYayBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index b087569..c85d62e 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,34 +9,8 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
- <WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
- <AspNetDebugging>True</AspNetDebugging>
- <SilverlightDebugging>False</SilverlightDebugging>
- <NativeDebugging>False</NativeDebugging>
- <SQLDebugging>False</SQLDebugging>
- <ExternalProgram>
- </ExternalProgram>
- <StartExternalURL>
- </StartExternalURL>
- <StartCmdLineArguments>
- </StartCmdLineArguments>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <EnableENC>True</EnableENC>
- <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
- </WebProjectProperties>
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
+ <ProjectExtensions />
</Project>
\ No newline at end of file
diff --git a/mintty.2026-01-20_10-06-17.png b/mintty.2026-01-20_10-06-17.png
new file mode 100644
index 0000000..8145e14
--- /dev/null
+++ b/mintty.2026-01-20_10-06-17.png
Binary files differ
--
Gitblit v1.9.1