From 2fd658134344c18e9f2a2eb2c2099d0b0edf205a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 三月 2026 16:08:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
MES/app.config | 4
WebAPI/WebAPI.csproj.user | 5
DAL/基础资料/公用基础资料/ClsGy_Car_Ctl_2.cs | 25 +
DBUtility/bin/Release/Pub_Class.dll | 0
NETERPNoWin/app.config | 4
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 7
WebAPI/Service/JwtAuthorizeAttribute.cs | 76 +++
Model/bin/Release/Pub_Control.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs | 8
BLL/bin/Release/BLL.pdb | 0
WebAPI/packages.config | 5
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/Controllers/BaseSet/Gy_DriverController.cs | 61 +-
Pub_Control/bin/Release/Pub_Class.dll | 0
WarM/app.config | 4
WebAPI/WebAPI.csproj | 16
BLL/bin/Release/Pub_Control.pdb | 0
DAL/ClsWL_YayBillMain.cs | 136 +---
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs | 6
BLL/bin/Release/Pub_Control.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
Model/质检管理/ClsQC_PatrolProcCheckBillMain.cs | 1
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 13
WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs | 6
BLL/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/Web.config | 4
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 4
BLL/bin/Release/Pub_Class.dll | 0
APSM/app.config | 4
DBUtility/bin/Release/SQLHelper.dll | 0
WebAPI/Utility/JWTHelper.cs | 79 +++
LMES/app.config | 4
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
Kanban/app.config | 4
WebAPI/Controllers/基础资料/基础资料/Gy_CarController.cs | 146 +++++
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/Cg_ContractTransportBillListController.cs | 2
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 32 -
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
OAM/OAM.csproj | 18
WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs | 4
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BLL/bin/Release/Model.dll | 0
BLL/bin/Release/DAL.pdb | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache | 1
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 31 +
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 4
WebAPI/Controllers/物流管理/出运单/WLYayBillController.cs | 624 ++++++++++++------------
WebAPI/Controllers/仓存管理/领料发货/Kf_StockOutRequestBillController.cs | 4
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 37 -
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
OAM/OAM.csproj.user | 2
Pub_Class/bin/Release/Pub_Class.pdb | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
SelM/app.config | 4
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 7
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 2
Model/bin/Release/Model.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 3
WorkM/app.config | 4
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user | 59 +-
123 files changed, 870 insertions(+), 591 deletions(-)
diff --git a/APSM/app.config b/APSM/app.config
index 446b5b6..88d19fc 100644
--- a/APSM/app.config
+++ b/APSM/app.config
@@ -30,6 +30,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index e7a09ca..3cc0a1b 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 69ab257..ebe426b 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 1b03224..0fd5d33 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 f73d0f7..6e5a427 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 5dabf29..91ad96d 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 3b6017b..82a48c6 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 ec304f5..5be684b 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 8951140..8006a6a 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 93c1ace..cb36ea9 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index b2e5797..47b39fb 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index 269e4e1..ea8e6c7 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index 3e6bc5c..e5bb8e7 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 28ffba2..fe71085 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 9c77af5..c122baf 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/ClsWL_YayBillMain.cs b/DAL/ClsWL_YayBillMain.cs
index 280fe75..5a7a9f1 100644
--- a/DAL/ClsWL_YayBillMain.cs
+++ b/DAL/ClsWL_YayBillMain.cs
@@ -63,7 +63,7 @@
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
- DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ DataSet ds = oCn.RunProcReturn("Exec h_p_WL_YayBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
if (ds == null)
{
sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
@@ -175,7 +175,7 @@
}
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_WL_YayBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
if (ds2 == null)
@@ -213,7 +213,7 @@
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
- DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ DataSet ds = oCn.RunProcReturn("Exec h_p_WL_YayBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
if (ds == null)
{
sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
@@ -231,95 +231,57 @@
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿锛岀敤浜庣┖鏃ユ湡瀛楁鐨勯粯璁ゅ��
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- string safeDateTime = "2000-01-01";
+ string safeDateTime = "null";
// 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负瀛楃涓诧紝澶勭悊null鍜岀┖瀛楃涓�
-
-
string sql = "Insert Into WL_YayBillMain " +
"(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus," +
- "HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HRemark,HBacker,HBackDate," +
- "HBackRemark,HChecker,HCheckDate,HMaker,HMakeDate,HUpDater,HUpDateDate," +
- "HCloseMan,HCloseDate,HCloseType,HDeleteMan,HDeleteDate," +
- "HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
- "HPrintQty,HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr," +
- "HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
+ "HRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
+ "HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr,HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
"HLoadingRate,HContractTransportInterID,HContractTransportEntryID," +
"HContractTransportBillNo,HCarrierID,HDistance,HTransportTimes," +
"HTransportTyep,HSSID,HCurID,HMoney,HDateForRequestedPick," +
- "HDataForRequestedArrived,HCarryStatus,HDate_CarrierSure," +
- "HDate_AllocationDriver,HCarID,HDriverID,HSurer_Arrive,HDate_Arrive," +
- "HSurer_Pick,HDate_Pick,HSurer_Trans,HDate_Trans,HSurer_Receive,HExRate," +
- "HDate_Receive,HSurer_Accounting,HDate_Accounting) " +
- "values(" +
- SafeInt(omodel.HInterID.ToString(), 0) + "," + // HInterID
- "0,0," + // HYear, HPeriod - 闇�瑕佷粠HDate璁＄畻锛岃繖閲屽厛缁�0
- "'" + SafeString(this.BillType) + "'," +
- "'" + SafeString(this.HBillSubType) + "'," +
- SafeDateTime(omodel.HDate.ToString(), "'" + currentDateTime + "'") + "," +
- "'" + SafeString(omodel.HBillNo) + "'," +
- SafeInt(omodel.HBillStatus.ToString(), 1) + "," + // HBillStatus
- SafeInt(omodel.HCheckItemNowID.ToString(), 0) + "," + // HCheckItemNowID
- SafeInt(omodel.HCheckItemNextID.ToString(), 0) + "," + // HCheckItemNextID
- SafeInt(omodel.HCheckFlowID.ToString(), 0) + "," + // HCheckFlowID
- "'" + SafeString(omodel.HRemark) + "'," +
- "'" + SafeString(omodel.HBacker) + "'," +
- SafeDateTime(omodel.HBackDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HBackRemark) + "'," +
- "'" + SafeString(omodel.HChecker) + "'," +
- SafeDateTime(omodel.HCheckDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HMaker) + "',getdate()," + // HMaker, HMakeDate
- "'" + SafeString(omodel.HUpDater) + "'," +
- SafeDateTime(omodel.HUpDateDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HCloseMan) + "'," +
- SafeDateTime(omodel.HCloseDate?.ToString(), "NULL") + "," +
- (omodel.HCloseType.ToString() == "1" ? "1" : "0") + "," + // HCloseType
- "'" + SafeString(omodel.HDeleteMan) + "'," +
- SafeDateTime(omodel.HDeleteDate?.ToString(), "NULL") + "," +
- "'" + SafeString(omodel.HMainSourceBillType) + "'," +
- SafeInt(omodel.HMainSourceInterID.ToString(), 0) + "," + // HMainSourceInterID
- SafeInt(omodel.HMainSourceEntryID.ToString(), 0) + "," + // HMainSourceEntryID
- "'" + SafeString(omodel.HMainSourceBillNo) + "'," +
- SafeInt(omodel.HPrintQty.ToString(), 0) + "," + // HPrintQty
- SafeInt(omodel.HOrgID.ToString(), 0) + "," + // HOrgID
- SafeInt(omodel.HCusID?.ToString(), 0) + "," + // HCusID
- SafeInt(omodel.HBeginAddr?.ToString(), 0) + "," + // HBeginAddr
- SafeInt(omodel.HEndAddr?.ToString(), 0) + "," + // HEndAddr
- "'" + SafeString(omodel.HPickAddr) + "'," +
- "'" + SafeString(omodel.HArriverAddr) + "'," +
- "'" + SafeString(omodel.HTransType) + "'," +
- SafeInt(omodel.HCarTypeID?.ToString(), 0) + "," + // HCarTypeID
- SafeDecimal(omodel.HCarTypeMaxVolume?.ToString(), 0) + "," + // HCarTypeMaxVolume
- SafeDecimal(omodel.HTotalVolume?.ToString(), 0) + "," + // HTotalVolume
- SafeDecimal(omodel.HLoadingRate?.ToString(), 0) + "," + // HLoadingRate
- SafeInt(omodel.HContractTransportInterID?.ToString(), 0) + "," + // HContractTransportInterID
- SafeInt(omodel.HContractTransportEntryID?.ToString(), 0) + "," + // HContractTransportEntryID
- "'" + SafeString(omodel.HContractTransportBillNo) + "'," +
- SafeInt(omodel.HCarrierID?.ToString(), 0) + "," + // HCarrierID
- SafeDecimal(omodel.HDistance?.ToString(), 0) + "," + // HDistance
- SafeDecimal(omodel.HTransportTimes?.ToString(), 0) + "," + // HTransportTimes
- "'" + SafeString(omodel.HTransportTyep) + "'," +
- SafeInt(omodel.HSSID?.ToString(), 0) + "," + // HSSID
- SafeInt(omodel.HCurID?.ToString(), 0) + "," + // HCurID
- SafeDecimal(omodel.HMoney?.ToString(), 0) + "," + // HMoney
- SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
- SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
- SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
- SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + safeDateTime + "'") + "," +
- SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
- SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
- SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
- "'" + SafeString(omodel.HSurer_Arrive) + "'," +
- SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Pick) + "'," +
- SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Trans) + "'," +
- SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Receive) + "'," +
- "'" + omodel.HExRate + "'," +
- SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," +
- "'" + SafeString(omodel.HSurer_Accounting) + "'," +
- SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")";
-
+ "HDataForRequestedArrived,HExRate" +
+ ") values(" +
+ "" + omodel.HInterID + "" +
+ "," + "year(getdate())" + "" +
+ "," + "month(getdate())" + "" +
+ ",'" + this.BillType + "'" +
+ ",'" + this.HBillSubType + "'" +
+ ",'" + omodel.HDate + "'" +
+ ",'" + omodel.HBillNo + "'" +
+ "," + 1 + "" +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + omodel.HMaker + "'" +
+ "," + "getdate()" + "" +
+ ",'" + omodel.HMainSourceBillType + "'" +
+ ",'" + omodel.HMainSourceInterID + "'" +
+ ",'" + omodel.HMainSourceEntryID + "'" +
+ ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HOrgID + "'" +
+ ",'" + omodel.HCusID + "'" +
+ ",'" + omodel.HBeginAddr + "'" +
+ ",'" + omodel.HEndAddr + "'" +
+ ",'" + omodel.HPickAddr + "'" +
+ ",'" + omodel.HArriverAddr + "'" +
+ ",'" + omodel.HTransType + "'" +
+ ",'" + omodel.HCarTypeID + "'" +
+ ",'" + omodel.HCarTypeMaxVolume + "'" +
+ ",'" + omodel.HTotalVolume + "'" +
+ ",'" + omodel.HLoadingRate + "'" +
+ ",'" + omodel.HContractTransportInterID + "'" +
+ ",'" + omodel.HContractTransportEntryID + "'" +
+ ",'" + omodel.HContractTransportBillNo + "'" +
+ ",'" + omodel.HCarrierID + "'" +
+ ",'" + omodel.HDistance + "'" +
+ ",'" + omodel.HTransportTimes + "'" +
+ ",'" + omodel.HTransportTyep + "'" +
+ ",'" + omodel.HSSID + "'" +
+ ",'" + omodel.HCurID + "'" +
+ ",'" + omodel.HMoney + "'" +
+ ",'" + omodel.HDateForRequestedPick + "'" +
+ ",'" + omodel.HDataForRequestedArrived + "'" +
+ ",'" + omodel.HExRate + "'" +
+ ")";
oCn.RunProc(sql);
//涓昏〃
//鎻掑叆瀛愯〃
@@ -359,7 +321,7 @@
oCn.RunProc(sql);
}
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_WL_YayBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
if (ds2 == null)
{
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 5c58090..0fd5d33 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 bd719c1..6e5a427 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 754f2d7..91ad96d 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 402f91d..82a48c6 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 2abbc0f..5be684b 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 50a2b70..8006a6a 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 811eca9..cb36ea9 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index e2a9401..47b39fb 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index 5737a70..ea8e6c7 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index c7a6c67..e5bb8e7 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index a359cd7..fe71085 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 0a7a7bb..c122baf 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.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_Car_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_Car_Ctl_2.cs"
index 24cdb74..a73b62a 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Car_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_Car_Ctl_2.cs"
@@ -91,6 +91,31 @@
throw (e);
}
}
+
+
+ //鏄剧ず鍗曟嵁
+ public bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Gy_Car Where HItemID=" + lngBillKey.ToString(), "Gy_Car");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
//鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
public override bool HavParentCode(string sCode, Int64 sItemID)
{
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 754f2d7..91ad96d 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 402f91d..82a48c6 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 811eca9..cb36ea9 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index e2a9401..47b39fb 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index 5737a70..ea8e6c7 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index c7a6c67..e5bb8e7 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index a359cd7..fe71085 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 0a7a7bb..c122baf 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index de48bab..eab4eff 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.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 4112f82..a98803e 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index ebee6a3..a1123a1 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 5dabf29..91ad96d 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 3b6017b..82a48c6 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Kanban/app.config b/Kanban/app.config
index 446b5b6..88d19fc 100644
--- a/Kanban/app.config
+++ b/Kanban/app.config
@@ -30,6 +30,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
diff --git a/LMES/app.config b/LMES/app.config
index f056053..4219377 100644
--- a/LMES/app.config
+++ b/LMES/app.config
@@ -31,6 +31,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
diff --git a/MES/app.config b/MES/app.config
index 09867fb..b698871 100644
--- a/MES/app.config
+++ b/MES/app.config
@@ -27,6 +27,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 754f2d7..91ad96d 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 402f91d..82a48c6 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 2abbc0f..5be684b 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 50a2b70..8006a6a 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 811eca9..cb36ea9 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index e2a9401..47b39fb 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index 5737a70..ea8e6c7 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index c7a6c67..e5bb8e7 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index a359cd7..fe71085 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 0a7a7bb..c122baf 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 4ae1e08..bf0bcf7 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 ec304f5..5be684b 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 8951140..8006a6a 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
index 6bd9e59..d30d001 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
@@ -25,5 +25,6 @@
public Int64 HShiftsID;
public string HErrTreatment;
public Int64 HQCSchemeID;
+ public Int64 HPrdQty;
}
}
diff --git a/NETERPNoWin/app.config b/NETERPNoWin/app.config
index f056053..4219377 100644
--- a/NETERPNoWin/app.config
+++ b/NETERPNoWin/app.config
@@ -31,6 +31,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index e278bd6..167b379 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -274,19 +274,6 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\Interop.gregn6Lib.dll
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.ResolveComReference.cache
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Form1.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_MESSetIni.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.OA_MessageBox.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Frm_Show.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MDIMain.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Properties.Resources.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.Xt_Wait.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.MESMain.resources
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.GenerateResource.cache
-D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CoreCompileInputs.cache
D:\WMES\MES-WEB-API\NETERPNoWin\bin\x86\Debug\grpc_csharp_ext.x86.dll
D:\WMES\MES-WEB-API\NETERPNoWin\bin\x86\Debug\grpc_csharp_ext.x64.dll
D:\WMES\MES-WEB-API\NETERPNoWin\bin\x86\Debug\libgrpc_csharp_ext.x64.so
diff --git a/OAM/OAM.csproj b/OAM/OAM.csproj
index 7bc31a7..1961575 100644
--- a/OAM/OAM.csproj
+++ b/OAM/OAM.csproj
@@ -95,18 +95,6 @@
<Compile Include="Form2.Designer.cs">
<DependentUpon>Form2.cs</DependentUpon>
</Compile>
- <Compile Include="OA_EmpMessageBill.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="OA_EmpMessageBill.designer.cs">
- <DependentUpon>OA_EmpMessageBill.cs</DependentUpon>
- </Compile>
- <Compile Include="OA_EmpMessageBillList.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="OA_EmpMessageBillList.designer.cs">
- <DependentUpon>OA_EmpMessageBillList.cs</DependentUpon>
- </Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="淇℃伅骞冲彴\OA_ComFileBill.cs">
<SubType>Form</SubType>
@@ -695,12 +683,6 @@
<EmbeddedResource Include="Form2.resx">
<SubType>Designer</SubType>
<DependentUpon>Form2.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="OA_EmpMessageBill.resx">
- <DependentUpon>OA_EmpMessageBill.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="OA_EmpMessageBillList.resx">
- <DependentUpon>OA_EmpMessageBillList.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="淇℃伅骞冲彴\OA_ComFileBill.resx">
<DependentUpon>OA_ComFileBill.cs</DependentUpon>
diff --git a/OAM/OAM.csproj.user b/OAM/OAM.csproj.user
index 23bc47a..474bb5d 100644
--- a/OAM/OAM.csproj.user
+++ b/OAM/OAM.csproj.user
@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 44326d1..0dfe75b 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2803,6 +2803,13 @@
{
omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+
+ //=========返修条码
+ //生成物料条码时，机型码不允许为空
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_BarCodeBill_Rework_Ctrl")
+ {
+ omodel.Gy_BarCodeBill_Rework_Ctrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
}
sReturn = "显示单据成功！";
return true;
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 8633075..26b027b 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -874,6 +874,9 @@
// 巡检单 首检控制
public string QC_PatrolProcCheckOtherBill_FirstCheckCtl; // 巡检单 是否启用 首检控制
+
+ //返修条码
+ public string Gy_BarCodeBill_Rework_Ctrl; //生成物料条码时，机型码不允许为空
}
}
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 811eca9..cb36ea9 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index e2a9401..47b39fb 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index c0635b3..9a5be6e 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index ca3eca3..310ad83 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 811eca9..cb36ea9 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index e2a9401..47b39fb 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index 5737a70..ea8e6c7 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index c7a6c67..e5bb8e7 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 811eca9..cb36ea9 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index e2a9401..47b39fb 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index a359cd7..fe71085 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 0a7a7bb..c122baf 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 7d29553..d4a33f2 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 28ffba2..fe71085 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 9c77af5..c122baf 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SelM/app.config b/SelM/app.config
index 6daa946..3709960 100644
--- a/SelM/app.config
+++ b/SelM/app.config
@@ -26,6 +26,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index c1cb681..55b6c53 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index d4f984c..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index 88af047..fea44e6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index ba7dc80..9082937 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -4,35 +4,3 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-E:\gz\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-E:\gz\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-=======
->>>>>>> 450d6ca292427262638ceb63bcfd9eb57b91c4a5
->>>>>>> 89c2f64be31944048225dbfd5afd53ca09660e6c
-=======
->>>>>>> c83104067c8f52426a3dd1da2af3466b44fea7af
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index c1cb681..55b6c53 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index d4f984c..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..bfb772c
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/WarM/app.config b/WarM/app.config
index 44c1b0c..fb47071 100644
--- a/WarM/app.config
+++ b/WarM/app.config
@@ -33,6 +33,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 1b1d01d..afa5a6c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -8,6 +8,7 @@
using gregn6Lib;
using Pub_Class;
using System.Threading;
+using System.Linq;
namespace WarM
{
@@ -105,6 +106,7 @@
public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
public string sReturn = "";
public string HExpiryDate = "";
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
#region 鍥哄畾浠ｇ爜
@@ -595,15 +597,32 @@
string HPinfan = ""; //鍝佺暘
DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
- for (int j = 0; j < grdMain.Rows.Count; j++)
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
{
- if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0 && grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString() == "")
+ //鐢熸垚鐗╂枡鏉＄爜鏃讹紝鏈哄瀷鐮佷笉鍏佽涓虹┖,濡傝嫢鐗╂枡浠ｇ爜鍓嶇紑涓嶄负G鎴朙鐨勶紝鍙烦杩囨帶鍒�
+ if (oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl != "")
{
- MessageBox.Show("绗�" + (j+1) + "琛岋紝鏈哄瀷鐮佹湭缁存姢锛屼笉鍏佽鐢熸垚鏉＄爜");
- bc.Enabled = true;
- return;
+ string[] HMaterNumberPrefix = oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl.Split(',');
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) == 0)
+ {
+ continue;
+ }
+
+ char HMaterfirstChar = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString()[0];
+
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0 && grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString() == "" && HMaterNumberPrefix.Contains(HMaterfirstChar.ToString()))
+ {
+ MessageBox.Show("绗�" + (j + 1) + "琛岋紝鏈哄瀷鐮佹湭缁存姢锛屼笉鍏佽鐢熸垚鏉＄爜");
+ bc.Enabled = true;
+ return;
+ }
+ }
}
- }
+ }
oCn.BeginTran();
Application.DoEvents();
diff --git a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
index 23a5d65..e0909ac 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
@@ -37,15 +37,15 @@
try
{
List<object> columnNameList = new List<object>();
- ////鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Driver_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
string sql1 = string.Format(@"select * from h_v_Gy_driver where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
@@ -232,14 +232,14 @@
try
{
////鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_Department_Delete", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_Driver_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))
@@ -479,7 +479,7 @@
//string msg5 = sArray[3].ToString();
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Driver_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -501,7 +501,7 @@
string HHelpCode = list[0].HHelpCode;
string HModifyEmp = msg3;
string HMakeEmp = msg3;
- bool HStopflag = list[0].HStopflag==null?false:true;
+ int HStopflag = list[0].HStopflag==0?0:1;
long HCREATEORGID = list[0].HCREATEORGID;
long HUSEORGID = HUSEORGID_1;
long HCompID = list[0].HCompID;
@@ -577,7 +577,7 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime,HIDCard,HPhone,HDriverCardPic,HDriverCardType,HIDCardPic,HEmpType,HCompID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HStopflag + ",'" + HRemark + "'" +
"," + HUSEORGID + "," + HCREATEORGID + ",'" + msg3 + "',getdate()," +"'"+ HIDCard +"',"+
"'"+ HPhone+"','"+ HDriverCardPic+"','"+ HDriverCardType + "','"+ HIDCardPic +"','"+ HEmpType+"',"+ HCompID+
")", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -611,7 +611,7 @@
",HParentID=" + HParentID +
",HUSEORGID=" + HUSEORGID.ToString() +
",HCREATEORGID=" + HCREATEORGID.ToString() +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HStopflag=" + HStopflag +
",HModifyEmp='" + HModifyEmp + "'" +
",HModifyTime='" + DateTime.Now + "'" +
",HIDCard='" + HIDCard + "'" +
@@ -621,7 +621,6 @@
",HIDCardPic='" + HIDCardPic + "'" +
",HEmpType='" + HEmpType + "'" +
",HCompID=" + HCompID + "" +
-
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
@@ -989,15 +988,15 @@
{
try
{
- ////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Check", 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Driver_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
var ds = oCN.RunProcReturn("select * from Gy_Driver where HItemID=" + HInterID, "Gy_Driver");
if (ds.Tables[0].Rows.Count > 0)
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index bf5a886..57900c6 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -631,8 +631,8 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
diff --git a/WebAPI/Controllers/Cg_ContractTransportBillListController.cs b/WebAPI/Controllers/Cg_ContractTransportBillListController.cs
index 32e870e..d08a26d 100644
--- a/WebAPI/Controllers/Cg_ContractTransportBillListController.cs
+++ b/WebAPI/Controllers/Cg_ContractTransportBillListController.cs
@@ -35,7 +35,7 @@
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Cg_ContractTransportBill_Check", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Cg_ContractTransportBill_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
index c049f50..2c1d421 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
@@ -350,11 +350,11 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
-
-
+
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
index 54fb7d7..720e776 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
@@ -515,8 +515,8 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
index 64170c5..b428abf 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
@@ -410,11 +410,11 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
-
+
string updateSql = $@"
UPDATE Sc_MouldStockBillMain
SET HPackQtys = {newPallet}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
index b1bec67..3b424e0 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
@@ -352,11 +352,11 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
-
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index 8799c5d..7c37f51 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -429,8 +429,8 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
index 0413d3c..4d28779 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
@@ -319,8 +319,8 @@
if (hmainid <= 0)
return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
- if (newPallet <= 0)
- return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+ if (newPallet < 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
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_CarController.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_CarController.cs"
index 6180a18..5f01eb7 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarController.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_CarController.cs"
@@ -16,6 +16,7 @@
public class Gy_CarController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsGy_Car_Ctl_2 oBill = new DAL.ClsGy_Car_Ctl_2();
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -89,6 +90,150 @@
return objJsonResult;
}
}
+
+ #region 杞﹁締 鍒犻櫎
+ [Route("Gy_CarController/DropGy_Car")]
+ [HttpGet]
+ public object dropGy_Car(string HItemID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Car_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HItemID == null || HItemID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.ShowBill(long.Parse(HItemID), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (oBill.oModel.HCheckEmp != "" && oBill.oModel.HCheckEmp != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_Car_BeforeDelCtrl " + oBill.oModel.HInterID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_Car_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;
+ 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;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Gy_Car where HItemID = " + HItemID);
+
+
+ //鍐欏叆鏃ュ織
+ string Operation = "鍒犻櫎";
+ string ComputerName = System.Net.Dns.GetHostName(); //璁惧鍚嶇О
+ string WorkList = Operation + "鍗曟嵁锛屽崟鎹彿锛�" + oBill.oModel.HNumber;
+ string MvarReportTitle = oBill.MvarReportTitle; //妯″潡
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ string IPAddress = "";
+ //string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP鍦板潃
+ //string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;
+
+ oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
+ );
+
+
+ //鍒犻櫎鍚庢帶鍒�==================================================================================
+ string sql2 = "exec h_p_Gy_Car_AfterDelCtrl " + oBill.oModel.HItemID + ",'" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_Car_AfterDelCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ s = ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==============================================================================================
+
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + oBill.oModel.HNumber + "鐨勮溅杈嗭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#region 杞﹁締鍒楄〃-鍒嗛〉
[Route("Gy_Car/list_byPage")]
@@ -202,7 +347,6 @@
ListModels oListModels = new ListModels();
try
{
- DAL.ClsGy_Car_Ctl_2 oBill = new DAL.ClsGy_Car_Ctl_2();
List<Model.ClsGy_Car_Model_2> lsmain = new List<Model.ClsGy_Car_Model_2>();
msg1 = msg1.Replace("\\", "");
msg1 = msg1.Replace("\n", ""); //\n
diff --git "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs" "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
index dba79a1..9a41d24 100644
--- "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
+++ "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
@@ -23,7 +23,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- #region 鍒嗛〉鍒楄〃
+ #region 鍑鸿繍鍗� 鍒嗛〉鍒楄〃
[Route("WLYayBillController/GetListPage")]
[HttpGet]
public object GetListPage(string sWhere, string user)
@@ -79,8 +79,7 @@
}
#endregion
-
- #region 鏍规嵁婧愬崟浼犵墿鏂欏垪琛�
+ #region 鍑鸿繍鍗� 鏍规嵁婧愬崟浼犵墿鏂欏垪琛�
[Route("WLYayBillController/GetMesByOrginBill")]
[HttpGet]
public object GetMesByOrginBill(string ListMaterial)
@@ -126,8 +125,7 @@
}
#endregion
-
- #region 淇濆瓨/缂栬緫
+ #region 鍑鸿繍鍗� 淇濆瓨/缂栬緫
[Route("WLYayBillController/SaveBill")]
[HttpPost]
@@ -144,7 +142,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("WLYayBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -237,8 +235,7 @@
}
#endregion
-
- #region[缂栬緫鏃惰幏鍙栨暟鎹甝
+ #region 鍑鸿繍鍗� 缂栬緫鏃惰幏鍙栨暟鎹�
[Route("WLYayBillController/WL_YayBillDetail")]
[HttpGet]
public ApiResult<DataSet> WL_YayBillDetail(string HID)
@@ -253,8 +250,76 @@
}
#endregion
+ #region 鍑鸿繍鍗� 鍒犻櫎
+ [Route("WLYayBillController/deleteBill")]
+ [HttpGet]
+ public object deleteBill(string HItemID, string user)
+ {
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("WLYayBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- #region 瀹℃牳銆佸弽瀹℃牳
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛岃瀵绘壘绯荤粺缁存姢浜哄憳杩涜澶勭悊锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HItemID, "WL_YayBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅澶辫触锛屽崟鎹笉瀛樺湪锛屽垹闄ゅけ璐ワ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]) != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触銆傚崟鎹凡瀹℃牳锛屾棤娉曡繘琛屽垹闄わ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ oCN.RunProc("delete from WL_YayBillMain where HInterID=" + HItemID);
+ oCN.RunProc("delete from WL_YayBillSub_Material where HInterID=" + HItemID);
+
+ 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>
@@ -349,15 +414,45 @@
}
#endregion
+ #region 鍑鸿繍鍗� 缁存姢闆舵媴浣撶Н
+ [Route("WLYayBillController/updateBillMEs")]
+ [HttpGet]
+ public object updateBillMEs(int HInterID, int HEntryID, int ScatteredVolume, string CurUserName)
+ {
+ if (!DBUtility.ClsPub.Security_Log("WLYayBill_ScatteredVolume", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- #region 渚涘簲鍟嗙‘璁ゆ椂闂�
- /// <summary>
- ///
- /// </summary>
- /// <param name="HInterID">鍗曟嵁ID</param>
- /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
- /// <param name="CurUserName">瀹℃牳浜�</param>
- /// <returns></returns>
+ DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain a inner join WL_YayBillSub_Material b on b.HInterID=a.HInterID where a.HInterID=" + HInterID + " and b.HEntryID = " + HEntryID, "WL_YayBillMain");
+ if (ds != null || ds.Tables[0].Rows.Count > 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("update WL_YayBillSub_Material set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID + "and HEntryID=" + HEntryID);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "闆舵媴浣撶Н鏁版嵁缁存姢澶辫触銆備负鏌ヨ鍒板崟鎹俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍑鸿繍鍗� 渚涘簲鍟嗙‘璁ゆ椂闂�
[Route("WLYayBillController/ConfrimBillNo")]
[HttpGet]
public object ConfrimBillNo(int HInterID, int IsAudit, string CurUserName)
@@ -374,26 +469,33 @@
return objJsonResult;
}
- var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
- if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "璇峰厛瀹℃牳鍗曟嵁锛�";
+ objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅澶辫触锛屽崟鎹笉瀛樺湪锛屾棤娉曡繘琛屾壙杩愬晢纭锛侊紒";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝鏃犳硶杩涜鎵胯繍鍟嗙‘璁わ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
+ oCN.RunProc("update WL_YayBillMain set HDate_CarrierSure='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "' where HInterID=" + HInterID);
-
- oCN.RunProc("update WL_YayBillMain set HDate_CarrierSure='" + DateTime.Now.ToString("yyyy-MM-dd") + "' where HInterID=" + HInterID);
-
+ oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎴愬姛";
objJsonResult.data = null;
- oCN.Commit();
-
return objJsonResult;
}
catch (Exception e)
@@ -408,159 +510,7 @@
}
#endregion
-
- #region 鍏朵粬纭
- /// <summary>
- ///
- /// </summary>
- /// <param name="HInterID">鍗曟嵁ID</param>
- /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
- /// <param name="CurUserName">瀹℃牳浜�</param>
- /// <returns></returns>
- [Route("WLYayBillController/ConfrimOtherBillNo")]
- [HttpGet]
- public object ConfrimOtherBillNo(int HInterID, int IsAudit, string CurUserName)
- {
- try
- {
- //瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_Check", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
-
- oCN.BeginTran();
- if (IsAudit == 1)
- {
- if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_arriveConfirm", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒板満纭澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || ds.Tables[0].Rows[0]["HDriverID"].ToString() == "0")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇峰厛鍒嗛厤鍙告満锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.RunProc("update WL_YayBillMain set HSurer_Arrive='" + CurUserName + "',HDate_Arrive=getdate() where HInterID=" + HInterID);
- }
- else if (IsAudit == 2)
- {
- if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_arriveConfirm", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒板満纭澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_pickConfirm", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎻愯揣澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ds.Tables[0].Rows[0]["HSurer_Arrive"] == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇峰厛鍒板巶纭锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.RunProc("update WL_YayBillMain set HSurer_Pick='" + CurUserName + "',HDate_Pick=getdate() where HInterID=" + HInterID);
-
- }
- else if (IsAudit == 3)
- {
- if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_tranConfirm", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍑哄巶杩愯緭澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "" )
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇峰厛鎻愯揣纭锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.RunProc("update WL_YayBillMain set HSurer_Trans='" + CurUserName + "',HDate_Trans=getdate() where HInterID=" + HInterID);
-
- }
- else if (IsAudit == 4)
- {
- if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_receiveConfirm", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绛炬敹澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ds.Tables[0].Rows[0]["HSurer_Trans"] == null || ds.Tables[0].Rows[0]["HSurer_Trans"].ToString() == "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇峰厛鍑哄巶杩愯緭纭锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.RunProc("update WL_YayBillMain set HSurer_Receive='" + CurUserName + "',HDate_Receive=getdate() where HInterID=" + HInterID);
-
- }
- else
- {
- throw new Exception();
- }
-
- 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="HInterID">鍗曟嵁ID</param>
- /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
- /// <param name="CurUserName">瀹℃牳浜�</param>
- /// <returns></returns>
+ #region 鍑鸿繍鍗� 鍒嗛厤杞﹁締鍜屽徃鏈�
[Route("WLYayBillController/selectDriver")]
[HttpGet]
public object selectDriver(int HInterID, int HcheckID, int IsAudit, string CurUserName)
@@ -575,63 +525,208 @@
objJsonResult.data = null;
return objJsonResult;
}
- DataSet ds;
- var dss = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
- if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "" || dss.Tables[0].Rows[0]["HDate_CarrierSure"] == "2000-01-01 00:00:00.000")
+
+ DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "璇峰厛渚涘簲鍟嗙‘璁わ紒";
+ objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅澶辫触锛屽崟鎹笉瀛樺湪锛屾棤娉曡繘琛屽垎閰嶈溅杈嗐�佸徃鏈烘搷浣滐紒锛�";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝鏃犳硶杩涜鍒嗛厤杞﹁締銆佸徃鏈烘搷浣滐紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HDate_CarrierSure"] == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈繘琛屼緵搴斿晢纭銆傝鍏堣繘琛屼緵搴斿晢纭锛岀劧鍚庡啀杩涜鍒嗛厤杞﹁締銆佸徃鏈烘搷浣滐紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (IsAudit == 1)
{
-
- ds = oCN.RunProcReturn("select * from h_v_Gy_CarList where HItemID=" + HcheckID, "h_v_Gy_CarList");
-
- if (ds.Tables[0].Rows.Count > 0)
- {
- oCN.BeginTran();
+ oCN.BeginTran();
+ oCN.RunProc("update WL_YayBillMain set HCarID='" + HcheckID + "' where HInterID=" + HInterID);
+ oCN.Commit();
-
- oCN.RunProc("update WL_YayBillMain set HCarID='" + HcheckID + "' where HInterID=" + HInterID);
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = null;
- oCN.Commit();
- return objJsonResult;
- }
-
-
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_driver where HItemID=" + HcheckID, "h_v_Gy_driver");
- if (ds.Tables[0].Rows.Count > 0)
- {
- oCN.BeginTran();
+ oCN.BeginTran();
+ oCN.RunProc("update WL_YayBillMain set HDriverID='" + HcheckID + "',HDate_AllocationDriver=getdate() where HInterID=" + HInterID);
+ oCN.Commit();
-
- oCN.RunProc("update WL_YayBillMain set HDriverID='" + HcheckID + "',HDate_AllocationDriver=getdate() where HInterID=" + HInterID);
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = null;
- oCN.Commit();
- return objJsonResult;
- }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
}
+ }
+ catch (Exception e)
+ {
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "澶辫触锛�";
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #region 鍑鸿繍鍗� 鍏朵粬纭(IsAudit)銆�1锛氬埌鍘傜‘璁わ紱2锛氭彁璐х‘璁わ紱3锛氬嚭鍘傜‘璁わ紱4锛氱鏀剁‘璁ゃ��
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("WLYayBillController/ConfrimOtherBillNo")]
+ [HttpGet]
+ public object ConfrimOtherBillNo(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅澶辫触锛屽崟鎹笉瀛樺湪锛屾棤娉曡繘琛屽埌鍘傜‘璁ゆ搷浣滐紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝鏃犳硶杩涜鍒板巶纭鎿嶄綔锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ if (IsAudit == 1)
+ {
+ if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_arriveConfirm", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒板巶纭澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDriverID"].ToString() == "0" || ds.Tables[0].Rows[0]["HCarID"].ToString() == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑鸿繍鍗曟湭鍒嗛厤杞﹁締涓庨┚椹跺憳锛屾棤娉曡繘琛屽埌鍘傜‘璁ゆ搷浣滐紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update WL_YayBillMain set HSurer_Arrive='" + CurUserName + "',HDate_Arrive=getdate() where HInterID=" + HInterID);
+ }
+ else if (IsAudit == 2)
+ {
+ if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_pickConfirm", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻愯揣纭澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSurer_Arrive"]) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑鸿繍鍗曡鍏堣繘琛屽埌鍘傜‘璁わ紝鐒跺悗鍐嶈繘琛屾彁璐х‘璁わ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update WL_YayBillMain set HSurer_Pick='" + CurUserName + "',HDate_Pick=getdate() where HInterID=" + HInterID);
+
+ }
+ else if (IsAudit == 3)
+ {
+ if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_tranConfirm", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑哄巶杩愯緭澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSurer_Pick"]) == "" )
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍑鸿繍鍗曟湭杩涜鎻愯揣纭銆傝鍏堣繘琛屾彁璐х‘璁わ紝鐒跺悗鍐嶈繘琛屽嚭鍘傜‘璁わ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update WL_YayBillMain set HSurer_Trans='" + CurUserName + "',HDate_Trans=getdate() where HInterID=" + HInterID);
+ }
+ else if (IsAudit == 4)
+ {
+ if (!DBUtility.ClsPub.Security_Log_second("WLYayBill_receiveConfirm", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绛炬敹澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSurer_Trans"]) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍑鸿繍鍗曟湭杩涜鍑哄巶纭銆傝鍏堣繘琛屽嚭鍘傜‘璁わ紝鐒跺悗鍐嶈繘琛岀鏀剁‘璁わ紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("update WL_YayBillMain set HSurer_Receive='" + CurUserName + "',HDate_Receive=getdate() where HInterID=" + HInterID);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触锛屽綋鍓嶆搷浣滄寚浠ゆ棤娉曡瘑鍒�傝鑱旂郴绯荤粺缁存姢浜哄憳杩涜澶勭悊锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
@@ -646,104 +741,9 @@
}
#endregion
-
- [Route("WLYayBillController/deleteBill")]
- [HttpGet]
- public object deleteBill(string HItemID, string user)
- {
- DataSet ds;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
- try
- {
- //鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("WLYayBill_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 WL_YayBillMain where HInterID=" + HItemID, "WL_YayBillMain");
- DataSet dds = oCN.RunProcReturn("select * from WL_YayBillSub_Material where HInterID=" + HItemID, "WL_YayBillSub_Material");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
+
- oCN.RunProc("delete WL_YayBillMain where HInterID=" + HItemID);
- if (dds != null || dds.Tables[0].Rows.Count != 0)
- {
- oCN.RunProc("delete WL_YayBillSub_Material where HInterID=" + HItemID);
- }
- 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;
- }
- }
-
-
- [Route("WLYayBillController/updateBillMEs")]
- [HttpGet]
- public object updateBillMEs(int HInterID,int HEntryID, int ScatteredVolume, string CurUserName)
- {
- //鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("WLYayBill_ScatteredVolume", 1, false, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- var ds = oCN.RunProcReturn("select * from WL_YayBillMain a inner join WL_YayBillSub_Material b on b.HInterID=a.HInterID where a.HInterID=" + HInterID, "WL_YayBillMain");
- if (ds != null || ds.Tables[0].Rows.Count <= 0)
- {
- oCN.BeginTran();
- oCN.RunProc("update WL_YayBillSub_Material set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID+ "and HEntryID="+ HEntryID);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = null;
- oCN.Commit();
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏇存柊澶辫触锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+
}
}
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index 04b14aa..7766ae2 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -83,7 +83,7 @@
//========================================
//",HSupID=" + omodel.HSupID.ToString() +
//",HEmpID=" + omodel.HEmpID.ToString() +
- //",HSourceID=" + omodel.HSourceID.ToString() +
+ ",HSourceID=" + omodel.HSourceID.ToString() +
//",HICMOInterID=" + omodel.HICMOInterID.ToString() +
//",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
//",HICMOQty=" + omodel.HICMOQty.ToString() +
@@ -97,6 +97,7 @@
",HShiftsID=" + omodel.HShiftsID.ToString() +
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HQCSchemeID='" + omodel.HQCSchemeID + "'" +
+ ",HPrdQty='" + omodel.HPrdQty + "'" +
" where HInterID=" + lngBillKey.ToString();
//鏇存柊涓昏〃
oCn.RunProc(sqlerro);
@@ -232,12 +233,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID,HLastResult,HShiftsID,HErrTreatment,HQCSchemeID" +
+ ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID,HLastResult,HShiftsID,HErrTreatment,HQCSchemeID,HPrdQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
- ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +" ,"+ omodel.HLastResult + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'," + omodel.HQCSchemeID +
+ ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +" ,"+ omodel.HLastResult + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'," + omodel.HQCSchemeID + "," + omodel.HPrdQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
index a9b3a6d..dc7debd 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.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-03-24T00:11:40.8167004Z;False|2026-03-24T08:10:24.5227115+08:00;True|2026-03-23T16:52:06.1962112+08:00;True|2026-03-23T10:48:43.9146974+08:00;False|2026-03-23T10:47:37.6567528+08:00;True|2026-03-23T10:21:45.2785227+08:00;False|2026-03-23T10:21:38.6946638+08:00;True|2026-03-20T13:20:00.4199413+08:00;False|2026-03-20T13:19:48.2280600+08:00;True|2026-03-19T16:53:44.5050326+08:00;True|2026-03-19T10:10:35.5101923+08:00;False|2026-03-19T10:10:15.7270659+08:00;True|2026-03-18T19:51:55.1022153+08:00;True|2026-03-18T19:41:13.5178535+08:00;False|2026-03-18T19:40:38.2085412+08:00;True|2026-03-18T09:40:21.0697989+08:00;True|2026-03-18T09:34:25.1335941+08:00;False|2026-03-18T09:33:56.8767961+08:00;False|2026-03-17T11:45:46.0943251+08:00;True|2026-03-16T14:55:19.5092172+08:00;True|2026-03-16T14:39:12.2885876+08:00;True|2026-03-16T13:20:59.6155796+08:00;True|2026-03-16T12:53:38.9806066+08:00;False|2026-03-16T12:53:28.1149911+08:00;True|2026-03-16T10:21:54.6583129+08:00;False|2026-03-16T10:20:22.8166196+08:00;True|2026-03-13T13:56:44.7436815+08:00;True|2026-03-13T13:48:09.2962246+08:00;True|2026-03-13T10:01:06.8006672+08:00;False|2026-03-13T09:59:31.4203821+08:00;True|2026-03-09T01:54:24.1336085+08:00;False|2026-03-09T01:53:17.3398700+08:00;True|2026-03-09T01:28:43.0746681+08:00;True|2026-03-09T00:35:43.7572081+08:00;False|2026-03-09T00:34:44.1380553+08:00;True|2026-03-02T10:58:08.4918461+08:00;True|2026-02-28T14:36:37.1813756+08:00;True|2026-02-28T09:10:06.2035727+08:00;True|2026-02-28T08:45:06.8758170+08:00;False|2026-02-28T08:45:00.2780485+08:00;True|2026-02-27T16:29:24.9278951+08:00;False|2026-02-27T16:29:01.8985145+08:00;True|2026-02-27T15:25:58.1156917+08:00;False|2026-02-27T15:25:50.1203408+08:00;True|2026-02-27T08:48:32.3741487+08:00;False|2026-02-27T08:47:49.7647299+08:00;True|2026-02-26T13:55:29.1843761+08:00;True|2026-02-26T10:17:02.6775428+08:00;False|2026-02-26T10:15:56.8080083+08:00;True|2026-02-25T16:35:36.1616346+08:00;False|2026-02-25T16:35:02.7930400+08:00;True|2026-02-25T15:14:31.7665279+08:00;True|2026-02-25T15:06:38.2831461+08:00;True|2026-02-25T14:53:16.9553043+08:00;True|2026-02-25T14:18:12.0055193+08:00;True|2026-02-25T14:11:45.2316738+08:00;True|2026-02-25T14:02:16.3161429+08:00;True|2026-02-25T13:47:25.4930099+08:00;False|2026-02-25T13:46:34.1837894+08:00;True|2026-02-24T10:25:01.2146652+08:00;True|2026-02-24T10:16:06.3505078+08:00;True|2026-02-24T10:08:41.7064926+08:00;False|2026-02-24T10:07:25.4868308+08:00;True|2026-02-21T14:56:37.2206752+08:00;True|2026-02-21T14:53:44.6277903+08:00;True|2026-02-21T14:40:10.4687091+08:00;False|2026-02-21T14:39:13.1736140+08:00;True|2026-02-11T11:45:25.6746436+08:00;True|2026-02-11T11:44:47.3185555+08:00;True|2026-02-11T10:54:59.0679758+08:00;True|2026-02-11T10:43:35.2341241+08:00;True|2026-02-11T10:36:26.6768242+08:00;True|2026-02-11T10:26:54.7470684+08:00;True|2026-02-11T10:26:14.5696000+08:00;True|2026-02-11T10:19:17.3267746+08:00;True|2026-02-11T10:03:08.9096446+08:00;True|2026-02-11T10:00:03.1731421+08:00;False|2026-02-11T09:58:47.2916714+08:00;True|2026-02-10T15:11:02.0203382+08:00;True|2026-02-10T15:07:21.6761915+08:00;True|2026-02-10T14:56:44.3660951+08:00;True|2026-02-10T14:42:24.1573010+08:00;True|2026-02-10T14:17:49.6012996+08:00;True|2026-02-10T10:54:27.8849732+08:00;True|2026-02-10T10:37:09.4615737+08:00;True|2026-02-10T10:32:50.2882198+08:00;True|2026-02-10T10:16:38.5004114+08:00;True|2026-02-10T10:04:58.3653257+08:00;False|2026-02-10T10:04:05.6938724+08:00;True|2026-02-09T11:58:12.9122757+08:00;True|2026-02-09T11:52:51.2402774+08:00;True|2026-02-09T11:47:15.5230979+08:00;True|2026-02-09T10:53:15.6587025+08:00;False|2026-02-09T10:52:01.4586729+08:00;True|2026-02-05T12:04:14.1139398+08:00;True|2026-02-05T10:00:41.8883921+08:00;False|2026-02-05T09:59:49.2086159+08:00;True|2026-02-04T13:30:53.8564398+08:00;True|2026-02-04T13:30:06.5486103+08:00;True|2026-02-04T13:21:44.7322601+08:00;True|2026-02-04T13:15:45.0093895+08:00;True|2026-02-04T13:06:30.4891537+08:00;False|2026-02-04T13:05:35.5287589+08:00;True|2026-02-04T12:39:42.2682329+08:00;True|2026-02-04T12:21:52.9722100+08:00;True|2026-02-04T12:16:07.8303016+08:00;True|2026-02-04T12:08:43.8268899+08:00;True|2026-02-04T12:03:26.1174616+08:00;True|2026-02-04T10:33:15.5394044+08:00;False|2026-02-04T10:32:30.7038502+08:00;True|2026-02-02T15:42:04.9554792+08:00;True|2026-02-02T15:39:28.7017318+08:00;True|2026-02-02T15:38:33.5592835+08:00;True|2026-02-02T15:34:24.8450917+08:00;True|2026-02-02T15:30:36.5990146+08:00;True|2026-02-02T15:09:46.1965065+08:00;True|2026-02-02T15:09:24.9794288+08:00;True|2026-02-02T15:05:46.0763516+08:00;True|2026-02-02T14:56:30.1210013+08:00;True|2026-02-02T14:52:50.7435709+08:00;True|2026-02-02T14:47:49.5891710+08:00;True|2026-02-02T14:43:23.0006294+08:00;True|2026-02-02T14:31:10.1220612+08:00;True|2026-02-02T14:21:15.6540317+08:00;True|2026-02-02T14:15:41.6183116+08:00;True|2026-02-02T14:11:32.1234982+08:00;True|2026-02-02T14:01:34.6298901+08:00;True|2026-02-02T13:55:03.4760402+08:00;True|2026-02-02T13:49:00.0420220+08:00;True|2026-02-02T13:17:17.0678676+08:00;False|2026-02-02T13:15:46.0360589+08:00;False|2026-02-02T13:15:27.1689505+08:00;False|2026-02-02T13:14:27.3078641+08:00;True|2026-02-02T12:55:41.9272586+08:00;True|2026-02-02T12:55:22.0826476+08:00;True|2026-02-02T12:09:21.8247404+08:00;True|2026-02-02T12:03:58.9256304+08:00;True|2026-02-02T11:56:01.5744871+08:00;True|2026-02-02T11:42:30.2218073+08:00;True|2026-02-02T10:59:29.6077968+08:00;False|2026-02-02T10:59:08.7803594+08:00;True|2026-01-29T14:40:47.4658031+08:00;True|2026-01-29T14:36:18.2141550+08:00;True|2026-01-29T14:32:52.4872179+08:00;True|2026-01-29T14:32:06.4197291+08:00;True|2026-01-29T14:09:33.9372276+08:00;True|2026-01-29T14:08:17.6503129+08:00;True|2026-01-29T14:06:27.5784162+08:00;True|2026-01-29T13:10:48.6581055+08:00;True|2026-01-29T13:07:28.5589276+08:00;True|2026-01-29T12:44:24.3707488+08:00;True|2026-01-29T12:42:34.6204068+08:00;True|2026-01-29T12:39:55.3867683+08:00;True|2026-01-29T12:29:41.8565928+08:00;True|2026-01-29T12:17:04.5932345+08:00;True|2026-01-29T10:08:23.4550691+08:00;True|2026-01-29T10:04:05.4236307+08:00;False|2026-01-29T10:03:18.4044168+08:00;True|2026-01-28T16:00:38.3698743+08:00;True|2026-01-28T14:15:04.1203132+08:00;True|2026-01-28T14:03:32.3230252+08:00;False|2026-01-28T14:02:41.6157812+08:00;True|2026-01-28T13:18:24.5590390+08:00;True|2026-01-28T13:10:49.5716734+08:00;True|2026-01-28T12:25:03.3201915+08:00;True|2026-01-28T12:24:37.6029904+08:00;True|2026-01-28T12:16:13.3862190+08:00;True|2026-01-28T11:43:57.8268938+08:00;True|2026-01-28T10:57:22.9246991+08:00;True|2026-01-28T10:49:34.6185686+08:00;True|2026-01-28T10:44:07.6308515+08:00;True|2026-01-28T10:36:00.0391721+08:00;True|2026-01-28T10:27:26.1658915+08:00;False|2026-01-28T10:27:00.5898601+08:00;True|2026-01-27T15:02:41.1819512+08:00;True|2026-01-27T14:55:32.3962262+08:00;True|2026-01-27T14:31:09.0105130+08:00;True|2026-01-27T13:19:08.8705541+08:00;True|2026-01-27T11:43:17.0109305+08:00;True|2026-01-27T10:53:13.5941761+08:00;True|2026-01-27T10:49:18.5740094+08:00;True|2026-01-27T10:43:29.4337654+08:00;True|2026-01-27T10:00:49.1779297+08:00;False|2026-01-27T10:00:34.2083888+08:00;True|2026-01-26T16:29:09.5100352+08:00;False|2026-01-26T16:29:04.6554601+08:00;False|2026-01-26T14:39:05.7640208+08:00;True|2026-01-26T09:57:23.8775907+08:00;False|2026-01-26T09:56:43.8599383+08:00;True|2026-01-26T09:37:16.8828589+08:00;False|2026-01-26T09:36:35.9597492+08:00;True|2026-01-25T15:20:11.0096169+08:00;True|2026-01-25T14:52:25.7167654+08:00;True|2026-01-25T14:28:16.6779637+08:00;False|2026-01-25T14:27:32.6753765+08:00;True|2026-01-23T16:17:17.9227805+08:00;True|2026-01-23T14:37:25.7929932+08:00;True|2026-01-23T14:32:25.7611106+08:00;False|2026-01-23T14:31:28.4811198+08:00;True|2026-01-22T09:55:07.0908298+08:00;True|2026-01-22T09:38:49.9102490+08:00;False|2026-01-22T09:37:53.0384929+08:00;True|2026-01-21T16:50:27.5625267+08:00;True|2026-01-21T10:50:18.7634322+08:00;True|2026-01-21T10:47:56.7913811+08:00;True|2026-01-21T10:41:46.5883817+08:00;True|2026-01-21T09:29:22.5824101+08:00;False|2026-01-21T09:28:13.4362586+08:00;True|2026-01-20T14:26:36.7806712+08:00;True|2026-01-20T13:13:01.3064754+08:00;False|2026-01-20T13:12:08.1800841+08:00;True|2026-01-20T10:28:19.5250951+08:00;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
+ <History>True|2026-03-24T13:53:34.2448116Z;False|2026-03-24T21:52:53.6918631+08:00;True|2026-03-24T20:58:50.8913155+08:00;True|2026-03-24T20:39:40.2513260+08:00;True|2026-03-24T19:59:00.3631663+08:00;True|2026-03-24T18:57:21.2378761+08:00;True|2026-03-24T15:05:40.6505074+08:00;True|2026-03-24T11:23:13.8880292+08:00;False|2026-03-24T11:22:35.7477227+08:00;True|2026-03-24T08:11:40.8167004+08:00;False|2026-03-24T08:10:24.5227115+08:00;True|2026-03-23T16:52:06.1962112+08:00;True|2026-03-23T10:48:43.9146974+08:00;False|2026-03-23T10:47:37.6567528+08:00;True|2026-03-23T10:21:45.2785227+08:00;False|2026-03-23T10:21:38.6946638+08:00;True|2026-03-20T13:20:00.4199413+08:00;False|2026-03-20T13:19:48.2280600+08:00;True|2026-03-19T16:53:44.5050326+08:00;True|2026-03-19T10:10:35.5101923+08:00;False|2026-03-19T10:10:15.7270659+08:00;True|2026-03-18T19:51:55.1022153+08:00;True|2026-03-18T19:41:13.5178535+08:00;False|2026-03-18T19:40:38.2085412+08:00;True|2026-03-18T09:40:21.0697989+08:00;True|2026-03-18T09:34:25.1335941+08:00;False|2026-03-18T09:33:56.8767961+08:00;False|2026-03-17T11:45:46.0943251+08:00;True|2026-03-16T14:55:19.5092172+08:00;True|2026-03-16T14:39:12.2885876+08:00;True|2026-03-16T13:20:59.6155796+08:00;True|2026-03-16T12:53:38.9806066+08:00;False|2026-03-16T12:53:28.1149911+08:00;True|2026-03-16T10:21:54.6583129+08:00;False|2026-03-16T10:20:22.8166196+08:00;True|2026-03-13T13:56:44.7436815+08:00;True|2026-03-13T13:48:09.2962246+08:00;True|2026-03-13T10:01:06.8006672+08:00;False|2026-03-13T09:59:31.4203821+08:00;True|2026-03-09T01:54:24.1336085+08:00;False|2026-03-09T01:53:17.3398700+08:00;True|2026-03-09T01:28:43.0746681+08:00;True|2026-03-09T00:35:43.7572081+08:00;False|2026-03-09T00:34:44.1380553+08:00;True|2026-03-02T10:58:08.4918461+08:00;True|2026-02-28T14:36:37.1813756+08:00;True|2026-02-28T09:10:06.2035727+08:00;True|2026-02-28T08:45:06.8758170+08:00;False|2026-02-28T08:45:00.2780485+08:00;True|2026-02-27T16:29:24.9278951+08:00;False|2026-02-27T16:29:01.8985145+08:00;True|2026-02-27T15:25:58.1156917+08:00;False|2026-02-27T15:25:50.1203408+08:00;True|2026-02-27T08:48:32.3741487+08:00;False|2026-02-27T08:47:49.7647299+08:00;True|2026-02-26T13:55:29.1843761+08:00;True|2026-02-26T10:17:02.6775428+08:00;False|2026-02-26T10:15:56.8080083+08:00;True|2026-02-25T16:35:36.1616346+08:00;False|2026-02-25T16:35:02.7930400+08:00;True|2026-02-25T15:14:31.7665279+08:00;True|2026-02-25T15:06:38.2831461+08:00;True|2026-02-25T14:53:16.9553043+08:00;True|2026-02-25T14:18:12.0055193+08:00;True|2026-02-25T14:11:45.2316738+08:00;True|2026-02-25T14:02:16.3161429+08:00;True|2026-02-25T13:47:25.4930099+08:00;False|2026-02-25T13:46:34.1837894+08:00;True|2026-02-24T10:25:01.2146652+08:00;True|2026-02-24T10:16:06.3505078+08:00;True|2026-02-24T10:08:41.7064926+08:00;False|2026-02-24T10:07:25.4868308+08:00;True|2026-02-21T14:56:37.2206752+08:00;True|2026-02-21T14:53:44.6277903+08:00;True|2026-02-21T14:40:10.4687091+08:00;False|2026-02-21T14:39:13.1736140+08:00;True|2026-02-11T11:45:25.6746436+08:00;True|2026-02-11T11:44:47.3185555+08:00;True|2026-02-11T10:54:59.0679758+08:00;True|2026-02-11T10:43:35.2341241+08:00;True|2026-02-11T10:36:26.6768242+08:00;True|2026-02-11T10:26:54.7470684+08:00;True|2026-02-11T10:26:14.5696000+08:00;True|2026-02-11T10:19:17.3267746+08:00;True|2026-02-11T10:03:08.9096446+08:00;True|2026-02-11T10:00:03.1731421+08:00;False|2026-02-11T09:58:47.2916714+08:00;True|2026-02-10T15:11:02.0203382+08:00;True|2026-02-10T15:07:21.6761915+08:00;True|2026-02-10T14:56:44.3660951+08:00;True|2026-02-10T14:42:24.1573010+08:00;True|2026-02-10T14:17:49.6012996+08:00;True|2026-02-10T10:54:27.8849732+08:00;True|2026-02-10T10:37:09.4615737+08:00;True|2026-02-10T10:32:50.2882198+08:00;True|2026-02-10T10:16:38.5004114+08:00;True|2026-02-10T10:04:58.3653257+08:00;False|2026-02-10T10:04:05.6938724+08:00;True|2026-02-09T11:58:12.9122757+08:00;True|2026-02-09T11:52:51.2402774+08:00;True|2026-02-09T11:47:15.5230979+08:00;True|2026-02-09T10:53:15.6587025+08:00;False|2026-02-09T10:52:01.4586729+08:00;True|2026-02-05T12:04:14.1139398+08:00;True|2026-02-05T10:00:41.8883921+08:00;False|2026-02-05T09:59:49.2086159+08:00;True|2026-02-04T13:30:53.8564398+08:00;True|2026-02-04T13:30:06.5486103+08:00;True|2026-02-04T13:21:44.7322601+08:00;True|2026-02-04T13:15:45.0093895+08:00;True|2026-02-04T13:06:30.4891537+08:00;False|2026-02-04T13:05:35.5287589+08:00;True|2026-02-04T12:39:42.2682329+08:00;True|2026-02-04T12:21:52.9722100+08:00;True|2026-02-04T12:16:07.8303016+08:00;True|2026-02-04T12:08:43.8268899+08:00;True|2026-02-04T12:03:26.1174616+08:00;True|2026-02-04T10:33:15.5394044+08:00;False|2026-02-04T10:32:30.7038502+08:00;True|2026-02-02T15:42:04.9554792+08:00;True|2026-02-02T15:39:28.7017318+08:00;True|2026-02-02T15:38:33.5592835+08:00;True|2026-02-02T15:34:24.8450917+08:00;True|2026-02-02T15:30:36.5990146+08:00;True|2026-02-02T15:09:46.1965065+08:00;True|2026-02-02T15:09:24.9794288+08:00;True|2026-02-02T15:05:46.0763516+08:00;True|2026-02-02T14:56:30.1210013+08:00;True|2026-02-02T14:52:50.7435709+08:00;True|2026-02-02T14:47:49.5891710+08:00;True|2026-02-02T14:43:23.0006294+08:00;True|2026-02-02T14:31:10.1220612+08:00;True|2026-02-02T14:21:15.6540317+08:00;True|2026-02-02T14:15:41.6183116+08:00;True|2026-02-02T14:11:32.1234982+08:00;True|2026-02-02T14:01:34.6298901+08:00;True|2026-02-02T13:55:03.4760402+08:00;True|2026-02-02T13:49:00.0420220+08:00;True|2026-02-02T13:17:17.0678676+08:00;False|2026-02-02T13:15:46.0360589+08:00;False|2026-02-02T13:15:27.1689505+08:00;False|2026-02-02T13:14:27.3078641+08:00;True|2026-02-02T12:55:41.9272586+08:00;True|2026-02-02T12:55:22.0826476+08:00;True|2026-02-02T12:09:21.8247404+08:00;True|2026-02-02T12:03:58.9256304+08:00;True|2026-02-02T11:56:01.5744871+08:00;True|2026-02-02T11:42:30.2218073+08:00;True|2026-02-02T10:59:29.6077968+08:00;False|2026-02-02T10:59:08.7803594+08:00;True|2026-01-29T14:40:47.4658031+08:00;True|2026-01-29T14:36:18.2141550+08:00;True|2026-01-29T14:32:52.4872179+08:00;True|2026-01-29T14:32:06.4197291+08:00;True|2026-01-29T14:09:33.9372276+08:00;True|2026-01-29T14:08:17.6503129+08:00;True|2026-01-29T14:06:27.5784162+08:00;True|2026-01-29T13:10:48.6581055+08:00;True|2026-01-29T13:07:28.5589276+08:00;True|2026-01-29T12:44:24.3707488+08:00;True|2026-01-29T12:42:34.6204068+08:00;True|2026-01-29T12:39:55.3867683+08:00;True|2026-01-29T12:29:41.8565928+08:00;True|2026-01-29T12:17:04.5932345+08:00;True|2026-01-29T10:08:23.4550691+08:00;True|2026-01-29T10:04:05.4236307+08:00;False|2026-01-29T10:03:18.4044168+08:00;True|2026-01-28T16:00:38.3698743+08:00;True|2026-01-28T14:15:04.1203132+08:00;True|2026-01-28T14:03:32.3230252+08:00;False|2026-01-28T14:02:41.6157812+08:00;True|2026-01-28T13:18:24.5590390+08:00;True|2026-01-28T13:10:49.5716734+08:00;True|2026-01-28T12:25:03.3201915+08:00;True|2026-01-28T12:24:37.6029904+08:00;True|2026-01-28T12:16:13.3862190+08:00;True|2026-01-28T11:43:57.8268938+08:00;True|2026-01-28T10:57:22.9246991+08:00;True|2026-01-28T10:49:34.6185686+08:00;True|2026-01-28T10:44:07.6308515+08:00;True|2026-01-28T10:36:00.0391721+08:00;True|2026-01-28T10:27:26.1658915+08:00;False|2026-01-28T10:27:00.5898601+08:00;True|2026-01-27T15:02:41.1819512+08:00;True|2026-01-27T14:55:32.3962262+08:00;True|2026-01-27T14:31:09.0105130+08:00;True|2026-01-27T13:19:08.8705541+08:00;True|2026-01-27T11:43:17.0109305+08:00;True|2026-01-27T10:53:13.5941761+08:00;True|2026-01-27T10:49:18.5740094+08:00;True|2026-01-27T10:43:29.4337654+08:00;True|2026-01-27T10:00:49.1779297+08:00;False|2026-01-27T10:00:34.2083888+08:00;True|2026-01-26T16:29:09.5100352+08:00;False|2026-01-26T16:29:04.6554601+08:00;False|2026-01-26T14:39:05.7640208+08:00;True|2026-01-26T09:57:23.8775907+08:00;False|2026-01-26T09:56:43.8599383+08:00;True|2026-01-26T09:37:16.8828589+08:00;False|2026-01-26T09:36:35.9597492+08:00;True|2026-01-25T15:20:11.0096169+08:00;True|2026-01-25T14:52:25.7167654+08:00;True|2026-01-25T14:28:16.6779637+08:00;False|2026-01-25T14:27:32.6753765+08:00;True|2026-01-23T16:17:17.9227805+08:00;True|2026-01-23T14:37:25.7929932+08:00;True|2026-01-23T14:32:25.7611106+08:00;False|2026-01-23T14:31:28.4811198+08:00;True|2026-01-22T09:55:07.0908298+08:00;True|2026-01-22T09:38:49.9102490+08:00;False|2026-01-22T09:37:53.0384929+08:00;True|2026-01-21T16:50:27.5625267+08:00;True|2026-01-21T10:50:18.7634322+08:00;True|2026-01-21T10:47:56.7913811+08:00;True|2026-01-21T10:41:46.5883817+08:00;True|2026-01-21T09:29:22.5824101+08:00;False|2026-01-21T09:28:13.4362586+08:00;True|2026-01-20T14:26:36.7806712+08:00;True|2026-01-20T13:13:01.3064754+08:00;False|2026-01-20T13:12:08.1800841+08:00;True|2026-01-20T10:28:19.5250951+08:00;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>03/24/2026 08:11:13</publishTime>
+ <publishTime>03/24/2026 21:53:17</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>03/24/2026 08:11:13</publishTime>
+ <publishTime>03/24/2026 21:53:17</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>03/24/2026 08:11:10</publishTime>
+ <publishTime>03/24/2026 21:53:15</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>03/24/2026 08:11:10</publishTime>
+ <publishTime>03/24/2026 21:53:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>03/24/2026 08:11:05</publishTime>
+ <publishTime>03/24/2026 21:53:09</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>03/24/2026 08:11:05</publishTime>
+ <publishTime>03/24/2026 21:53:09</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
@@ -125,6 +125,15 @@
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/Microsoft.IdentityModel.JsonWebTokens.dll">
+ <publishTime>11/21/2023 06:59:58</publishTime>
+ </File>
+ <File Include="bin/Microsoft.IdentityModel.Logging.dll">
+ <publishTime>11/21/2023 07:01:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.IdentityModel.Tokens.dll">
+ <publishTime>11/21/2023 07:08:26</publishTime>
+ </File>
<File Include="bin/Microsoft.Owin.Cors.dll">
<publishTime>01/19/2019 04:50:50</publishTime>
</File>
@@ -141,10 +150,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>03/24/2026 08:11:06</publishTime>
+ <publishTime>03/24/2026 21:53:10</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>03/24/2026 08:11:06</publishTime>
+ <publishTime>03/24/2026 21:53:10</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -180,34 +189,34 @@
<publishTime>11/13/2012 20:19:34</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>03/24/2026 08:11:03</publishTime>
+ <publishTime>03/24/2026 21:53:05</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>03/24/2026 08:11:03</publishTime>
+ <publishTime>03/24/2026 21:53:05</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>03/24/2026 08:11:04</publishTime>
+ <publishTime>03/24/2026 21:53:07</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>03/24/2026 08:11:04</publishTime>
+ <publishTime>03/24/2026 21:53:07</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>03/24/2026 08:11:04</publishTime>
+ <publishTime>03/24/2026 21:53:08</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>03/24/2026 08:11:04</publishTime>
+ <publishTime>03/24/2026 21:53:08</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>03/24/2026 08:09:06</publishTime>
+ <publishTime>03/24/2026 21:53:03</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>03/24/2026 08:09:06</publishTime>
+ <publishTime>03/24/2026 21:53:03</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -234,7 +243,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>11/21/2023 06:58:04</publishTime>
</File>
<File Include="bin/System.Memory.dll">
<publishTime>04/18/2019 00:24:34</publishTime>
@@ -321,22 +330,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>03/24/2026 08:09:10</publishTime>
+ <publishTime>03/24/2026 21:53:10</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>03/24/2026 08:09:10</publishTime>
+ <publishTime>03/24/2026 21:53:10</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>03/24/2026 08:11:23</publishTime>
+ <publishTime>03/24/2026 21:53:27</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/24/2026 08:11:23</publishTime>
+ <publishTime>03/24/2026 21:53:27</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>03/24/2026 08:11:37</publishTime>
+ <publishTime>03/24/2026 21:53:32</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -441,7 +450,7 @@
<publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>03/09/2026 01:47:32</publishTime>
+ <publishTime>03/24/2026 21:43:36</publishTime>
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
<publishTime>12/08/2025 16:05:47</publishTime>
@@ -561,7 +570,7 @@
<publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/23/2026 16:52:04</publishTime>
+ <publishTime>03/24/2026 21:53:33</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/JwtAuthorizeAttribute.cs b/WebAPI/Service/JwtAuthorizeAttribute.cs
new file mode 100644
index 0000000..d641d3b
--- /dev/null
+++ b/WebAPI/Service/JwtAuthorizeAttribute.cs
@@ -0,0 +1,76 @@
+锘縰sing System;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+using WebAPI.Utility;
+
+public class JwtAuthorizeAttribute : AuthorizationFilterAttribute
+{
+ // 鍚屾閴存潈
+ public override void OnAuthorization(HttpActionContext actionContext)
+ {
+ // 妫�鏌ュ尶鍚嶈闂�
+ if (IsAnonymousAllowed(actionContext)) return;
+
+ // 鑾峰彇Token
+ var token = GetTokenFromHeader(actionContext);
+ if (string.IsNullOrEmpty(token))
+ {
+ HandleUnauthorized(actionContext);
+ return;
+ }
+
+ // 楠岃瘉Token
+ var principal = JWTHelper.ValidateToken(token, "123");
+ if (principal == null)
+ {
+ HandleUnauthorized(actionContext);
+ return;
+ }
+
+ // 璁剧疆鐢ㄦ埛
+ actionContext.RequestContext.Principal = principal;
+ }
+
+ // 寮傛閴存潈锛堟弧瓒砏ebAPI 2瑕佹眰锛屽吋瀹�.NET4.5锛�
+ public override Task OnAuthorizationAsync(HttpActionContext actionContext, CancellationToken cancellationToken)
+ {
+ OnAuthorization(actionContext);
+
+ return Task.FromResult(0);
+ }
+
+ // 鏄惁鍏佽鍖垮悕璁块棶
+ private bool IsAnonymousAllowed(HttpActionContext context)
+ {
+ return
+ context.ActionDescriptor.GetCustomAttributes<AllowAnonymousAttribute>().Count > 0 ||
+ context.ControllerContext.ControllerDescriptor.GetCustomAttributes<AllowAnonymousAttribute>().Count > 0;
+ }
+
+ // 浠嶩eader鎻愬彇Token
+ private string GetTokenFromHeader(HttpActionContext context)
+ {
+ var authHeader = context.Request.Headers.Authorization;
+ if (authHeader != null
+ && authHeader.Scheme.Equals("Bearer", StringComparison.OrdinalIgnoreCase)
+ && !string.IsNullOrEmpty(authHeader.Parameter))
+ {
+ return authHeader.Parameter;
+ }
+ return null;
+ }
+
+ // 401 鏈巿鏉�
+ private void HandleUnauthorized(HttpActionContext context)
+ {
+ var response = new HttpResponseMessage(HttpStatusCode.Unauthorized);
+ response.Content = new StringContent("鏈巿鏉冿紝璇风櫥褰曞悗閲嶈瘯");
+ context.Response = response;
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Utility/JWTHelper.cs b/WebAPI/Utility/JWTHelper.cs
new file mode 100644
index 0000000..824a5b9
--- /dev/null
+++ b/WebAPI/Utility/JWTHelper.cs
@@ -0,0 +1,79 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+using Microsoft.IdentityModel.Tokens;
+
+namespace WebAPI.Utility
+{
+ public static class JWTHelper
+ {
+ static JWTHelper()
+ {
+ JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+ }
+
+ // 绉橀挜
+ private const string SecretKey = "8sK2pR9vFg5tHjNm7qWaEe4dUcxZbL$S6y";
+ private static readonly SymmetricSecurityKey _securityKey =
+ new SymmetricSecurityKey(Encoding.UTF8.GetBytes(SecretKey));
+
+ // 绛惧彂 Token
+ public static string GenerateToken(string userId, string userName, string HCampanyName)
+ {
+ var claims = new[]
+ {
+ new Claim(ClaimTypes.NameIdentifier, userId),
+ new Claim(ClaimTypes.Name, userName),
+ new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
+ };
+
+ var credentials = new SigningCredentials(_securityKey, SecurityAlgorithms.HmacSha256);
+
+ var token = new JwtSecurityToken(
+ issuer: "zjzyms",
+ audience: HCampanyName,
+ claims: claims,
+ expires: DateTime.UtcNow.AddHours(2), // 涓ゅ皬鏃惰繃鏈熸椂闂�
+ signingCredentials: credentials
+ );
+
+ return new JwtSecurityTokenHandler().WriteToken(token);
+ }
+
+ // 楠岃瘉 Token 骞惰繑鍥� ClaimsPrincipal
+ public static ClaimsPrincipal ValidateToken(string token, string HCampanyName)
+ {
+ var handler = new JwtSecurityTokenHandler();
+
+ var parameters = new TokenValidationParameters
+ {
+ ValidateIssuer = true,
+ ValidIssuer = "zjzyms",
+
+ ValidateAudience = true,
+ ValidAudience = HCampanyName,
+
+ ValidateIssuerSigningKey = true,
+ IssuerSigningKey = _securityKey,
+
+ ValidateLifetime = true,
+ ClockSkew = TimeSpan.Zero, // 涓嶅厑璁告椂闂磋宸�
+ };
+
+
+ try
+ {
+ var principal = handler.ValidateToken(token, parameters, out var validatedToken);
+ return principal;
+ }
+ catch
+ {
+ return null;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index ee22133..e3050b4 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -109,6 +109,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index f253dc2..8ebef0a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -123,6 +123,15 @@
<Reference Include="Microsoft.CSharp">
<Private>True</Private>
</Reference>
+ <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.5.7.0\lib\net45\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.IdentityModel.Logging, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.IdentityModel.Logging.5.7.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.IdentityModel.Tokens.5.7.0\lib\net45\Microsoft.IdentityModel.Tokens.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
@@ -171,9 +180,8 @@
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
- <Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.7.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
@@ -1233,6 +1241,7 @@
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="Service\GeTuiService.cs" />
+ <Compile Include="Service\JwtAuthorizeAttribute.cs" />
<Compile Include="Service\LuBaoSevice.cs" />
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
@@ -1240,6 +1249,7 @@
<Compile Include="Utility\Barcode.ashx.cs">
<DependentUpon>Barcode.ashx</DependentUpon>
</Compile>
+ <Compile Include="Utility\JWTHelper.cs" />
<Compile Include="Utility\ServerTools.cs" />
<Compile Include="Utility\Util.cs" />
<Compile Include="Code\Common.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 342ebe2..93f8b1e 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
- <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -12,8 +12,9 @@
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index 34d8a69..1cdeeca 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -42,6 +42,9 @@
<package id="Microsoft.Azure.AppService.ApiApps.Service" version="0.9.16" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+ <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.7.0" targetFramework="net45" />
+ <package id="Microsoft.IdentityModel.Logging" version="5.7.0" targetFramework="net45" />
+ <package id="Microsoft.IdentityModel.Tokens" version="5.7.0" targetFramework="net45" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net45" />
@@ -62,7 +65,7 @@
<package id="Swashbuckle" version="5.0.0" targetFramework="net45" />
<package id="Swashbuckle.Core" version="5.0.0" targetFramework="net45" />
<package id="System.Buffers" version="4.4.0" targetFramework="net45" />
- <package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
+ <package id="System.IdentityModel.Tokens.Jwt" version="5.7.0" targetFramework="net45" />
<package id="System.Memory" version="4.5.3" targetFramework="net45" />
<package id="System.Runtime" version="4.3.1" targetFramework="net45" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" />
diff --git a/WorkM/app.config b/WorkM/app.config
index 446b5b6..88d19fc 100644
--- a/WorkM/app.config
+++ b/WorkM/app.config
@@ -30,6 +30,10 @@
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 4eb52f9..88fb271 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 125f375..368312d 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 53155c2..558f09b 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index 0747fdf..13a2d17 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 054e86e..f6c481e 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 843bacb..cdbf68a 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,41 +1,6 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-<<<<<<< HEAD
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-=======
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-=======
->>>>>>> c83104067c8f52426a3dd1da2af3466b44fea7af
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-=======
->>>>>>> 450d6ca292427262638ceb63bcfd9eb57b91c4a5
->>>>>>> 89c2f64be31944048225dbfd5afd53ca09660e6c
-=======
->>>>>>> c83104067c8f52426a3dd1da2af3466b44fea7af
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 4eb52f9..88fb271 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 125f375..368312d 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f6c481e
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..0312216
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index 452f14a..f67032a 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,6 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index 53155c2..558f09b 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index 0747fdf..13a2d17 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1