From 07968530fd2a7c0d818adc8a89c96a9499dbbee6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 19 一月 2026 16:17:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/bin/x86/Release/DAL.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.dll | 0
WebAPI/WebAPI.csproj.user | 6
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/SQLHelper.pdb | 0
DBUtility/bin/x86/Release/DBUtility.pdb | 0
WebAPI/DLL/GetuiServerApiSDK.dll | 0
DBUtility/bin/Release/Pub_Class.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Control.pdb | 0
Model/物流管理/ClsPay_WayBillPaymentBillMain.cs | 24
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
WebAPI/Service/GeTuiService.cs | 172 ++
Model/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml | 8
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/bin/x86/Release/Pub_Control.dll | 0
Model/obj/Release/Model.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs | 22
BLL/bin/Release/BLL.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/bin/Release/Pub_Control.dll | 0
Model/bin/x86/Release/Pub_Control.pdb | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
BLL/bin/x86/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/SQLHelper.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/ListModels.cs | 23
Model/bin/x86/Release/SQLHelper.pdb | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
Model/bin/x86/Release/SQLHelper.dll | 0
WebAPI/WebAPI.csproj | 10
BLL/bin/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/Model.dll | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
Model/bin/x86/Release/Model.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.pdb | 0
Model/Model.csproj | 2
Model/bin/x86/Release/Model.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs | 21
BLL/bin/Release/Pub_Control.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 8
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs | 23
BLL/bin/Release/DBUtility.dll | 0
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml | 4
DAL/bin/x86/Release/Pub_Class.pdb | 0
BLL/bin/Release/BLL.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DAL/bin/x86/Release/Pub_Class.dll | 0
WebAPI/Controllers/物流管理/运单费用结算单/Pay_WayBillPaymentBillController.cs | 953 +++++++++++++++
BLL/bin/x86/Release/Model.pdb | 0
BLL/bin/x86/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
BLL/bin/x86/Release/DAL.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
Model/物流管理/ClsPay_WayBillPaymentBillSub.cs | 20
SQLHelper/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/Release/SQLHelper.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/x86/Release/Pub_Class.dll | 0
Model/bin/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/TopSdk.dll | 0
BLL/bin/Release/Pub_Class.pdb | 0
DBUtility/bin/x86/Release/DBUtility.dll | 0
BLL/bin/x86/Release/DAL.pdb | 0
BLL/bin/x86/Release/TopSdk.pdb | 0
WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs | 4
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
BLL/bin/x86/Release/BLL.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/DBUtility.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/QC_ManagementController.cs | 8
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
BLL/bin/x86/Release/BLL.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs | 19
Model/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BLL/bin/Release/Model.dll | 0
WebAPI/WebServer.cs | 1
BLL/bin/Release/DAL.pdb | 0
DAL/bin/x86/Release/Model.dll | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
BLL/bin/x86/Release/Pub_Class.pdb | 0
DAL/bin/Release/Model.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
DBUtility/bin/x86/Release/Pub_Class.dll | 0
WebAPI/Controllers/WebAPIController.cs | 62
BLL/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
DAL/bin/x86/Release/Model.pdb | 0
WebAPI/DLL/GetuiServerApiSDK.dll.config | 72 +
Model/obj/x86/Release/Model.dll | 0
Model/bin/x86/Release/Pub_Class.dll | 0
DAL/DAL.csproj | 1
BLL/bin/x86/Release/DBUtility.pdb | 0
DAL/bin/x86/Release/DBUtility.pdb | 0
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user | 507 ++++++++
Model/obj/x86/Release/Model.pdb | 0
DAL/bin/x86/Release/SQLHelper.dll | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
Model/bin/x86/Release/DBUtility.dll | 0
DBUtility/bin/x86/Release/Pub_Control.pdb | 0
DBUtility/bin/x86/Release/SQLHelper.pdb | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/LMESController.cs | 244 +++
Pub_Class/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/x86/Release/SQLHelper.pdb | 0
DAL/bin/x86/Release/Pub_Control.pdb | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/bin/x86/Release/DBUtility.pdb | 0
WebAPI/Global.asax.cs | 4
DBUtility/bin/x86/Release/Pub_Control.dll | 0
DBUtility/bin/x86/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
WebAPI/Service/WebSocketServer.cs | 68 +
DAL/bin/x86/Release/SQLHelper.pdb | 0
WebAPI/DLL/Google.ProtocolBuffers.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 2
Model/bin/Release/Model.pdb | 0
Pub_Control/bin/x86/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
/dev/null | 513 --------
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user | 55
WebAPI/Controllers/Sc_ProcessMangementController.cs | 139 +-
DAL/ClsPay_WayBillPaymentBill.cs | 236 +++
Pub_Control/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/DAL.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user | 513 ++++++++
164 files changed, 3,088 insertions(+), 656 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 6a55dc8..53b03bb 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 99d15d4..8827a35 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 3ca5fc8..a0043c8 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 9b59895..398e8fa 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 d9483c5..ac259d8 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 6307b7c..d7c8892 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 629d286..dc4633d 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 3fca81a..274b62c 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 2dd7e2a..ae40207 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 11a0d39..2b13845 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 651b3d3..f5aa922 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 de27dcd..b6c5889 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 3a48716..0cbfe1a 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 0731b1a..6471d2c 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.dll b/BLL/bin/x86/Release/BLL.dll
index 1af5425..69dc4b4 100644
--- a/BLL/bin/x86/Release/BLL.dll
+++ b/BLL/bin/x86/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.pdb b/BLL/bin/x86/Release/BLL.pdb
index 50ce288..07587a0 100644
--- a/BLL/bin/x86/Release/BLL.pdb
+++ b/BLL/bin/x86/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.dll b/BLL/bin/x86/Release/DAL.dll
index 165a207..b6e3b81 100644
--- a/BLL/bin/x86/Release/DAL.dll
+++ b/BLL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.pdb b/BLL/bin/x86/Release/DAL.pdb
index b121e0f..e7723c9 100644
--- a/BLL/bin/x86/Release/DAL.pdb
+++ b/BLL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.dll b/BLL/bin/x86/Release/DBUtility.dll
index 98ff5c4..098ef5a 100644
--- a/BLL/bin/x86/Release/DBUtility.dll
+++ b/BLL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.pdb b/BLL/bin/x86/Release/DBUtility.pdb
index 4819252..a09c728 100644
--- a/BLL/bin/x86/Release/DBUtility.pdb
+++ b/BLL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.dll b/BLL/bin/x86/Release/Model.dll
index 57dc2d9..59c8dbb 100644
--- a/BLL/bin/x86/Release/Model.dll
+++ b/BLL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.pdb b/BLL/bin/x86/Release/Model.pdb
index dfb690c..e86266b 100644
--- a/BLL/bin/x86/Release/Model.pdb
+++ b/BLL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.dll b/BLL/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/BLL/bin/x86/Release/Pub_Class.dll
+++ b/BLL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.pdb b/BLL/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/BLL/bin/x86/Release/Pub_Class.pdb
+++ b/BLL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.dll b/BLL/bin/x86/Release/Pub_Control.dll
index 1c67a17..dc592f2 100644
--- a/BLL/bin/x86/Release/Pub_Control.dll
+++ b/BLL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.pdb b/BLL/bin/x86/Release/Pub_Control.pdb
index 83e88a2..9f87e14 100644
--- a/BLL/bin/x86/Release/Pub_Control.pdb
+++ b/BLL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.dll b/BLL/bin/x86/Release/SQLHelper.dll
index fca9a36..61fbf4e 100644
--- a/BLL/bin/x86/Release/SQLHelper.dll
+++ b/BLL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.pdb b/BLL/bin/x86/Release/SQLHelper.pdb
index 2c3aa54..e1bee30 100644
--- a/BLL/bin/x86/Release/SQLHelper.pdb
+++ b/BLL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.dll b/BLL/bin/x86/Release/TopSdk.dll
index b928efb..3670ccb 100644
--- a/BLL/bin/x86/Release/TopSdk.dll
+++ b/BLL/bin/x86/Release/TopSdk.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.pdb b/BLL/bin/x86/Release/TopSdk.pdb
index 5c1f31e..3127ab1 100644
--- a/BLL/bin/x86/Release/TopSdk.pdb
+++ b/BLL/bin/x86/Release/TopSdk.pdb
Binary files differ
diff --git a/DAL/ClsPay_WayBillPaymentBill.cs b/DAL/ClsPay_WayBillPaymentBill.cs
new file mode 100644
index 0000000..7c6f6b0
--- /dev/null
+++ b/DAL/ClsPay_WayBillPaymentBill.cs
@@ -0,0 +1,236 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsPay_WayBillPaymentBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsPay_WayBillPaymentBillMain omodel = new Model.ClsPay_WayBillPaymentBillMain();
+ public List<Model.ClsPay_WayBillPaymentBillSub> DetailColl = new List<Model.ClsPay_WayBillPaymentBillSub>();
+
+ public ClsPay_WayBillPaymentBill()
+ {
+ base.MvarItemKeySub = "Pay_WayBillPaymentBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Pay_WayBillPaymentBillMain";
+ base.MvarReportTitle = "杩愬崟璐圭敤缁撶畻鍗�";
+ base.BillType = "2102";
+ base.HBillSubType = "2102";
+
+ }
+
+ #region 鍥哄畾浠g爜
+
+ ~ClsPay_WayBillPaymentBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Pay_WayBillPaymentBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HCarrierID=" + omodel.HCarrierID.ToString() +
+ ",HCurID=" + omodel.HCurID.ToString() +
+ ",HExRate=" + omodel.HExRate.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsPay_WayBillPaymentBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Pay_WayBillPaymentBillSub" +
+ "" +
+ "" +
+ "" +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HBeginAddr,HEndAddr,HTransType,HMoney,HRemark) " +
+ " values(" +
+ "" + lngBillKey.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HBeginAddr +
+ "','" + oSub.HEndAddr +
+ "','" + oSub.HTransType +
+ "','" + oSub.HMoney +
+ "','" + oSub.HRemark +
+ "')";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Pay_WayBillPaymentBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HCarrierID,HCurID,HExRate" +
+ ",HDeptID,HEmpID,HOrgID" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + omodel.HCarrierID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
+ ", '" + omodel.HDeptID.ToString() + "','" + omodel.HEmpID.ToString()+ "','" + omodel.HOrgID + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsPay_WayBillPaymentBillSub oSub in DetailColl)
+ {
+ string subSql = "insert into Pay_WayBillPaymentBillSub" +
+ "" +
+ "" +
+ "" +
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HBeginAddr,HEndAddr,HTransType,HMoney,HRemark) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HBeginAddr +
+ "','" + oSub.HEndAddr +
+ "','" + oSub.HTransType +
+ "','" + oSub.HMoney +
+ "','" + oSub.HRemark +
+ "')";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Pay_WayBillPaymentBillMain Where HInterID=" + lngBillKey.ToString(), "Pay_WayBillPaymentBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+
+ omodel.HCarrierID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCarrierID"]);
+ omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
+ omodel.HExRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HExRate"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ //
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Pay_WayBillPaymentBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Pay_WayBillPaymentBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsPay_WayBillPaymentBillSub oSub = new Model.ClsPay_WayBillPaymentBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 3e613d5..5758b6f 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -81,6 +81,7 @@
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
<Compile Include="ClsGy_MaterialPackingRelation.cs" />
+ <Compile Include="ClsPay_WayBillPaymentBill.cs" />
<Compile Include="ClsWL_YayBillMain.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 3ca5fc8..a0043c8 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 9b59895..398e8fa 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 d9483c5..ac259d8 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 6307b7c..d7c8892 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 629d286..dc4633d 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 3fca81a..274b62c 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 2dd7e2a..ae40207 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 11a0d39..2b13845 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 651b3d3..f5aa922 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 de27dcd..b6c5889 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 3a48716..0cbfe1a 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 0731b1a..6471d2c 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.dll b/DAL/bin/x86/Release/DAL.dll
index 165a207..b6e3b81 100644
--- a/DAL/bin/x86/Release/DAL.dll
+++ b/DAL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.pdb b/DAL/bin/x86/Release/DAL.pdb
index b121e0f..e7723c9 100644
--- a/DAL/bin/x86/Release/DAL.pdb
+++ b/DAL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.dll b/DAL/bin/x86/Release/DBUtility.dll
index 98ff5c4..098ef5a 100644
--- a/DAL/bin/x86/Release/DBUtility.dll
+++ b/DAL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.pdb b/DAL/bin/x86/Release/DBUtility.pdb
index 4819252..a09c728 100644
--- a/DAL/bin/x86/Release/DBUtility.pdb
+++ b/DAL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.dll b/DAL/bin/x86/Release/Model.dll
index 57dc2d9..59c8dbb 100644
--- a/DAL/bin/x86/Release/Model.dll
+++ b/DAL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.pdb b/DAL/bin/x86/Release/Model.pdb
index dfb690c..e86266b 100644
--- a/DAL/bin/x86/Release/Model.pdb
+++ b/DAL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.dll b/DAL/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/DAL/bin/x86/Release/Pub_Class.dll
+++ b/DAL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.pdb b/DAL/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/DAL/bin/x86/Release/Pub_Class.pdb
+++ b/DAL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.dll b/DAL/bin/x86/Release/Pub_Control.dll
index 1c67a17..dc592f2 100644
--- a/DAL/bin/x86/Release/Pub_Control.dll
+++ b/DAL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.pdb b/DAL/bin/x86/Release/Pub_Control.pdb
index 83e88a2..9f87e14 100644
--- a/DAL/bin/x86/Release/Pub_Control.pdb
+++ b/DAL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.dll b/DAL/bin/x86/Release/SQLHelper.dll
index fca9a36..61fbf4e 100644
--- a/DAL/bin/x86/Release/SQLHelper.dll
+++ b/DAL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.pdb b/DAL/bin/x86/Release/SQLHelper.pdb
index 2c3aa54..e1bee30 100644
--- a/DAL/bin/x86/Release/SQLHelper.pdb
+++ b/DAL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index d9483c5..ac259d8 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 6307b7c..d7c8892 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 2dd7e2a..ae40207 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 11a0d39..2b13845 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 651b3d3..f5aa922 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 de27dcd..b6c5889 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 3a48716..0cbfe1a 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 0731b1a..6471d2c 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.dll b/DBUtility/bin/x86/Release/DBUtility.dll
index 98ff5c4..098ef5a 100644
--- a/DBUtility/bin/x86/Release/DBUtility.dll
+++ b/DBUtility/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.pdb b/DBUtility/bin/x86/Release/DBUtility.pdb
index 4819252..a09c728 100644
--- a/DBUtility/bin/x86/Release/DBUtility.pdb
+++ b/DBUtility/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.dll b/DBUtility/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.dll
+++ b/DBUtility/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.pdb b/DBUtility/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.dll b/DBUtility/bin/x86/Release/Pub_Control.dll
index 1c67a17..dc592f2 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.dll
+++ b/DBUtility/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.pdb b/DBUtility/bin/x86/Release/Pub_Control.pdb
index 83e88a2..9f87e14 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.dll b/DBUtility/bin/x86/Release/SQLHelper.dll
index fca9a36..61fbf4e 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.dll
+++ b/DBUtility/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.pdb b/DBUtility/bin/x86/Release/SQLHelper.pdb
index 2c3aa54..e1bee30 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.pdb
+++ b/DBUtility/bin/x86/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 3b702be..e4039ac 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 4a5eb9d..1036549 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.dll b/DBUtility/obj/Release/DBUtility.dll
index d9483c5..ac259d8 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 6307b7c..d7c8892 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index 8b6f430..cd05dcb 100644
--- a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 06e2e92..859cbb0 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -126,6 +126,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairCheckClass_Model.cs" />
<Compile Include="鐗╂祦绠$悊\ClsCg_CarTrajectoryBillMain.cs" />
<Compile Include="鐗╂祦绠$悊\ClsCg_CarTrajectoryBillSub.cs" />
+ <Compile Include="鐗╂祦绠$悊\ClsPay_WayBillPaymentBillMain.cs" />
+ <Compile Include="鐗╂祦绠$悊\ClsPay_WayBillPaymentBillSub.cs" />
<Compile Include="鐗╂祦绠$悊\ClsWL_YayBillMainBillSub.cs" />
<Compile Include="鐗╂祦绠$悊\ClsWL_YayBillMainBillMain.cs" />
<Compile Include="鐢熶骇绠$悊\ClsSc_ShiftsBeginInfoBillMain.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index d9483c5..ac259d8 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 6307b7c..d7c8892 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 629d286..dc4633d 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 3fca81a..274b62c 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 2dd7e2a..ae40207 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 11a0d39..2b13845 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 651b3d3..f5aa922 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 de27dcd..b6c5889 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 3a48716..0cbfe1a 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 0731b1a..6471d2c 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.dll b/Model/bin/x86/Release/DBUtility.dll
index 98ff5c4..098ef5a 100644
--- a/Model/bin/x86/Release/DBUtility.dll
+++ b/Model/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.pdb b/Model/bin/x86/Release/DBUtility.pdb
index 4819252..a09c728 100644
--- a/Model/bin/x86/Release/DBUtility.pdb
+++ b/Model/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Model.dll b/Model/bin/x86/Release/Model.dll
index 57dc2d9..59c8dbb 100644
--- a/Model/bin/x86/Release/Model.dll
+++ b/Model/bin/x86/Release/Model.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Model.pdb b/Model/bin/x86/Release/Model.pdb
index dfb690c..e86266b 100644
--- a/Model/bin/x86/Release/Model.pdb
+++ b/Model/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.dll b/Model/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/Model/bin/x86/Release/Pub_Class.dll
+++ b/Model/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.pdb b/Model/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/Model/bin/x86/Release/Pub_Class.pdb
+++ b/Model/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.dll b/Model/bin/x86/Release/Pub_Control.dll
index 1c67a17..dc592f2 100644
--- a/Model/bin/x86/Release/Pub_Control.dll
+++ b/Model/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.pdb b/Model/bin/x86/Release/Pub_Control.pdb
index 83e88a2..9f87e14 100644
--- a/Model/bin/x86/Release/Pub_Control.pdb
+++ b/Model/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.dll b/Model/bin/x86/Release/SQLHelper.dll
index fca9a36..61fbf4e 100644
--- a/Model/bin/x86/Release/SQLHelper.dll
+++ b/Model/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.pdb b/Model/bin/x86/Release/SQLHelper.pdb
index 2c3aa54..e1bee30 100644
--- a/Model/bin/x86/Release/SQLHelper.pdb
+++ b/Model/bin/x86/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 1db1d90..8602bb8 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 629d286..dc4633d 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 3fca81a..274b62c 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 399b218..f75a5a5 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.dll b/Model/obj/x86/Release/Model.dll
index 57dc2d9..59c8dbb 100644
--- a/Model/obj/x86/Release/Model.dll
+++ b/Model/obj/x86/Release/Model.dll
Binary files differ
diff --git a/Model/obj/x86/Release/Model.pdb b/Model/obj/x86/Release/Model.pdb
index dfb690c..e86266b 100644
--- a/Model/obj/x86/Release/Model.pdb
+++ b/Model/obj/x86/Release/Model.pdb
Binary files differ
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsPay_WayBillPaymentBillMain.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsPay_WayBillPaymentBillMain.cs"
new file mode 100644
index 0000000..caaa2ff
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsPay_WayBillPaymentBillMain.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsPay_WayBillPaymentBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public DateTime HAccDate;// datetime //鏀舵鏃ユ湡
+ public Int64 HCarrierID;// int //渚涘簲鍟嗭紙gy_supplier锛�
+ public Int64 HCurID;// int //甯佸埆
+ public Single HExRate;// money //姹囩巼锛堥�夊竵鍒甫鍑猴級
+ public Int64 HDeptID;// int //閮ㄩ棬
+ public Int64 HEmpID;// int //缁忔墜浜�
+ public Int64 HProjectMoneyID;// int //璐圭敤椤圭洰
+ public string HType;// varchar(20) --鍙戠エ绫诲瀷
+ public double HMoney;// dec(18,8) //鍗曟嵁閲戦
+ public double HTaxRate;// dec(18,8) //绋庣巼
+ public double HSumMoney;// dec(18,8) //鎬婚噾棰�
+ public string HExplanation;// varchar(200) --鎽樿
+ public string HInnerBillNo;// varchar(100) --鍐呴儴鍗曟嵁鍙�
+ public Int64 HOrgID; //缁勭粐
+ }
+}
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsPay_WayBillPaymentBillSub.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsPay_WayBillPaymentBillSub.cs"
new file mode 100644
index 0000000..e9668f6
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsPay_WayBillPaymentBillSub.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsPay_WayBillPaymentBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --琛屽叧闂� (榛樿涓�'') new
+ public string HRemark;// varchar(200) --澶囨敞
+ public Int64 HProjectMoneyID;// int //璐圭敤椤圭洰
+ public string HTypeSub;// varchar(20) --鍙戠エ绫诲瀷
+ public double HMoney;// dec(18,8) //鍗曟嵁閲戦
+ public double HTaxRate;// dec(18,8) //绋庣巼
+ public double HSumMoney;// dec(18,8) //鎬婚噾棰�
+ public int HBeginAddr;// dec(18,8) //鎬婚噾棰�
+ public int HEndAddr;// dec(18,8) //鎬婚噾棰�
+ public string HTransType;// dec(18,8) //鎬婚噾棰�
+ }
+}
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 2dd7e2a..ae40207 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 11a0d39..2b13845 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/x86/Release/Pub_Class.dll b/Pub_Class/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Class/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.pdb b/Pub_Class/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 2dd7e2a..ae40207 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 11a0d39..2b13845 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 651b3d3..f5aa922 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 de27dcd..b6c5889 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.dll b/Pub_Control/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.pdb b/Pub_Control/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.dll b/Pub_Control/bin/x86/Release/Pub_Control.dll
index 1c67a17..dc592f2 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.pdb b/Pub_Control/bin/x86/Release/Pub_Control.pdb
index 83e88a2..9f87e14 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 2dd7e2a..ae40207 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 11a0d39..2b13845 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 3a48716..0cbfe1a 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 0731b1a..6471d2c 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.dll b/SQLHelper/bin/x86/Release/Pub_Class.dll
index ee7be14..4a5063c 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.dll
+++ b/SQLHelper/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.pdb b/SQLHelper/bin/x86/Release/Pub_Class.pdb
index 109b7d4..b5eea24 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.dll b/SQLHelper/bin/x86/Release/SQLHelper.dll
index fca9a36..61fbf4e 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.dll
+++ b/SQLHelper/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.pdb b/SQLHelper/bin/x86/Release/SQLHelper.pdb
index 2c3aa54..e1bee30 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/x86/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 39a9964..15c5f69 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 3a48716..0cbfe1a 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 0731b1a..6471d2c 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
index 167dcea..2024c0d 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.dll b/SQLHelper/obj/x86/Release/SQLHelper.dll
index fca9a36..61fbf4e 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.dll
+++ b/SQLHelper/obj/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.pdb b/SQLHelper/obj/x86/Release/SQLHelper.pdb
index 2c3aa54..e1bee30 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs b/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
index 4ed2894..09b41a7 100644
--- a/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
+++ b/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
@@ -539,8 +539,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
objJsonResult.data = ds?.Tables[0] ?? new DataTable();
objJsonResult.list = columnNameList;
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 08cc8c6..a633d9e 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -10,6 +10,8 @@
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;
+using System.Web;
+using System.IO;
namespace WebAPI.Controllers
{
public class LMESController : ApiController
@@ -22,7 +24,7 @@
public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
//鑷畾涔�34杩涘埗鏁扮粍
private static char[] lNCode = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' };
-
+ string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
/// <summary>
@@ -5107,5 +5109,245 @@
}
}
#endregion
+
+ #region 鍙嶅鏍告剰瑙佹彁浜�
+ [Route("LMES/AuditFlowOpinion")]
+ [HttpGet]
+ public json AuditFlowOpinion(string sWhere,string billType,int HInterID, int type, string user)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn($"exec h_p_Xt_AuditFlowOpinion '','{billType}',{HInterID},{type},'{user}'", "h_p_Xt_AuditFlowOpinion");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+ ds = oCN.RunProcReturn($"exec h_p_Xt_AuditFlowOpinion '{sWhere}','{billType}',{HInterID},{type},'{user}'", "h_p_Xt_AuditFlowOpinion");
+ }
+
+ 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() == "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告剰瑙佹彁浜ゅけ璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = 1;
+ res.Message = "Sucess锛�";
+ res.data = ds.Tables[0].Rows[0]["HRemark"];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ #region app鏂囦欢涓婁紶閫氱敤鎺ュ彛
+ [Route("LMES/UploadFile")]
+ [HttpPost]
+ public object UploadFile()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/APPFolder/" + HBillNo);
+ //string path = @"D:\\Files\\"+ HBillNo;
+ dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ DataSet ds = new DataSet();
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/APPFolder/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/APPFolder/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁鍙锋煡鎵句笂浼犳枃浠跺垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("LMES/Filelist")]
+ [HttpGet]
+ public object Filelist(string HBillNo)
+ {
+ DataSet ds = new DataSet();
+ var url = fileip + "/files/APPFolder/" + HBillNo + "/";
+ //@"C:\\files\\"
+ try
+ {
+ ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID,鍗曟嵁鍙�,鏂囦欢鍚� 鍒犻櫎鏂囦欢
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("LMES/DeleteFilelist")]
+ [HttpGet]
+ public object DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
+ {
+ try
+ {
+
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/EquipFolder/" + HSourceBillNo), HFileName);
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
index fdba6e0..d877a7d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldInRequestBillController.cs
@@ -353,27 +353,31 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
- FROM Sc_MouldInRequestBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ SELECT HBillStatus
+ FROM Sc_MouldInRequestBillMain
+ WHERE HInterID = {hmainid}";
DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
{
- int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
- if (hasAudit > 0)
+ int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
+
+ if (hBillStatus == 2)
{
return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
}
}
+ else
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁涓嶅瓨鍦紒" };
+ }
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
- UPDATE Sc_MouldInRequestBillMain
+ UPDATE Sc_MouldInRequestBillMain
SET HPackQtys = {newPallet}
WHERE HInterID = {hmainid}";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
index 6d28daa..ff7017c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOutRequestBillController.cs
@@ -503,6 +503,7 @@
#region 鍣ㄥ叿鍑哄簱鐢宠鍗� - 鎵樻暟鍙樻洿鍔熻兘
[Route("Sc_MouldOutRequestBillController/UpdatePallet")]
[HttpPost]
+
public object UpdatePallet([FromBody] JObject data)
{
try
@@ -517,24 +518,28 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
+ SELECT HBillStatus
FROM Sc_MouldOutRequestBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ WHERE HInterID = {hmainid}";
DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
{
- int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
- if (hasAudit > 0)
+ int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
+ // 鉁� 姝g‘鐨勫垽鏂細HBillStatus = 2 琛ㄧず宸插鏍�
+ if (hBillStatus == 2)
{
return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
}
}
+ else
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁涓嶅瓨鍦紒" };
+ }
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
UPDATE Sc_MouldOutRequestBillMain
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
index 56b38a8..c5f9787 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
@@ -398,6 +398,7 @@
#region 鍣ㄥ叿棰嗙敤閫�搴撳崟 - 鎵樻暟鍙樻洿鍔熻兘
[Route("Sc_MouldProdBackBillController/UpdatePallet")]
[HttpPost]
+
public object UpdatePallet([FromBody] JObject data)
{
try
@@ -412,27 +413,31 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
+ SELECT HBillStatus
FROM Sc_MouldStockBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ WHERE HInterID = {hmainid}";
DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
{
- int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
- if (hasAudit > 0)
+ int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
+
+ if (hBillStatus == 2)
{
return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
}
}
- // 鐩存帴鏇存柊鎵樻暟
+ else
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁涓嶅瓨鍦紒" };
+ }
+
+
string updateSql = $@"
- UPDATE Sc_MouldStockBillMain
+ UPDATE Sc_MouldStockBillMain
SET HPackQtys = {newPallet}
WHERE HInterID = {hmainid}";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
index 4038d9b..9e86f3a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
@@ -339,6 +339,7 @@
#region 鍣ㄥ叿棰嗙敤鍑哄簱鍗� - 鎵樻暟鍙樻洿鍔熻兘
[Route("Sc_MouldProdOutBill/UpdatePallet")]
[HttpPost]
+
public object UpdatePallet([FromBody] JObject data)
{
try
@@ -353,24 +354,28 @@
if (newPallet <= 0)
return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
- // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+
string checkAuditSql = $@"
- SELECT COUNT(*) as HasAudit
- FROM Sc_MouldStockBillMain
- WHERE HInterID = {hmainid}
- AND HChecker IS NOT NULL
- AND HCheckDate IS NOT NULL";
+ SELECT HBillStatus
+ FROM Sc_MouldStockBillMain
+ WHERE HInterID = {hmainid}";
DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
{
- int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
- if (hasAudit > 0)
+ int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
+
+ if (hBillStatus == 2)
{
return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
}
}
+ else
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁涓嶅瓨鍦紒" };
+ }
+
// 鐩存帴鏇存柊鎵樻暟
string updateSql = $@"
UPDATE Sc_MouldStockBillMain
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 82ca164..58d3d97 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1353,7 +1353,13 @@
{
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
DataSet ds;
- string sql = "select * from Gy_QCCheckProjectMain where HInterID = " + HInterID;
+ string sql;
+ if(HInterID=="0")
+ {
+ sql = "select top 1 * from Gy_QCCheckProjectMain order by HInterID desc";
+ }
+ else
+ sql = "select * from Gy_QCCheckProjectMain where HInterID = " + HInterID;
ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index d70ad5d..9631de6 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -13,8 +13,10 @@
using System.Threading.Tasks;
using System.Web.Http;
using WebAPI.Models;
+using WebAPI.Service;
using System.Threading;
using SyntacticSugar.constant;
+using WebApiWithFleck;
namespace WebAPI.Controllers.SCGL
{
@@ -7793,6 +7795,12 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 涓帹鏂瑰紡鎺ㄩ�佹暟鎹�
+ GeTuiService.PubishSingle(HInterID);
+
+ // webSocket鏂瑰紡鎺ㄩ�佹暟鎹�
+ // WebSocketServer.PushOne(HInterID);
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 24ff319..d1917d2 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1708,8 +1708,8 @@
return objJsonResult;
}
- if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- {
+ //if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ //{
string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1726,7 +1726,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- }
+ //}
@@ -1737,11 +1737,11 @@
model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
//model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //璐ㄦ閮ㄩ棬
-
- if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- {
+ LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);
+ // if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ // {
model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //璐ㄦ鍛�
- }
+ // }
model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝�
model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡
model.Add("FBillNo", HBillNo);
@@ -1861,83 +1861,84 @@
Ids = fID,
};
+
K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud");
// K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
+ // 閿﹂殕 浠呬繚鐣欐柊寤哄姛鑳�
+ //result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ //// result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
+ //if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ //{
+ //oCN.RollBack();
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
+ //else
+ //{
- result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
- // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
- if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
+ //DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList");
- DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList");
+ //for (var i = 0; i < ds1.Tables[0].Rows.Count; i++)
+ //{
+ //string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFileName"]);
+ //string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFilePath"]);
- for (var i = 0; i < ds1.Tables[0].Rows.Count; i++)
- {
- string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFileName"]);
- string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFilePath"]);
+ //string path = HFilePath;
+ //FileInfo fi = new FileInfo(path);
+ //long len = fi.Length;
+ //byte[] buffer = new byte[len];
+ //FileStream fs = new FileStream(path, FileMode.Open);
+ //fs.Read(buffer, 0, (int)len);
+ ////鏂囦欢IO娴�
+ //string a = Convert.ToBase64String(buffer);
- string path = HFilePath;
- FileInfo fi = new FileInfo(path);
- long len = fi.Length;
- byte[] buffer = new byte[len];
- FileStream fs = new FileStream(path, FileMode.Open);
- fs.Read(buffer, 0, (int)len);
- //鏂囦欢IO娴�
- string a = Convert.ToBase64String(buffer);
-
- //if(oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- //{
- ds = oCN.RunProcReturn("select * from JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
- //}
- //else
- //{
- // ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
- //}
+ ////if(oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ ////{
+ //ds = oCN.RunProcReturn("select * from JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
+ ////}
+ ////else
+ ////{
+ //// ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
+ ////}
- HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
+ //HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
- string jsonStr = "{" +
- " \"FileName\":\"" + HFileName + "\"," +
- " \"FormId\":\"QM_InspectBill\"," +
- " \"IsLast\":\"true\"," +
- " \"InterId\":\"" + HInterID + "\"," +
- " \"BillNo\":\"" + HBillNo + "\"," +
- " \"AliasFileName\":\"test\"," +
- " \"SendByte\":\"" + a + "\"" +
- "}";
- // 涓嬮潰鐨勬柟寮忛�傜敤浜� 閲戣澏浜� 8.0浠ヤ笂鐗堟湰
- string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
- LogService.Write("json:" + jsonStr);
- LogService.Write("_vlog:" + _vlog);
+ //string jsonStr = "{" +
+ //" \"FileName\":\"" + HFileName + "\"," +
+ //" \"FormId\":\"QM_InspectBill\"," +
+ //" \"IsLast\":\"true\"," +
+ //" \"InterId\":\"" + HInterID + "\"," +
+ //" \"BillNo\":\"" + HBillNo + "\"," +
+ //" \"AliasFileName\":\"test\"," +
+ //" \"SendByte\":\"" + a + "\"" +
+ //"}";
+ //// 涓嬮潰鐨勬柟寮忛�傜敤浜� 閲戣澏浜� 8.0浠ヤ笂鐗堟湰
+ //string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
+ //LogService.Write("json:" + jsonStr);
+ //LogService.Write("_vlog:" + _vlog);
- if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛岀収鐗囧悓姝ュけ璐�" + _vlog;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ //{
+ //oCN.RollBack();
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛岀収鐗囧悓姝ュけ璐�" + _vlog;
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
- // 涓嬮潰鐨勬柟寮忛�傜敤浜� 閲戣澏浜� 8.0浠ヤ笅鐗堟湰
- // var ret = client.AttachmentUpload(jsonStr);
- }
+ //// 涓嬮潰鐨勬柟寮忛�傜敤浜� 閲戣澏浜� 8.0浠ヤ笅鐗堟湰
+ //// var ret = client.AttachmentUpload(jsonStr);
+ //}
- }
+ //}
oCN.Commit();
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 8285d75..e83bff7 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -23175,5 +23175,67 @@
}
}
#endregion
+
+ #region 鐢ㄤ簬杩炴帴鐨勫仴搴峰害妫�楠岋紝鍙鑳借闂�氳繖涓帴鍙o紝鍒欒〃鏄庤繛鎺ュ彲鐢�
+ [Route("Health")]
+ [HttpGet]
+ public IHttpActionResult CheckHealth()
+ {
+ // 杩斿洖 200 鐘舵�佺爜 纭鍋ュ悍鐘舵��
+ return Ok();
+ }
+ #endregion
+
+ #region 鐧诲綍鐢ㄦ埛涓庤澶嘋lientID 鐨勫叧绯� 鍐欏叆鏁版嵁搴�
+ [Route("Web/SetGy_UserClientIdConnection")]
+ [HttpPost]
+ public object SetGy_UserClientIdConnection([FromBody] JObject msg)
+ {
+ DataSet ds;
+ oCN.BeginTran();
+ try
+ {
+ LogService.Write($@"exec h_p_SetGy_UserClientIdRelation
+ @HUserbm=N'{msg["HUserbm"].ToString()}',
+ @HUserName=N'{msg["HUserName"].ToString()}',
+ @HClientID=N'{msg["HClientID"].ToString()}',
+ @HOnline={msg["HOnline"].ToString()}
+ ", "h_p_SetGy_UserClientIdRelation");
+ ds = oCN.RunProcReturn($@"exec h_p_SetGy_UserClientIdRelation
+ @HUserbm=N'{msg["HUserbm"].ToString()}',
+ @HUserName=N'{msg["HUserName"].ToString()}',
+ @HClientID=N'{msg["HClientID"].ToString()}',
+ @HOnline={msg["HOnline"].ToString()}
+ ", "h_p_SetGy_UserClientIdRelation");
+
+ if(ds.Tables[0].Rows[0]["HStatus"].ToString() == "1")
+ {
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨璁惧淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨璁惧淇℃伅澶辫触锛�" + ds.Tables[0].Rows[0]["msg"];
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }catch(Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨璁惧淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs" "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
new file mode 100644
index 0000000..659d0ed
--- /dev/null
+++ "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\345\215\225\350\264\271\347\224\250\347\273\223\347\256\227\345\215\225/Pay_WayBillPaymentBillController.cs"
@@ -0,0 +1,953 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //搴斾粯缁撶畻鍗旵ontroller
+ public class Pay_WayBillPaymentBillController : ApiController
+ {
+ //鍏朵粬搴斾粯鍗�
+ //鑾峰彇绯荤粺鍙傛暟 YF_PayMentOtherBillMain YF_PayMentOtherBill
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsPay_WayBillPaymentBill BillOld = new DAL.ClsPay_WayBillPaymentBill();
+ public DAL.ClsPay_WayBillPaymentBill BillNew0 = new DAL.ClsPay_WayBillPaymentBill();
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillList")]
+ [HttpGet]
+ public object Pay_WayBillPaymentBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("YF_PayMentOtherBill_Qty", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Pay_WayBillPaymentBill order by 鍗曟嵁鍙� desc", "h_v_Pay_WayBillPaymentBill");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Pay_WayBillPaymentBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Pay_WayBillPaymentBill");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇濆瓨 鏂板/缂栬緫
+ [Route("Pay_WayBillPaymentBillController/saveBILL")]
+ [HttpPost]
+ public object saveBILL([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString(); //瀛愯〃
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string msg4 = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("YF_PayMentOtherBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsPay_WayBillPaymentBill oBill = new DAL.ClsPay_WayBillPaymentBill();
+ List<Model.ClsPay_WayBillPaymentBillMain> lsmain = new List<Model.ClsPay_WayBillPaymentBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Pay_WayBillPaymentBillMain(msg2);
+ foreach (Model.ClsPay_WayBillPaymentBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "2102";
+ oItem.HBillSubType = "2102";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsPay_WayBillPaymentBillSub> ls = new List<Model.ClsPay_WayBillPaymentBillSub>();
+ ls = oListModels.getObjectByJson_Pay_WayBillPaymentBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsPay_WayBillPaymentBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂栬緫椤甸潰鍒濆鍖�
+ [Route("Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillEditList")]
+ [HttpGet]
+ public object Pay_WayBillPaymentBillEditList(long HInterID)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+
+ ds = oCN.RunProcReturn("select * from h_v_Pay_WayBillPaymentBillEdit where HInterID= " + HInterID, "h_v_Pay_WayBillPaymentBillEdit");
+ tableList.Add(ds.Tables[0]);
+ //tableList.Add(ds.Tables[1]);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = tableList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_WayBillPaymentBillController/DeleteBillMain")]
+ [HttpGet]
+ public object DeleteBillMain(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("YF_PayMentOtherBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_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 YF_PayMentOtherBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from YF_PayMentOtherBillSub where HInterID= " + HInterID);
+
+ //鍒犻櫎鍚庢帶鍒�==================================================================================
+ string sql2 = "exec h_p_YF_PayMentOtherBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_YF_PayMentOtherBill_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 = "鍒犻櫎鎴愬姛";
+ 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 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Pay_WayBillPaymentBillController/AuditYF_PayMentOtherBillMain")]
+ [HttpGet]
+ public object AuditYF_PayMentOtherBillMain(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YF_PayMentOtherBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ 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();
+
+ //璁板綍杩斿洖淇℃伅
+ string msg = "";
+
+
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_YF_PayMentOtherBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_YF_PayMentOtherBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_YF_PayMentOtherBill_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ 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;
+ }
+ //===========================================================
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ 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;
+ }
+
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_YF_PayMentOtherBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ 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>
+ [Route("Pay_WayBillPaymentBillController/CloseYF_PayMentOtherBill")]
+ [HttpGet]
+ public object CloseYF_PayMentOtherBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YF_PayMentOtherBill_Close";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
+ if (IsAudit == 0) //鍏抽棴鎻愪氦
+ {
+ //鍏抽棴鎻愪氦
+ if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
+ /// <param name="CurUserName">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("YF_PayMentOtherBill/DeleteYF_PayMentOtherBill")]
+ [HttpGet]
+ public object DeleteYF_PayMentOtherBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "YF_PayMentOtherBill_Delete";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsYF_PayMentOtherBill oBill = new DAL.ClsYF_PayMentOtherBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //浣滃簾鍒ゆ柇
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶄綔搴熷垽鏂�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
+ if (IsAudit == 0) //浣滃簾鎻愪氦
+ {
+ //浣滃簾鎻愪氦
+ if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/GetuiServerApiSDK.dll b/WebAPI/DLL/GetuiServerApiSDK.dll
new file mode 100644
index 0000000..3d84f93
--- /dev/null
+++ b/WebAPI/DLL/GetuiServerApiSDK.dll
Binary files differ
diff --git a/WebAPI/DLL/GetuiServerApiSDK.dll.config b/WebAPI/DLL/GetuiServerApiSDK.dll.config
new file mode 100644
index 0000000..8a2a34c
--- /dev/null
+++ b/WebAPI/DLL/GetuiServerApiSDK.dll.config
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <configSections>
+ <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,
+ log4net-net-1.0"/>
+ </configSections>
+
+
+ <log4net>
+ <root>
+ <level value="ALL"/>
+ <appender-ref ref="RollingFileAppender-error"/>
+ <appender-ref ref="RollingFileAppender-debug"/>
+ <appender-ref ref="RollingFileAppender-info"/>
+ </root>
+
+
+ <appender name="RollingFileAppender-error" type="log4net.Appender.RollingFileAppender">
+ <file value="gt_error_" />
+ <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+ <datePattern value="yyyyMMdd".log"" />
+ <rollingStyle value="Date" />
+ <appendToFile value="true" />
+ <staticLogFileName value="false" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/>
+ </layout>
+ <filter type="log4net.Filter.LevelRangeFilter">
+ <param name="LevelMin" value="ERROR"/>
+ <param name="LevelMax" value="ERROR"/>
+ </filter>
+ </appender>
+
+ <appender name="RollingFileAppender-debug" type="log4net.Appender.RollingFileAppender">
+ <file value="gt_debug_" />
+ <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+ <datePattern value="yyyyMMdd".log"" />
+ <rollingStyle value="Date" />
+ <appendToFile value="true" />
+ <staticLogFileName value="false" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/>
+ </layout>
+ <filter type="log4net.Filter.LevelRangeFilter">
+ <param name="LevelMin" value="DEBUG"/>
+ <param name="LevelMax" value="DEBUG"/>
+ </filter>
+ </appender>
+
+ <appender name="RollingFileAppender-info" type="log4net.Appender.RollingFileAppender">
+ <file value="gt_info_" />
+ <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+ <datePattern value="yyyyMMdd".log"" />
+ <rollingStyle value="Date" />
+ <appendToFile value="true" />
+ <staticLogFileName value="false" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/>
+ </layout>
+ <filter type="log4net.Filter.LevelRangeFilter">
+ <param name="LevelMin" value="INFO"/>
+ <param name="LevelMax" value="INFO"/>
+ </filter>
+ </appender>
+
+
+ </log4net>
+ <startup>
+
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+ </startup>
+</configuration>
diff --git a/WebAPI/DLL/Google.ProtocolBuffers.dll b/WebAPI/DLL/Google.ProtocolBuffers.dll
new file mode 100644
index 0000000..bf6cc70
--- /dev/null
+++ b/WebAPI/DLL/Google.ProtocolBuffers.dll
Binary files differ
diff --git a/WebAPI/Global.asax.cs b/WebAPI/Global.asax.cs
index 54ba068..63026da 100644
--- a/WebAPI/Global.asax.cs
+++ b/WebAPI/Global.asax.cs
@@ -12,14 +12,14 @@
protected void Application_Start()
{
// webSocket 鏈嶅姟
- WebSocketServer.Start();
+ // WebSocketServer.Start();
GlobalConfiguration.Configure(WebApiConfig.Register);
}
// 搴旂敤鍏抽棴鏃讹紝鍋滄鏈嶅姟锛岄槻姝㈡硠闇�
protected void Application_End()
{
- WebSocketServer.Stop();
+ // WebSocketServer.Stop();
}
}
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d9d4662..f23da1f 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -2015,6 +2015,29 @@
List<Model.ClsYF_PayMentOtherBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYF_PayMentOtherBillSub>>(jsonString);
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板缁撶畻搴斾粯鍗曡〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPay_WayBillPaymentBillMain> getObjectByJson_Pay_WayBillPaymentBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPay_WayBillPaymentBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WayBillPaymentBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板缁撶畻瀛愯〃鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPay_WayBillPaymentBillSub> getObjectByJson_Pay_WayBillPaymentBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPay_WayBillPaymentBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WayBillPaymentBillSub>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄤ富琛ㄧ殑json
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
index e5418ad..6b2e5ad 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-01-15T05:04:43.0602637Z;</History>
+ <History>True|2026-01-19T07:58:34.1439056Z;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,31 +45,40 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/15/2026 13:04:09</publishTime>
+ <publishTime>01/19/2026 15:56:17</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/15/2026 13:04:09</publishTime>
+ <publishTime>01/19/2026 15:56:17</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/15/2026 13:04:05</publishTime>
+ <publishTime>01/19/2026 15:56:14</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/15/2026 13:04:05</publishTime>
+ <publishTime>01/19/2026 15:56:14</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/15/2026 13:03:56</publishTime>
+ <publishTime>01/19/2026 15:56:07</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/15/2026 13:03:56</publishTime>
+ <publishTime>01/19/2026 15:56:07</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll">
+ <publishTime>12/13/2018 15:35:36</publishTime>
+ </File>
+ <File Include="bin/GetuiServerApiSDK.dll.config">
+ <publishTime>12/12/2018 17:49:02</publishTime>
+ </File>
+ <File Include="bin/Google.ProtocolBuffers.dll">
+ <publishTime>12/12/2018 17:31:14</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -114,10 +123,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/15/2026 13:03:58</publishTime>
+ <publishTime>01/19/2026 15:56:08</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/15/2026 13:03:58</publishTime>
+ <publishTime>01/19/2026 15:56:08</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -150,34 +159,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/15/2026 13:03:54</publishTime>
+ <publishTime>01/19/2026 15:56:02</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/15/2026 13:03:54</publishTime>
+ <publishTime>01/19/2026 15:56:02</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/15/2026 13:03:55</publishTime>
+ <publishTime>01/19/2026 15:56:03</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/15/2026 13:03:55</publishTime>
+ <publishTime>01/19/2026 15:56:03</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/15/2026 13:03:55</publishTime>
+ <publishTime>01/19/2026 15:56:05</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/15/2026 13:03:55</publishTime>
+ <publishTime>01/19/2026 15:56:05</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/15/2026 13:03:53</publishTime>
+ <publishTime>01/19/2026 15:54:15</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/15/2026 13:03:53</publishTime>
+ <publishTime>01/19/2026 15:54:15</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -288,22 +297,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>01/15/2026 12:45:29</publishTime>
+ <publishTime>01/19/2026 15:54:21</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/15/2026 12:45:29</publishTime>
+ <publishTime>01/19/2026 15:54:21</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/15/2026 13:04:20</publishTime>
+ <publishTime>01/19/2026 15:58:21</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/15/2026 13:04:20</publishTime>
+ <publishTime>01/19/2026 15:58:21</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/15/2026 13:04:38</publishTime>
+ <publishTime>01/19/2026 15:58:30</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -507,7 +516,7 @@
<publishTime>04/21/2025 11:46:17</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/15/2026 13:04:40</publishTime>
+ <publishTime>01/15/2026 16:27:10</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml
similarity index 66%
copy from WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
copy to WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml
index cabad0c..a21a6fd 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <DeleteExistingFiles>True</DeleteExistingFiles>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+ <PublishUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user
new file mode 100644
index 0000000..8470632
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user
@@ -0,0 +1,513 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <History>True|2026-01-19T06:30:45.1345486Z;True|2026-01-19T14:23:55.0551276+08:00;False|2026-01-19T14:23:34.2543994+08:00;True|2026-01-16T13:38:27.5140015+08:00;True|2026-01-16T13:35:48.0527945+08:00;False|2026-01-16T13:35:21.3115852+08:00;</History>
+ <_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>01/19/2026 14:30:34</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>01/19/2026 14:30:34</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>01/19/2026 14:30:33</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>01/19/2026 14:30:33</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>01/19/2026 14:30:29</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>01/19/2026 14:30:29</publishTime>
+ </File>
+ <File Include="bin/Fleck.dll">
+ <publishTime>04/22/2021 11:48:12</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 13:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/19/2022 07:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 13:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/19/2022 07:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/19/2015 01:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 19:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>01/19/2026 14:30:30</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>01/19/2026 14:30:30</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 15:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>01/19/2026 14:30:28</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>01/19/2026 14:30:28</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>01/19/2026 14:30:28</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>01/19/2026 14:30:28</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>01/19/2026 14:30:29</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>01/19/2026 14:30:29</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>01/19/2026 14:28:15</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>01/19/2026 14:28:15</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 18:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 18:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/18/2019 00:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/19/2018 03:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 20:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 21:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 21:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 12:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 23:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 12:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>01/16/2026 13:33:13</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>01/16/2026 13:33:13</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>01/19/2026 14:30:39</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>01/19/2026 14:30:39</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>01/19/2026 14:30:42</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/18/2013 01:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 21:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 21:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/17/2025 13:18:47</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>01/16/2026 13:33:13</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/09/2025 08:11:33</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/17/2025 13:18:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>01/16/2026 13:35:47</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
deleted file mode 100644
index 52ba654..0000000
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ /dev/null
@@ -1,513 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <History>True|2026-01-12T03:03:44.8671220Z;False|2026-01-12T11:03:39.1688548+08:00;True|2026-01-12T10:43:22.5289499+08:00;False|2026-01-12T10:43:12.7832171+08:00;True|2026-01-06T16:58:35.5484672+08:00;True|2026-01-05T13:39:06.4644994+08:00;False|2026-01-05T13:38:50.7711229+08:00;True|2025-12-30T13:24:33.4231811+08:00;False|2025-12-30T13:24:23.7687660+08:00;True|2025-12-30T08:15:09.6688736+08:00;True|2025-12-30T08:13:50.4492459+08:00;False|2025-12-30T08:13:45.0798847+08:00;True|2025-12-29T16:52:39.7894348+08:00;True|2025-12-29T16:16:10.7792709+08:00;False|2025-12-29T16:16:00.4241687+08:00;True|2025-12-23T09:43:13.8918995+08:00;True|2025-12-23T09:42:09.7206407+08:00;True|2025-12-22T15:40:41.8795215+08:00;False|2025-12-22T15:40:35.2940687+08:00;True|2025-12-22T08:45:57.3615997+08:00;False|2025-12-22T08:45:51.0771978+08:00;True|2025-12-19T16:28:59.2288561+08:00;False|2025-12-19T16:28:41.4920964+08:00;True|2025-12-19T15:43:54.2823664+08:00;True|2025-12-18T08:46:09.8358401+08:00;False|2025-12-18T08:46:02.7318186+08:00;True|2025-12-18T08:07:54.3693074+08:00;False|2025-12-18T08:07:45.6090674+08:00;True|2025-12-17T17:05:23.5970528+08:00;True|2025-12-17T13:08:15.8085856+08:00;True|2025-12-17T12:05:52.9797421+08:00;True|2025-12-17T11:27:47.6416543+08:00;False|2025-12-17T11:27:42.3019407+08:00;True|2025-12-17T11:14:49.0908221+08:00;True|2025-12-17T11:08:53.4369374+08:00;False|2025-12-17T11:08:45.0402692+08:00;True|2025-12-16T16:06:53.1110683+08:00;True|2025-12-16T15:53:59.2905202+08:00;False|2025-12-16T15:53:50.3369570+08:00;True|2025-12-16T13:20:43.3609968+08:00;True|2025-12-16T13:04:36.7893657+08:00;False|2025-12-16T13:04:09.5572052+08:00;True|2025-12-11T17:06:16.6959487+08:00;False|2025-12-11T17:06:03.7184361+08:00;True|2025-12-11T16:18:49.6369388+08:00;False|2025-12-11T16:18:37.3969848+08:00;True|2025-12-08T17:02:56.3292906+08:00;False|2025-12-08T17:02:50.6587191+08:00;True|2025-12-08T14:22:05.5028004+08:00;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
- </PropertyGroup>
- <ItemGroup>
- <File Include="apiapp.json">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.EndpointUtil.dll">
- <publishTime>04/07/2020 16:33:48</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
- <publishTime>04/25/2023 17:49:04</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.GatewaySpi.dll">
- <publishTime>07/31/2024 20:50:30</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.OpenApiClient.dll">
- <publishTime>08/06/2024 18:07:52</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
- <publishTime>11/22/2022 11:24:18</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
- <publishTime>08/08/2024 19:43:22</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.TeaUtil.dll">
- <publishTime>07/15/2024 20:25:56</publishTime>
- </File>
- <File Include="bin/AlibabaCloud.TeaXML.dll">
- <publishTime>08/03/2022 21:46:08</publishTime>
- </File>
- <File Include="bin/Aliyun.Credentials.dll">
- <publishTime>07/24/2024 10:36:58</publishTime>
- </File>
- <File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
- </File>
- <File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
- </File>
- <File Include="bin/BLL.dll">
- <publishTime>01/12/2026 11:01:41</publishTime>
- </File>
- <File Include="bin/BLL.pdb">
- <publishTime>01/12/2026 11:01:41</publishTime>
- </File>
- <File Include="bin/BouncyCastle.Crypto.dll">
- <publishTime>12/18/2020 05:32:28</publishTime>
- </File>
- <File Include="bin/DAL.dll">
- <publishTime>01/12/2026 11:01:39</publishTime>
- </File>
- <File Include="bin/DAL.pdb">
- <publishTime>01/12/2026 11:01:39</publishTime>
- </File>
- <File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
- </File>
- <File Include="bin/DBUtility.dll">
- <publishTime>01/12/2026 11:01:36</publishTime>
- </File>
- <File Include="bin/DBUtility.pdb">
- <publishTime>01/12/2026 11:01:36</publishTime>
- </File>
- <File Include="bin/Grpc.Core.Api.dll">
- <publishTime>03/22/2022 13:17:26</publishTime>
- </File>
- <File Include="bin/Grpc.Core.Api.pdb">
- <publishTime>03/19/2022 07:39:42</publishTime>
- </File>
- <File Include="bin/Grpc.Core.dll">
- <publishTime>03/22/2022 13:17:20</publishTime>
- </File>
- <File Include="bin/Grpc.Core.pdb">
- <publishTime>03/19/2022 07:39:48</publishTime>
- </File>
- <File Include="bin/grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
- </File>
- <File Include="bin/grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
- </File>
- <File Include="bin/ICSharpCode.SharpZipLib.dll">
- <publishTime>05/09/2021 01:08:30</publishTime>
- </File>
- <File Include="bin/ICSharpCode.SharpZipLib.pdb">
- <publishTime>05/09/2021 01:08:30</publishTime>
- </File>
- <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="bin/libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/19/2022 07:38:44</publishTime>
- </File>
- <File Include="bin/libgrpc_csharp_ext.x64.so">
- <publishTime>03/19/2022 07:38:42</publishTime>
- </File>
- <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
- </File>
- <File Include="bin/Microsoft.CSharp.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
- </File>
- <File Include="bin/Model.dll">
- <publishTime>01/12/2026 11:01:37</publishTime>
- </File>
- <File Include="bin/Model.pdb">
- <publishTime>01/12/2026 11:01:37</publishTime>
- </File>
- <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="bin/Newtonsoft.Json.dll">
- <publishTime>03/08/2023 15:09:56</publishTime>
- </File>
- <File Include="bin/NPOI.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.OOXML.dll">
- <publishTime>10/23/2021 09:07:56</publishTime>
- </File>
- <File Include="bin/NPOI.OOXML.pdb">
- <publishTime>10/23/2021 17:07:56</publishTime>
- </File>
- <File Include="bin/NPOI.OpenXml4Net.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.OpenXml4Net.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.OpenXmlFormats.dll">
- <publishTime>10/23/2021 09:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.OpenXmlFormats.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
- </File>
- <File Include="bin/NPOI.pdb">
- <publishTime>10/23/2021 17:07:54</publishTime>
- </File>
- <File Include="bin/Pub_Class.dll">
- <publishTime>01/12/2026 11:01:34</publishTime>
- </File>
- <File Include="bin/Pub_Class.pdb">
- <publishTime>01/12/2026 11:01:34</publishTime>
- </File>
- <File Include="bin/Pub_Control.dll">
- <publishTime>01/12/2026 11:01:35</publishTime>
- </File>
- <File Include="bin/Pub_Control.pdb">
- <publishTime>01/12/2026 11:01:35</publishTime>
- </File>
- <File Include="bin/RestSharp.dll">
- <publishTime>08/31/2012 06:22:50</publishTime>
- </File>
- <File Include="bin/SQLHelper.dll">
- <publishTime>01/12/2026 11:01:34</publishTime>
- </File>
- <File Include="bin/SQLHelper.pdb">
- <publishTime>01/12/2026 11:01:34</publishTime>
- </File>
- <File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
- </File>
- <File Include="bin/SyntacticSugar.dll">
- <publishTime>01/06/2026 16:58:06</publishTime>
- </File>
- <File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/06/2026 16:58:06</publishTime>
- </File>
- <File Include="bin/System.Buffers.dll">
- <publishTime>07/19/2017 18:01:28</publishTime>
- </File>
- <File Include="bin/System.ComponentModel.DataAnnotations.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Configuration.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Data.DataSetExtensions.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Data.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Drawing.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.EnterpriseServices.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
- </File>
- <File Include="bin/System.Memory.dll">
- <publishTime>04/18/2019 00:24:34</publishTime>
- </File>
- <File Include="bin/System.Net.Http.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Net.Http.Extensions.dll">
- <publishTime>02/20/2015 04:10:46</publishTime>
- </File>
- <File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
- </File>
- <File Include="bin/System.Net.Http.Primitives.dll">
- <publishTime>02/20/2015 04:10:46</publishTime>
- </File>
- <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
- <publishTime>09/19/2018 03:38:10</publishTime>
- </File>
- <File Include="bin/System.Runtime.Serialization.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.ApplicationServices.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
- </File>
- <File Include="bin/System.Web.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.DynamicData.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Entity.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Extensions.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
- </File>
- <File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
- </File>
- <File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
- </File>
- <File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
- </File>
- <File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
- </File>
- <File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</publishTime>
- </File>
- <File Include="bin/System.Web.Services.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
- </File>
- <File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
- </File>
- <File Include="bin/System.Xml.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/System.Xml.Linq.dll">
- <publishTime>09/26/2012 03:16:08</publishTime>
- </File>
- <File Include="bin/Tea.dll">
- <publishTime>05/09/2023 10:43:40</publishTime>
- </File>
- <File Include="bin/TopSdk.dll">
- <publishTime>01/06/2026 16:58:07</publishTime>
- </File>
- <File Include="bin/TopSdk.pdb">
- <publishTime>01/06/2026 16:58:07</publishTime>
- </File>
- <File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
- </File>
- <File Include="bin/WebAPI.dll">
- <publishTime>01/12/2026 11:01:47</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>01/12/2026 11:01:47</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>08/16/2024 16:55:28</publishTime>
- </File>
- <File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
- </File>
- <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
- </File>
- <File Include="Config/kdapi.config">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Content/bootstrap.css">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Content/bootstrap.min.css">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Content/Site.css">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/BLL.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/DAL.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/DBUtility.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/Interop.grsvr6Lib.dll">
- <publishTime>12/15/2025 08:04:16</publishTime>
- </File>
- <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/Model.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/Pub_Class.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/Pub_Control.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="DLL/SQLHelper.dll">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/18/2025 16:11:19</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/18/2025 16:11:19</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/18/2025 16:11:19</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/18/2025 16:11:19</publishTime>
- </File>
- <File Include="Global.asax">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
- </File>
- <File Include="grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 13:17:22</publishTime>
- </File>
- <File Include="Index.html">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/19/2022 07:38:44</publishTime>
- </File>
- <File Include="libgrpc_csharp_ext.x64.so">
- <publishTime>03/19/2022 07:38:42</publishTime>
- </File>
- <File Include="libman.json">
- <publishTime>08/18/2025 16:11:19</publishTime>
- </File>
- <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="packages.config">
- <publishTime>12/29/2025 09:21:08</publishTime>
- </File>
- <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/08/2025 10:29:30</publishTime>
- </File>
- <File Include="Template/barCodeTemplateStorage.json">
- <publishTime>09/12/2025 10:51:38</publishTime>
- </File>
- <File Include="Utility/Barcode.ashx">
- <publishTime>12/15/2025 08:04:16</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Shared/Error.cshtml">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/web.config">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Views/_ViewStart.cshtml">
- <publishTime>08/18/2025 16:11:18</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>10/27/2025 08:51:30</publishTime>
- </File>
- <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>10/27/2025 08:51:29</publishTime>
- </File>
- <File Include="Web References/WebS/Reference.map">
- <publishTime>04/29/2024 08:30:03</publishTime>
- </File>
- <File Include="Web.config">
- <publishTime>01/12/2026 11:03:43</publishTime>
- </File>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
similarity index 74%
rename from WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
rename to WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
index cabad0c..8316d46 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
+锘�<?xml version="1.0" encoding="utf-8"?>
+=======
<?xml version="1.0" encoding="utf-8"?>
+>>>>>>> 6367b170a3db4df6e43a8962b2f17b06a020b913:WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
diff --git a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
new file mode 100644
index 0000000..11b60aa
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
@@ -0,0 +1,507 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
+ <History>True|2026-01-19T05:53:48.2079321Z;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>01/16/2026 09:00:35</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>01/16/2026 09:00:35</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>01/16/2026 09:00:32</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>01/16/2026 09:00:32</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>01/16/2026 09:00:28</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>01/16/2026 09:00:28</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 13:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/19/2022 07:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 13:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/19/2022 07:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/19/2015 01:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 19:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>01/16/2026 09:00:30</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>01/16/2026 09:00:30</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 15:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>01/16/2026 09:00:26</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>01/16/2026 09:00:26</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>01/16/2026 09:00:27</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>01/16/2026 09:00:27</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>01/16/2026 09:00:27</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>01/16/2026 09:00:27</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>01/14/2026 14:23:43</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>01/14/2026 14:23:43</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 18:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 18:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/18/2019 00:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/19/2018 03:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 20:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 21:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 21:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 12:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 23:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 12:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>01/13/2026 14:00:51</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>01/13/2026 14:00:51</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>01/19/2026 13:53:41</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>01/19/2026 13:53:41</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/18/2013 01:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 21:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 21:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/15/2025 08:04:16</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>08/18/2025 16:11:19</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>08/18/2025 16:11:19</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>08/18/2025 16:11:19</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>08/18/2025 16:11:19</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>08/18/2025 16:11:19</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>12/29/2025 09:21:08</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/08/2025 10:29:30</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>09/12/2025 10:51:38</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/15/2025 08:04:16</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>10/27/2025 08:51:29</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>10/27/2025 08:51:29</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>10/27/2025 08:51:29</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>10/27/2025 08:51:30</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>10/27/2025 08:51:29</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>01/16/2026 09:00:41</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/GeTuiService.cs b/WebAPI/Service/GeTuiService.cs
new file mode 100644
index 0000000..9261a6c
--- /dev/null
+++ b/WebAPI/Service/GeTuiService.cs
@@ -0,0 +1,172 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using com.igetui.api.openservice;
+using System.Threading.Tasks;
+using System.Data;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using com.igetui.api.openservice.igetui.template;
+using com.igetui.api.openservice.igetui;
+
+namespace WebAPI.Service
+{
+ public static class GeTuiService
+ {
+ //http鐨勫煙鍚�
+ // private static String HOST = "http://sdk.open.api.igexin.com/apiex.htm";
+
+ //https鐨勫煙鍚�
+ private static String HOST = "https://api.getui.com/apiex.htm";
+
+ // 閰嶇疆涓篋CLOUD 涓殑 unipush 涓帹 涓搴旂殑鏁版嵁
+ private static String APPID = "X3I10VqaROAH8C7ElIc1L5";
+ private static String APPKEY = "V425beWn5K65BcOYKTcXx8";
+ private static String MASTERSECRET = "LOXAgRbXS98NxHKUXmlJQ";
+
+ // 鎺ㄩ�佹湇鍔″疄渚�
+ private static IGtPush push = new IGtPush(HOST, APPKEY, MASTERSECRET);
+
+ // 鍗曟潯娑堟伅鎺ㄩ��
+ public static void PubishSingle(int HInterID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds = new DataSet();
+
+ try
+ {
+ JObject NameMsgKVP = new JObject();
+ ds = oCN.RunProcReturn($@"
+ select * from h_v_OA_WorkLinkBillAllList where hmainid = {HInterID}
+ select * from Gy_UserClientIdRelation
+ ", "h_v_OA_WorkLinkBillAllList");
+ NotificationTemplate template = null;
+ if(ds.Tables[0].Rows.Count > 0)
+ {
+ string title = ds.Tables[0].Rows[0]["涓婚"].ToString();
+ string content = ds.Tables[0].Rows[0]["鍐呭"].ToString();
+ template = GetNotificationTemplate(title, content, "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList", "0");
+
+ // 骞挎挱
+ if(ds.Tables[0].Rows[0]["鍙戦�佺被鍨�"].ToString() == "鍏叡")
+ {
+ // 閬嶅巻 鍏ㄦ帹閫�
+ foreach(DataRow row in ds.Tables[1].Rows)
+ {
+ PushMessageToSingle(template, row["HClientID"].ToString());
+ }
+ }else // 鍗曠嫭鎺ㄩ��
+ {
+ // 鎺ㄩ�佺粰鎺ユ敹浜� 鍜� 鎶勯�佷汉
+ foreach (DataRow row in ds.Tables[1].Rows)
+ {
+ if(ds.Tables[0].Rows[0]["鎺ユ敹浜�"].ToString() == row["HUserName"].ToString()
+ || ds.Tables[0].Rows[0]["鎶勯�佹帴鏀朵汉"].ToString() == row["HUserName"].ToString())
+ PushMessageToSingle(template, row["HClientID"].ToString());
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogService.Write(ex.ToString());
+ return;
+ }
+ }
+
+ // 鍗曟帹 浣跨敤閫氱煡娑堟伅妯″瀷
+ private static void PushMessageToSingle(NotificationTemplate template, string ClientID)
+ {
+
+ IGtPush push = new IGtPush(HOST, APPKEY, MASTERSECRET);
+
+ // 鍗曟帹娑堟伅妯″瀷
+ SingleMessage message = new SingleMessage();
+ message.IsOffline = true; // 鐢ㄦ埛褰撳墠涓嶅湪绾挎椂锛屾槸鍚︾绾垮瓨鍌�,鍙��
+ message.OfflineExpireTime = 1000 * 3600 * 12; // 绂荤嚎鏈夋晥鏃堕棿锛屽崟浣嶄负姣锛屽彲閫�
+ message.Data = template;
+ //鍒ゆ柇鏄惁瀹㈡埛绔槸鍚ifi鐜涓嬫帹閫侊紝2涓�4G/3G/2G锛�1涓哄湪WIFI鐜涓嬶紝0涓轰笉闄愬埗鐜
+ //message.PushNetWorkType = 1;
+
+ com.igetui.api.openservice.igetui.Target target = new com.igetui.api.openservice.igetui.Target();
+ target.appId = APPID;
+ target.clientId = ClientID;
+ //target.alias = ALIAS;
+ try
+ {
+ String pushResult = push.pushMessageToSingle(message, target);
+
+ LogService.Write("-----------------------------------------------");
+ LogService.Write("-----------------------------------------------");
+ LogService.Write("----------------鏈嶅姟绔繑鍥炵粨鏋滐細" + pushResult);
+ }
+ catch (RequestException e)
+ {
+ String requestId = e.RequestId;
+ //鍙戦�佸け璐ュ悗鐨勯噸鍙�
+ String pushResult = push.pushMessageToSingle(message, target, requestId);
+ LogService.Write("-----------------------------------------------");
+ LogService.Write("-----------------------------------------------");
+ LogService.Write("----------------鏈嶅姟绔繑鍥炵粨鏋滐細" + pushResult);
+ }
+ }
+
+ //閫忎紶妯℃澘鍔ㄤ綔鍐呭
+ public static TransmissionTemplate TransmissionTemplateDemo()
+ {
+ TransmissionTemplate template = new TransmissionTemplate();
+ template.AppId = APPID;
+ template.AppKey = APPKEY;
+ //搴旂敤鍚姩绫诲瀷锛�1锛氬己鍒跺簲鐢ㄥ惎鍔� 2锛氱瓑寰呭簲鐢ㄥ惎鍔�
+ template.TransmissionType = 1;
+ //閫忎紶鍐呭
+ template.TransmissionContent = "閫忎紶鍐呭";
+ //璁剧疆閫氱煡瀹氭椂灞曠ず鏃堕棿锛岀粨鏉熸椂闂翠笌寮�濮嬫椂闂寸浉宸渶澶т簬6鍒嗛挓锛屾秷鎭帹閫佸悗锛屽鎴风灏嗗湪鎸囧畾鏃堕棿宸唴灞曠ず娑堟伅锛堣宸�6鍒嗛挓锛�
+ // String begin = "2015-03-06 14:36:10";
+ // String end = "2015-03-06 14:46:20";
+ // template.setDuration(begin, end);
+
+ return template;
+ }
+
+ //閫氱煡閫忎紶妯℃澘鍔ㄤ綔鍐呭
+ public static NotificationTemplate GetNotificationTemplate(string title, string content, string pagePath, string HItemID)
+ {
+ NotificationTemplate template = new NotificationTemplate();
+ template.AppId = APPID;
+ template.AppKey = APPKEY;
+ //閫氱煡鏍忔爣棰�
+ template.Title = title;
+ //閫氱煡鏍忓唴瀹�
+ template.Text = content;
+ //閫氱煡鏍忔樉绀烘湰鍦板浘鐗�
+ template.Logo = "@/static/logo.png";
+ //閫氱煡鏍忔樉绀虹綉缁滃浘鏍�
+ template.LogoURL = "";
+ //搴旂敤鍚姩绫诲瀷锛�1锛氬己鍒跺簲鐢ㄥ惎鍔� 2锛氱瓑寰呭簲鐢ㄥ惎鍔�
+ template.TransmissionType = 1;
+ //閫忎紶鍐呭
+ template.TransmissionContent = "";
+ //鎺ユ敹鍒版秷鎭槸鍚﹀搷閾冿紝true锛氬搷閾� false锛氫笉鍝嶉搩
+ template.IsRing = true;
+ //鎺ユ敹鍒版秷鎭槸鍚﹂渿鍔紝true锛氶渿鍔� false锛氫笉闇囧姩
+ template.IsVibrate = true;
+ //鎺ユ敹鍒版秷鎭槸鍚﹀彲娓呴櫎锛宼rue锛氬彲娓呴櫎 false锛氫笉鍙竻闄�
+ template.IsClearable = true;
+ var customData = new Dictionary<string, string>
+ {
+ {"pagePath", pagePath}, // 绀轰緥锛�"/pages/detail/detail"
+ {"itemId", HItemID} // 绀轰緥锛�"123456"
+ };
+ template.TransmissionContent = JsonConvert.SerializeObject(customData); // 搴忓垪鍖栦负 JSON 瀛楃涓�
+ template.TransmissionType = 1; // 1=鐐瑰嚮閫氱煡鍚庤Е鍙戝鎴风鍥炶皟锛堥�忎紶鍐呭缁欏鎴风锛�
+ //璁剧疆閫氱煡瀹氭椂灞曠ず鏃堕棿锛岀粨鏉熸椂闂翠笌寮�濮嬫椂闂寸浉宸渶澶т簬6鍒嗛挓锛屾秷鎭帹閫佸悗锛屽鎴风灏嗗湪鎸囧畾鏃堕棿宸唴灞曠ず娑堟伅锛堣宸�6鍒嗛挓锛�
+ // String begin = "2015-03-06 14:36:10";
+ // String end = "2015-03-06 14:46:20";
+ // template.setDuration(begin, end);
+
+ return template;
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebSocketServer.cs b/WebAPI/Service/WebSocketServer.cs
similarity index 73%
rename from WebAPI/WebSocketServer.cs
rename to WebAPI/Service/WebSocketServer.cs
index 2460a95..89581d6 100644
--- a/WebAPI/WebSocketServer.cs
+++ b/WebAPI/Service/WebSocketServer.cs
@@ -125,12 +125,11 @@
JArray dataTableJArray = JArray.Parse(JsonConvert.SerializeObject(ds.Tables[0]));
foreach (JToken row in dataTableJArray)
{
- // 鎻愬墠鑾峰彇骞跺鐞嗚鏁版嵁锛堥伩鍏嶉噸澶嶈闂� row["鍒楀悕"]锛屼笖澶勭悊 null锛�
string receiver = row["鎺ユ敹浜�"]?.ToString() ?? string.Empty; // 涓� null 鏃惰繑鍥炵┖瀛楃涓�
string ccUsers = row["鎵�鏈夋妱閫佷汉"]?.ToString() ?? string.Empty;
string sendType = row["鍙戦�佺被鍨�"]?.ToString() ?? string.Empty;
- // 璺宠繃鏃犳晥鏁版嵁琛岋紙涓夊垪鍧囦负绌烘椂锛屾棤闇�澶勭悊锛�
+ // 璺宠繃鏃犳晥鏁版嵁琛�
if (string.IsNullOrEmpty(receiver) && string.IsNullOrEmpty(ccUsers) && string.IsNullOrEmpty(sendType))
continue;
@@ -161,7 +160,7 @@
{
// 灏佽 websocket 淇℃伅
dictOne.Key.Send(new JObject{
- ["Type"]="Message",
+ ["Type"]="MessageNoRead",
["Content"]= NameMsgKVP[dictOne.Value.ToString()].ToString()
}.ToString());
}
@@ -208,5 +207,68 @@
}
}
}
+
+ // 鍗曟潯鏁版嵁鎺ㄩ�佸叕寮�璇彞
+ public static void PushOne(int HInterID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds = new DataSet();
+ try
+ {
+ JObject NameMsgKVP = new JObject();
+ ds = oCN.RunProcReturn($"select * from h_v_OA_WorkLinkBillAllList where hmainid = {HInterID}", "h_v_OA_WorkLinkBillAllList");
+ // 鍒ゆ柇骞挎挱杩樻槸绉佸彂 锛岀粺璁℃暟鎹�
+ JArray dataTableJArray = JArray.Parse(JsonConvert.SerializeObject(ds.Tables[0]));
+ foreach (JToken row in dataTableJArray)
+ {
+ string receiver = row["鎺ユ敹浜�"]?.ToString() ?? string.Empty; // 涓� null 鏃惰繑鍥炵┖瀛楃涓�
+ string ccUsers = row["鎶勯�佹帴鏀朵汉"]?.ToString() ?? string.Empty;
+ string sendType = row["鍙戦�佺被鍨�"]?.ToString() ?? string.Empty;
+
+ // 璺宠繃鏃犳晥鏁版嵁琛�
+ if (string.IsNullOrEmpty(receiver) && string.IsNullOrEmpty(ccUsers) && string.IsNullOrEmpty(sendType))
+ continue;
+
+ foreach (var dictOne in _NameConnectionDict)
+ {
+ string UName = dictOne.Value.Split('_')[1];
+ // 灏嗘帴鏀朵汉 鎶勯�佷汉 鑾峰彇 骞挎挱鐨勬秷鎭坊鍔犲埌娑堟伅缂撳瓨
+ if (string.Equals(row["鎺ユ敹浜�"].ToString(), UName)
+ || row["鎶勯�佹帴鏀朵汉"].ToString().Contains(UName)
+ || string.Equals(row["鍙戦�佺被鍨�"].ToString(), "鍏叡"))
+ {
+ string dictOneVal = dictOne.Value.ToString();
+ if (NameMsgKVP[dictOneVal] == null)
+ {
+ NameMsgKVP[dictOneVal] = new JArray();
+ }
+
+ var jArray = NameMsgKVP[dictOneVal] as JArray;
+
+ jArray.Add(row);
+ }
+ }
+ }
+ // 鏍规嵁鐢ㄦ埛ID鍒嗗彂鍒颁笉鍚岀殑瀹㈡埛绔�
+ foreach (var dictOne in _NameConnectionDict)
+ {
+ if (NameMsgKVP[dictOne.Value.ToString()] != null)
+ {
+ // 灏佽 websocket 淇℃伅
+ dictOne.Key.Send(new JObject
+ {
+ ["Type"] = "Message",
+ ["Content"] = NameMsgKVP[dictOne.Value.ToString()].ToString()
+ }.ToString());
+ }
+ }
+ LogService.Write("娑堟伅鎺ㄩ�佸畬鎴�...");
+ }
+ catch (Exception ex)
+ {
+ LogService.Write(ex.ToString());
+ return;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a004a6c..0e98afc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -87,6 +87,12 @@
<Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath>
</Reference>
+ <Reference Include="GetuiServerApiSDK">
+ <HintPath>DLL\GetuiServerApiSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.ProtocolBuffers">
+ <HintPath>DLL\Google.ProtocolBuffers.dll</HintPath>
+ </Reference>
<Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
<HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath>
</Reference>
@@ -676,6 +682,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠$悊\鍑鸿繍鍗昞WLYayBillController.cs" />
+ <Compile Include="Controllers\鐗╂祦绠$悊\杩愬崟璐圭敤缁撶畻鍗昞Pay_WayBillPaymentBillController.cs" />
<Compile Include="Controllers\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
<Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
@@ -1186,6 +1193,7 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Service\GeTuiService.cs" />
<Compile Include="Service\LuBaoSevice.cs" />
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
@@ -1226,7 +1234,7 @@
<DependentUpon>Reference.map</DependentUpon>
</Compile>
<Compile Include="WebServer.cs" />
- <Compile Include="WebSocketServer.cs" />
+ <Compile Include="Service\WebSocketServer.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config">
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index d4e7c3a..914aaca 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -9,8 +9,8 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ShowAllFiles</ProjectView>
+ <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 7c7c485..97380d6 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -8075,6 +8075,7 @@
DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
return dal.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
}
+
}
}
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index b928efb..3670ccb 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 5c1f31e..3127ab1 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/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index 45fbfdc..fd9fde4 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -5,7 +5,7 @@
D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index b928efb..3670ccb 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 5c1f31e..3127ab1 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1