From 1021b3f11ab804ecc34d03024246aa63bc607da3 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 24 十二月 2025 14:36:33 +0800
Subject: [PATCH] 增加了车辆轨迹表的编辑和列表
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 1
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
WebAPI/WebAPI.csproj.user | 33 +
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
Model/物流管理/ClsCg_CarTrajectoryBillSub.cs | 36 +
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 49
DBUtility/bin/Release/Pub_Class.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
Model/bin/Release/Pub_Control.pdb | 0
BLL/bin/Release/Model.dll | 0
BLL/bin/Release/DAL.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
DAL/bin/Release/Model.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
Model/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs | 949 ++++++++++++++++++++++++++++++
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/ListModels.cs | 27
Pub_Control/bin/Release/Pub_Class.dll | 0
DAL/DAL.csproj | 2
WebAPI/WebAPI.csproj | 1
BLL/bin/Release/Pub_Control.pdb | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
Model/Model.csproj | 2
BLL/bin/Release/Pub_Control.dll | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
Model/物流管理/ClsCg_CarTrajectoryBillMain.cs | 72 ++
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
Model/bin/Release/Model.pdb | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
/dev/null | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
DAL/WLGL/ClsCg_CarTrajectoryBill.cs | 684 ++++++++++++++++++++++
75 files changed, 1,832 insertions(+), 24 deletions(-)
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index eb4898b..283cf55 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 c0e8971..c975b54 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 0c0f430..2a5065e 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 166551e..2c076a2 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 c83301d..38514f4 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 56f8a2e..54c8d41 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 fcbe898..5b51a10 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 638a1a3..c4d7aa5 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 895e592..34e8ad4 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 347ba36..9defb58 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 0adc8ce..46fea9f 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 306da35..4c7fcb5 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 76eae00..b10307a 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 9b496d0..fe5384e 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -82,6 +82,7 @@
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
<Compile Include="ClsGy_MaterialPackingRelation.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
+ <Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Driver_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Car_Ctl_2.cs" />
@@ -1296,6 +1297,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="A3鍗曟嵁\" />
+ <Folder Include="Model\" />
<Folder Include="鍩虹璧勬枡\A3鍩虹璧勬枡\" />
<Folder Include="鍩虹璧勬枡\CLOUD鍩虹璧勬枡\" />
<Folder Include="鍩虹璧勬枡\鐗规畩绯荤粺\" />
diff --git a/DAL/WLGL/ClsCg_CarTrajectoryBill.cs b/DAL/WLGL/ClsCg_CarTrajectoryBill.cs
new file mode 100644
index 0000000..8f99a85
--- /dev/null
+++ b/DAL/WLGL/ClsCg_CarTrajectoryBill.cs
@@ -0,0 +1,684 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsCg_CarTrajectoryBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsCg_CarTrajectoryBillMain omodel = new Model.ClsCg_CarTrajectoryBillMain();
+ public List<Model.ClsCg_CarTrajectoryBillSub> DetailColl = new List<Model.ClsCg_CarTrajectoryBillSub>();
+
+ public ClsCg_CarTrajectoryBill()
+ {
+ base.MvarItemKeySub = "Cg_CarTrajectoryBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Cg_CarTrajectoryBillMain";
+ base.MvarReportTitle = "杞﹁締杞ㄨ抗鍗曟嵁";
+ base.BillType = "1119";
+ base.HBillSubType = "1119";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsCg_CarTrajectoryBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion
+
+ #region 鑷畾涔夋柟娉�
+
+ // 淇敼鍗曟嵁
+
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+
+ // 淇濆瓨鍓嶆帶鍒� - 涓庢柊澧炰繚鎸佷竴鑷�
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ",
+ "h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl");
+
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ // 鏇存柊涓昏〃
+ string updateSql = "UPDATE Cg_CarTrajectoryBillMain SET " +
+ "HBillNo = '" + omodel.HBillNo + "', " +
+ "HDate = '" + omodel.HDate.ToString() + "', " +
+ "HYear = " + omodel.HYear.ToString() + ", " +
+ "HPeriod = " + omodel.HPeriod.ToString() + ", " +
+ "HRemark = '" + omodel.HRemark + "', " +
+ "HUpDater = '" + DBUtility.ClsPub.CurUserName + "', " +
+ "HUpDateDate = GETDATE(), " +
+ // 鑷畾涔夊瓧娈�
+ "HContractTransportBillMainID = " + (omodel.HContractTransportBillMainID.HasValue ? omodel.HContractTransportBillMainID.ToString() : "NULL") + ", " +
+ "HContractTransportBillNo = '" + (omodel.HContractTransportBillNo ?? "") + "', " +
+ "HCarNumber = '" + omodel.HCarNumber + "', " +
+ "HGetTime = '" + omodel.HGetTime.ToString() + "', " +
+ "HLongitude = " + (omodel.HLongitude.HasValue ? omodel.HLongitude.ToString() : "NULL") + ", " +
+ "HLatitude = " + (omodel.HLatitude.HasValue ? omodel.HLatitude.ToString() : "NULL") + " " +
+ "WHERE HInterID = " + lngBillKey.ToString();
+
+ // 璋冭瘯杈撳嚭
+ LogToFile("鎵ц鏇存柊SQL: " + updateSql);
+
+ oCn.RunProc(updateSql);
+
+ // 鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+
+ // 鍒犻櫎瀛愯〃
+ DeleteBillSub(omodel.HInterID);
+
+ // 鎻掑叆瀛愯〃鏁版嵁
+ foreach (Model.ClsCg_CarTrajectoryBillSub oSub in DetailColl)
+ {
+ string insertSubSql = "INSERT INTO Cg_CarTrajectoryBillSub " +
+ "(HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType, HRemark, " +
+ "HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney) " +
+ "VALUES (" +
+ omodel.HInterID.ToString() + ", '" +
+ omodel.HBillNo + "', " +
+ oSub.HEntryID.ToString() + ", '" +
+ oSub.HCloseMan + "', '" +
+ oSub.HEntryCloseDate.ToString("yyyy-MM-dd") + "', " +
+ Convert.ToInt32(oSub.HCloseType) + ", '" +
+ oSub.HRemark + "', " +
+ oSub.HSourceInterID.ToString() + ", " +
+ oSub.HSourceEntryID.ToString() + ", '" +
+ oSub.HSourceBillNo + "', '" +
+ oSub.HSourceBillType + "', " +
+ oSub.HRelationQty.ToString() + ", " +
+ oSub.HRelationMoney.ToString() + ")";
+
+ oCn.RunProc(insertSubSql);
+ }
+
+
+ DataSet ds2 = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_AfterSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ",
+ "h_p_Cg_CarTrajectoryBill_AfterSaveCtrl");
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ // 璁板綍璇︾粏鐨勯敊璇俊鎭�
+ string errorDetails = $"缂栬緫鍗曟嵁澶辫触锛丠InterID: {omodel.HInterID}, HBillNo: {omodel.HBillNo}\n" +
+ $"閿欒淇℃伅: {e.Message}\n" +
+ $"鍫嗘爤璺熻釜: {e.StackTrace}";
+
+ LogToFile(errorDetails);
+ System.Diagnostics.Debug.WriteLine(errorDetails);
+
+ sReturn = "缂栬緫鍗曟嵁澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ throw;
+ }
+ }
+
+ // 娣诲姞鏃ュ織鏂规硶
+ private void LogToFile(string message)
+ {
+ string logPath = @"D:\Logs\MES-SQL.log";
+ try
+ {
+ if (!System.IO.Directory.Exists(@"D:\Logs"))
+ System.IO.Directory.CreateDirectory(@"D:\Logs");
+
+ System.IO.File.AppendAllText(logPath, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " - " + message + Environment.NewLine);
+ }
+ catch { }
+ }
+ // 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+
+ // 鑾峰彇鏂扮殑HInterID
+ if (omodel.HInterID == 0)
+ {
+ sReturn = "123";
+ return false;
+ }
+
+ // 淇濆瓨鍓嶆帶鍒�
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ",
+ "h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl");
+
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ // 鎻掑叆涓昏〃
+ string insertMainSql = "INSERT INTO Cg_CarTrajectoryBillMain " +
+ "(HYear, HPeriod, HBillType, HBillSubType, HInterID, HDate, HBillNo, HBillStatus, " +
+ "HCheckItemNowID, HCheckItemNextID, HCheckFlowID, HRemark, HBacker, HBackDate, HBackRemark, " +
+ "HChecker, HCheckDate, HMaker, HMakeDate, HUpDater, HUpDateDate, HCloseMan, HCloseDate, " +
+ "HCloseType, HDeleteMan, HDeleteDate, HMainSourceBillType, HMainSourceInterID, " +
+ "HMainSourceEntryID, HMainSourceBillNo, HPrintQty, HContractTransportBillMainID, " +
+ "HContractTransportBillNo, HCarNumber, HGetTime, HLongitude, HLatitude) " +
+ "VALUES (" +
+ omodel.HYear.ToString() + ", " +
+ omodel.HPeriod.ToString() + ", '" +
+ this.BillType + "', '" +
+ this.HBillSubType + "', " +
+ omodel.HInterID.ToString() + ", '" +
+ omodel.HDate.ToString() + "', '" +
+ omodel.HBillNo + "', " +
+ omodel.HBillStatus.ToString() + ", " +
+ omodel.HCheckItemNowID.ToString() + ", " +
+ omodel.HCheckItemNextID.ToString() + ", " +
+ omodel.HCheckFlowID.ToString() + ", '" +
+ omodel.HRemark + "', '" +
+ omodel.HBacker + "', " +
+ (omodel.HBackDate.HasValue ? "'" + omodel.HBackDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HBackRemark + "', '" +
+ omodel.HChecker + "', " +
+ (omodel.HCheckDate.HasValue ? "'" + omodel.HCheckDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HMaker + "', '" +
+ omodel.HMakeDate.ToString() + "', '" +
+ omodel.HUpDater + "', " +
+ (omodel.HUpDateDate.HasValue ? "'" + omodel.HUpDateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HCloseMan + "', " +
+ (omodel.HCloseDate.HasValue ? "'" + omodel.HCloseDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", " +
+ Convert.ToInt32(omodel.HCloseType) + ", '" +
+ omodel.HDeleteMan + "', " +
+ (omodel.HDeleteDate.HasValue ? "'" + omodel.HDeleteDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HMainSourceBillType + "', " +
+ (omodel.HMainSourceInterID.HasValue ? omodel.HMainSourceInterID.ToString() : "NULL") + ", " +
+ (omodel.HMainSourceEntryID.HasValue ? omodel.HMainSourceEntryID.ToString() : "NULL") + ", '" +
+ omodel.HMainSourceBillNo + "', " +
+ omodel.HPrintQty.ToString() + ", " +
+ (omodel.HContractTransportBillMainID.HasValue ? omodel.HContractTransportBillMainID.ToString() : "NULL") + ", '" +
+ omodel.HContractTransportBillNo + "', '" +
+ omodel.HCarNumber + "', '" +
+ omodel.HGetTime.ToString() + "', " +
+ (omodel.HLongitude.HasValue ? omodel.HLongitude.ToString() : "NULL") + ", " +
+ (omodel.HLatitude.HasValue ? omodel.HLatitude.ToString() : "NULL") + ")";
+
+
+ oCn.RunProc(insertMainSql);
+
+ // 鑾峰彇鑷姩鐢熸垚鐨凥InterID
+ //DataSet dsMainID = oCn.RunProcReturn("SELECT SCOPE_IDENTITY() AS HInterID", "GetMainID");
+ //if (dsMainID != null && dsMainID.Tables[0].Rows.Count > 0)
+ //{
+ // omodel.HInterID = Convert.ToInt32(dsMainID.Tables[0].Rows[0]["HInterID"]);
+ //}
+
+
+ // 鎻掑叆瀛愯〃鏁版嵁
+ foreach (Model.ClsCg_CarTrajectoryBillSub oSub in DetailColl)
+ {
+ string insertSubSql = "INSERT INTO Cg_CarTrajectoryBillSub " +
+ "(HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType, HRemark, " +
+ "HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney) " +
+ "VALUES (" +
+ omodel.HInterID.ToString() + ", '" +
+ omodel.HBillNo + "', " +
+ oSub.HEntryID.ToString() + ", '" +
+ oSub.HCloseMan + "', '" +
+ oSub.HEntryCloseDate.ToString("yyyy-MM-dd") + "', " +
+ Convert.ToInt32(oSub.HCloseType) + ", '" +
+ oSub.HRemark + "', " +
+ oSub.HSourceInterID.ToString() + ", " +
+ oSub.HSourceEntryID.ToString() + ", '" +
+ oSub.HSourceBillNo + "', '" +
+ oSub.HSourceBillType + "', " +
+ oSub.HRelationQty.ToString() + ", " +
+ oSub.HRelationMoney.ToString() + ")";
+
+ oCn.RunProc(insertSubSql);
+ }
+
+ // 淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_AfterSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ",
+ "h_p_Cg_CarTrajectoryBill_AfterSaveCtrl");
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+
+ 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 = oCn.RunProcReturn("SELECT * FROM Cg_CarTrajectoryBillMain WHERE HInterID = " + lngBillKey.ToString(),
+ "Cg_CarTrajectoryBillMain");
+
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+
+ DataRow row = Ds.Tables[0].Rows[0];
+
+ // 鍩烘湰瀛楁 - 浣跨敤瀹夊叏杞崲
+ omodel.HYear = SafeConvertToInt(row["HYear"]);
+ omodel.HPeriod = SafeConvertToInt(row["HPeriod"]);
+ omodel.HBillType = SafeConvertToString(row["HBillType"]);
+ omodel.HBillSubType = SafeConvertToString(row["HBillSubType"]);
+ omodel.HInterID = SafeConvertToInt(row["HInterID"]);
+ omodel.HDate = SafeConvertToDateTime(row["HDate"], DateTime.Now);
+ omodel.HBillNo = SafeConvertToString(row["HBillNo"]);
+ omodel.HBillStatus = SafeConvertToInt(row["HBillStatus"]);
+ omodel.HCheckItemNowID = SafeConvertToInt(row["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = SafeConvertToInt(row["HCheckItemNextID"]);
+ omodel.HCheckFlowID = SafeConvertToInt(row["HCheckFlowID"]);
+ omodel.HRemark = SafeConvertToString(row["HRemark"]);
+
+ // 鍙┖鏃ユ湡瀛楁
+ omodel.HBackDate = SafeConvertToNullableDateTime(row["HBackDate"]);
+ omodel.HBacker = SafeConvertToString(row["HBacker"]);
+ omodel.HBackRemark = SafeConvertToString(row["HBackRemark"]);
+ omodel.HCheckDate = SafeConvertToNullableDateTime(row["HCheckDate"]);
+ omodel.HChecker = SafeConvertToString(row["HChecker"]);
+ omodel.HMaker = SafeConvertToString(row["HMaker"]);
+ omodel.HMakeDate = SafeConvertToDateTime(row["HMakeDate"], DateTime.Now);
+ omodel.HUpDateDate = SafeConvertToNullableDateTime(row["HUpDateDate"]);
+ omodel.HUpDater = SafeConvertToString(row["HUpDater"]);
+ omodel.HCloseDate = SafeConvertToNullableDateTime(row["HCloseDate"]);
+ omodel.HCloseMan = SafeConvertToString(row["HCloseMan"]);
+ omodel.HCloseType = SafeConvertToBool(row["HCloseType"]);
+ omodel.HDeleteDate = SafeConvertToNullableDateTime(row["HDeleteDate"]);
+ omodel.HDeleteMan = SafeConvertToString(row["HDeleteMan"]);
+
+ // 婧愬崟淇℃伅
+ omodel.HMainSourceBillType = SafeConvertToString(row["HMainSourceBillType"]);
+ omodel.HMainSourceInterID = row["HMainSourceInterID"] == DBNull.Value ? (int?)null : SafeConvertToInt(row["HMainSourceInterID"]);
+ omodel.HMainSourceEntryID = row["HMainSourceEntryID"] == DBNull.Value ? (int?)null : SafeConvertToInt(row["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = SafeConvertToString(row["HMainSourceBillNo"]);
+ omodel.HPrintQty = SafeConvertToInt(row["HPrintQty"]);
+
+ // 鑷畾涔夊瓧娈�
+ omodel.HContractTransportBillMainID = row["HContractTransportBillMainID"] == DBNull.Value ? (int?)null : SafeConvertToInt(row["HContractTransportBillMainID"]);
+ omodel.HContractTransportBillNo = SafeConvertToString(row["HContractTransportBillNo"]);
+ omodel.HCarNumber = SafeConvertToString(row["HCarNumber"]);
+ omodel.HGetTime = SafeConvertToDateTime(row["HGetTime"], DateTime.Now);
+
+ // 缁忕含搴﹀瓧娈�
+ omodel.HLongitude = row["HLongitude"] == DBNull.Value ? (decimal?)null : SafeConvertToDecimal(row["HLongitude"]);
+ omodel.HLatitude = row["HLatitude"] == DBNull.Value ? (decimal?)null : SafeConvertToDecimal(row["HLatitude"]);
+
+ omodel.HItemMainID = SafeConvertToInt(row["HItemMainID"]);
+
+ // 鏌ヨ瀛愯〃
+ DataSet DsSub = oCn.RunProcReturn("SELECT * FROM Cg_CarTrajectoryBillSub WHERE HInterID = " +
+ omodel.HInterID.ToString() + " ORDER BY HEntryID", "Cg_CarTrajectoryBillSub");
+
+ DetailColl.Clear();
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsCg_CarTrajectoryBillSub oSub = new Model.ClsCg_CarTrajectoryBillSub();
+ DataRow subRow = DsSub.Tables[0].Rows[i];
+
+ // 浣跨敤瀹夊叏杞崲
+ oSub.HInterID = SafeConvertToInt(subRow["HInterID"]);
+ oSub.HBillNo_bak = SafeConvertToString(subRow["HBillNo_bak"]);
+ oSub.HEntryID = SafeConvertToInt(subRow["HEntryID"]);
+ oSub.HCloseMan = SafeConvertToString(subRow["HCloseMan"]);
+ oSub.HEntryCloseDate = SafeConvertToDateTime(subRow["HEntryCloseDate"], DateTime.Now); // 绗�404琛屼慨澶�
+ oSub.HCloseType = SafeConvertToBool(subRow["HCloseType"]);
+ oSub.HRemark = SafeConvertToString(subRow["HRemark"]);
+ oSub.HSourceInterID = SafeConvertToInt(subRow["HSourceInterID"]);
+ oSub.HSourceEntryID = SafeConvertToInt(subRow["HSourceEntryID"]);
+ oSub.HSourceBillNo = SafeConvertToString(subRow["HSourceBillNo"]);
+ oSub.HSourceBillType = SafeConvertToString(subRow["HSourceBillType"]);
+ oSub.HRelationQty = SafeConvertToDecimal(subRow["HRelationQty"]);
+ oSub.HRelationMoney = SafeConvertToDecimal(subRow["HRelationMoney"]);
+ oSub.HItemSubID = SafeConvertToInt(subRow["HItemSubID"]);
+
+ DetailColl.Add(oSub);
+ }
+
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = $"鏄剧ず鍗曟嵁澶辫触锛佸崟鎹甀D: {lngBillKey}锛岄敊璇�: {e.Message}";
+ throw;
+ }
+ }
+
+
+ // 瀹夊叏杞崲杈呭姪鏂规硶 - 娣诲姞鍒� ClsCg_CarTrajectoryBill 绫讳腑
+
+ #region 瀹夊叏杞崲鏂规硶
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓烘暣鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鏁存暟锛岃浆鎹㈠け璐ヨ繑鍥�0</returns>
+ private int SafeConvertToInt(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return 0;
+
+ try
+ {
+ return Convert.ToInt32(value);
+ }
+ catch
+ {
+ // 濡傛灉杞崲澶辫触锛屽皾璇曞瓧绗︿覆瑙ｆ瀽
+ int result;
+ if (int.TryParse(value.ToString(), out result))
+ return result;
+
+ return 0; // 榛樿鍊�
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌烘暣鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖鏁存暟锛岃浆鎹㈠け璐ヨ繑鍥瀗ull</returns>
+ private int? SafeConvertToNullableInt(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ return Convert.ToInt32(value);
+ }
+ catch
+ {
+ int result;
+ if (int.TryParse(value.ToString(), out result))
+ return result;
+
+ return null; // 杞崲澶辫触杩斿洖null
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄瓧绗︿覆
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑瀛楃涓诧紝杞崲澶辫触杩斿洖绌哄瓧绗︿覆</returns>
+ private string SafeConvertToString(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return string.Empty;
+
+ try
+ {
+ return value.ToString().Trim();
+ }
+ catch
+ {
+ return string.Empty;
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌烘棩鏈熸椂闂�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖鏃ユ湡鏃堕棿锛岃浆鎹㈠け璐ヨ繑鍥瀗ull</returns>
+ private DateTime? SafeConvertToNullableDateTime(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ return Convert.ToDateTime(value);
+ }
+ catch
+ {
+ // 灏濊瘯瀛楃涓茶В鏋�
+ DateTime result;
+ if (DateTime.TryParse(value.ToString(), out result))
+ return result;
+
+ return null; // 鎵�鏈夊皾璇曢兘澶辫触
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓烘棩鏈熸椂闂�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <param name="defaultValue">榛樿鍊�</param>
+ /// <returns>杞崲鍚庣殑鏃ユ湡鏃堕棿锛岃浆鎹㈠け璐ヨ繑鍥為粯璁ゅ��</returns>
+ private DateTime SafeConvertToDateTime(object value, DateTime defaultValue)
+ {
+ DateTime? result = SafeConvertToNullableDateTime(value);
+ return result ?? defaultValue;
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄皬鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑灏忔暟锛岃浆鎹㈠け璐ヨ繑鍥�0</returns>
+ private decimal SafeConvertToDecimal(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return 0m;
+
+ try
+ {
+ return Convert.ToDecimal(value);
+ }
+ catch
+ {
+ decimal result;
+ if (decimal.TryParse(value.ToString(), out result))
+ return result;
+
+ return 0m; // 榛樿鍊�
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌哄皬鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖灏忔暟锛岃浆鎹㈠け璐ヨ繑鍥瀗ull</returns>
+ private decimal? SafeConvertToNullableDecimal(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ return Convert.ToDecimal(value);
+ }
+ catch
+ {
+ decimal result;
+ if (decimal.TryParse(value.ToString(), out result))
+ return result;
+
+ return null; // 杞崲澶辫触杩斿洖null
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄竷灏斿��
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑甯冨皵鍊硷紝杞崲澶辫触杩斿洖false</returns>
+ private bool SafeConvertToBool(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return false;
+
+ try
+ {
+ // 澶勭悊鏁版嵁搴� BIT 绫诲瀷
+ if (value is bool)
+ return (bool)value;
+
+ if (value is int)
+ return ((int)value) != 0;
+
+ if (value is string)
+ {
+ string strValue = ((string)value).ToLower().Trim();
+ return strValue == "1" || strValue == "true" || strValue == "t" || strValue == "鏄�";
+ }
+
+ // 鏈�鍚庡皾璇曢�氱敤杞崲
+ return Convert.ToBoolean(value);
+ }
+ catch
+ {
+ return false; // 榛樿鍊�
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌哄竷灏斿��
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖甯冨皵鍊硷紝杞崲澶辫触杩斿洖null</returns>
+ private bool? SafeConvertToNullableBool(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ if (value is bool)
+ return (bool)value;
+
+ if (value is int)
+ {
+ int intValue = (int)value;
+ if (intValue == 0) return false;
+ if (intValue == 1) return true;
+ return null; // 鏃犳晥鐨勫竷灏斿��
+ }
+
+ if (value is string)
+ {
+ string strValue = ((string)value).ToLower().Trim();
+ if (strValue == "0" || strValue == "false" || strValue == "f" || strValue == "鍚�") return false;
+ if (strValue == "1" || strValue == "true" || strValue == "t" || strValue == "鏄�") return true;
+ return null; // 鏃犳晥鐨勫竷灏斿��
+ }
+
+ bool result = Convert.ToBoolean(value);
+ return result;
+ }
+ catch
+ {
+ return null; // 杞崲澶辫触杩斿洖null
+ }
+ }
+
+ #endregion
+ // 鑾峰彇鏂扮殑HInterID
+
+
+ // 鍒ゆ柇鍗曟嵁鍙锋槸鍚﹀瓨鍦�
+ public override bool IsExistBillNo(ref string sReturn, string sBillNo, DBUtility.ClsPub.Enum_BillStatus eBillStatus, Int64 lngMainID)
+ {
+ try
+ {
+ string sql = "SELECT COUNT(*) AS CNT FROM Cg_CarTrajectoryBillMain WHERE HBillNo = '" + sBillNo + "'";
+ if (lngMainID > 0)
+ {
+ sql += " AND HInterID <> " + lngMainID.ToString();
+ }
+
+ DataSet ds = oCn.RunProcReturn(sql, "CheckBillNo");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ int count = Convert.ToInt32(ds.Tables[0].Rows[0]["CNT"]);
+ return count > 0;
+ }
+ return false;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ return false;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index c0e8971..c975b54 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 0c0f430..2a5065e 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 166551e..2c076a2 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 c83301d..38514f4 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 56f8a2e..54c8d41 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 fcbe898..5b51a10 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 638a1a3..c4d7aa5 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 895e592..34e8ad4 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 347ba36..9defb58 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 0adc8ce..46fea9f 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 306da35..4c7fcb5 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 76eae00..b10307a 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 166551e..2c076a2 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 c83301d..38514f4 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 638a1a3..c4d7aa5 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 895e592..34e8ad4 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 347ba36..9defb58 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 0adc8ce..46fea9f 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 306da35..4c7fcb5 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 76eae00..b10307a 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index a04540c..f5e894a 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 8282016..4f7ae16 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 166551e..2c076a2 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 c83301d..38514f4 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index efadc9e..ad490be 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -124,6 +124,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectMoneyClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairCheckClass_Model.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillMain.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 166551e..2c076a2 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 c83301d..38514f4 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 56f8a2e..54c8d41 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 fcbe898..5b51a10 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 638a1a3..c4d7aa5 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 895e592..34e8ad4 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 347ba36..9defb58 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 0adc8ce..46fea9f 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 306da35..4c7fcb5 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 76eae00..b10307a 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 7304806..f5e894a 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 56f8a2e..54c8d41 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 fcbe898..5b51a10 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillMain.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillMain.cs"
new file mode 100644
index 0000000..34f5d7e
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillMain.cs"
@@ -0,0 +1,72 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCg_CarTrajectoryBillMain
+ {
+ // 鍩烘湰鍗曟嵁淇℃伅
+ public int ?HYear { get; set; } // 骞翠唤
+ public int ?HPeriod { get; set; } // 鏈堜唤
+ public string HBillType { get; set; } // 鍗曟嵁绫诲瀷
+ public string HBillSubType { get; set; } // 鍗曟嵁瀛愮被鍨�
+ public int HInterID { get; set; } // 鍗曟嵁鍐呯爜锛堜富閿級
+ public DateTime?HDate { get; set; } // 鏃ユ湡
+ public string HBillNo { get; set; } // 鍗曟嵁鍙�
+ public int HBillStatus { get; set; } // 鍗曟嵁鐘舵��
+
+ // 瀹℃壒娴佺▼鐩稿叧
+ public int HCheckItemNowID { get; set; } // 褰撳墠瀹℃牳椤圭洰
+ public int HCheckItemNextID { get; set; } // 寰呭鏍搁」鐩�
+ public int HCheckFlowID { get; set; } // 瀹℃壒娴�
+ public string HRemark { get; set; } // 澶囨敞
+
+ // 瀹℃牳閫�鍥炵浉鍏�
+ public string HBacker { get; set; } // 閫�鍥炰汉
+ public DateTime? HBackDate { get; set; } // 閫�鍥炴棩鏈�
+ public string HBackRemark { get; set; } // 閫�鍥炲師鍥�
+
+ // 瀹℃牳鐩稿叧
+ public string HChecker { get; set; } // 瀹℃牳浜�
+ public DateTime? HCheckDate { get; set; } // 瀹℃牳鏃ユ湡
+
+ // 鍒跺崟鐩稿叧
+ public string HMaker { get; set; } // 鍒跺崟浜�
+ public DateTime? HMakeDate { get; set; } // 鍒跺崟鏃ユ湡
+
+ // 淇敼鐩稿叧
+ public string HUpDater { get; set; } // 淇敼浜�
+ public DateTime? HUpDateDate { get; set; } // 淇敼鏃ユ湡
+
+ // 鍏抽棴鐩稿叧
+ public string HCloseMan { get; set; } // 鍏抽棴浜�
+ public DateTime? HCloseDate { get; set; } // 鍏抽棴鏃ユ湡
+ public bool HCloseType { get; set; } // 鍏抽棴绫诲瀷
+
+ // 浣滃簾鐩稿叧
+ public string HDeleteMan { get; set; } // 浣滃簾浜�
+ public DateTime? HDeleteDate { get; set; } // 浣滃簾鏃ユ湡
+
+ // 婧愬崟淇℃伅锛堢晫闈笉鏄剧ず锛�
+ public string HMainSourceBillType { get; set; } // 婧愬崟绫诲瀷
+ public int? HMainSourceInterID { get; set; } // 婧愬崟涓诲唴鐮�
+ public int? HMainSourceEntryID { get; set; } // 婧愬崟瀛愬唴鐮�
+ public string HMainSourceBillNo { get; set; } // 婧愬崟鍙�
+
+ // 鍏朵粬
+ public int HPrintQty { get; set; } // 鎵撳嵃娆℃暟
+
+ // 鑷畾涔夊瓧娈碉紙杞﹁締杞ㄨ抗涓撶敤锛�
+ public int? HContractTransportBillMainID { get; set; } // 杩愬崟涓诲唴鐮�
+ public string HContractTransportBillNo { get; set; } // 杩愬崟鍙�
+ public string HCarNumber { get; set; } // 杞︾墝鍙�
+ public DateTime?HGetTime { get; set; } // 杞ㄨ抗鑾峰彇鏃堕棿
+ public decimal? HLongitude { get; set; } // 缁忓害
+ public decimal? HLatitude { get; set; } // 绾害
+
+ // 鑷鍒�
+ public int HItemMainID { get; set; } // 鑷鍒�
+
+ }
+}
\ No newline at end of file
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillSub.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillSub.cs"
new file mode 100644
index 0000000..e22778d
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillSub.cs"
@@ -0,0 +1,36 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCg_CarTrajectoryBillSub
+ {
+ // 鍏宠仈涓昏〃
+ public int HInterID { get; set; } // 涓诲唴鐮�
+ public string HBillNo_bak { get; set; } // 鍗曟嵁鍙凤紙澶囦唤锛�
+
+ // 瀛愯〃淇℃伅
+ public int HEntryID { get; set; } // 瀛愬唴鐮�
+
+ // 琛屽叧闂浉鍏�
+ public string HCloseMan { get; set; } // 琛屽叧闂汉
+ public DateTime HEntryCloseDate { get; set; } // 琛屽叧闂棩鏈�
+ public bool HCloseType { get; set; } // 鍏抽棴绫诲瀷
+
+ // 澶囨敞
+ public string HRemark { get; set; } // 琛ㄤ綋澶囨敞
+
+ // 婧愬崟淇℃伅
+ public int HSourceInterID { get; set; } // 婧愬崟ID
+ public int HSourceEntryID { get; set; } // 婧愬崟瀛怚D
+ public string HSourceBillNo { get; set; } // 婧愬崟鍗曞彿
+ public string HSourceBillType { get; set; } // 婧愬崟绫诲瀷
+ public decimal HRelationQty { get; set; } // 鍏宠仈鏁伴噺
+ public decimal HRelationMoney { get; set; } // 鍏宠仈閲戦
+
+ // 鑷鍒�
+ public int HItemSubID { get; set; } // 鑷鍒�
+
+ }
+}
\ No newline at end of file
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 638a1a3..c4d7aa5 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 895e592..34e8ad4 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/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 638a1a3..c4d7aa5 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 895e592..34e8ad4 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 347ba36..9defb58 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 0adc8ce..46fea9f 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 638a1a3..c4d7aa5 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 895e592..34e8ad4 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 306da35..4c7fcb5 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 76eae00..b10307a 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 87f69ee..f5e894a 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 306da35..4c7fcb5 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 76eae00..b10307a 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
deleted file mode 100644
index 5a8bdc7..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 532bb24..3a96445 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -32,7 +32,6 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
diff --git a/WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs b/WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs
new file mode 100644
index 0000000..5390bf3
--- /dev/null
+++ b/WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs
@@ -0,0 +1,949 @@
+锘縰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;
+using SyntacticSugar.constant;
+
+namespace WebAPI.Controllers
+{
+ public class Cg_CarTrajectoryBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "1119"; // 鍗曟嵁绫诲瀷浠ｇ爜
+ public const string ModCaption = "杞﹁締杞ㄨ抗鍗曟嵁"; // 鍗曟嵁鍚嶇О
+ public const string ModRightName = "Cg_CarTrajectoryBill";
+ public const string ModRightNameQuery = ModRightName + "_Query"; // 鏌ヨ鏉冮檺
+ public const string ModRightNameEdit = ModRightName + "_Edit"; // 缂栬緫鏉冮檺
+ public const string ModRightNameCheck = ModRightName + "_Check"; // 瀹℃牳鏉冮檺
+ public const string ModRightNameClose = ModRightName + "_Close"; // 鍏抽棴鏉冮檺
+ public const string ModRightNameDelete = ModRightName + "_Delete"; // 浣滃簾鏉冮檺
+ public const string ModRightNameDrop = ModRightName + "_Drop"; // 鍒犻櫎鏉冮檺
+
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsCg_CarTrajectoryBill oBill = new DAL.ClsCg_CarTrajectoryBill();
+ public DAL.ClsCg_CarTrajectoryBill BillNew = new DAL.ClsCg_CarTrajectoryBill(); // 瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsCg_CarTrajectoryBill BillOld = new DAL.ClsCg_CarTrajectoryBill(); // 瀵瑰簲鍗曟嵁绫�
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); // 鑾峰彇绯荤粺鍙傛暟
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍒楄〃
+ /// <summary>
+ /// 鑾峰彇杞﹁締杞ㄨ抗鍗曟嵁鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/GetCg_CarTrajectoryBillList")]
+ [HttpGet]
+ public object GetCg_CarTrajectoryBillList(string sWhere, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameQuery, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("SELECT * FROM h_v_Cg_CarTrajectoryBillMainList WHERE 1=1 " + sWhere + " ORDER BY HInterID DESC", "h_v_Cg_CarTrajectoryBillMainList");
+
+ List<object> columnNameList = new List<object>();
+ // 娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎杞﹁締杞ㄨ抗鍗曟嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/DeleteCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object DeleteCg_CarTrajectoryBill(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // 鍒犻櫎鍓嶆帶鍒�
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_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;
+ }
+
+ // 鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍒嗛〉鍒楄〃
+ [Route("Cg_CarTrajectoryBill/GetCg_CarTrajectoryBillList_Page")]
+ [HttpGet]
+ public json GetCg_CarTrajectoryBillList_Page(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameQuery, 3, false, user))
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ res.data = null;
+ return res;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Cg_CarTrajectoryBillList " + page + "," + size + ",''", "h_p_Cg_CarTrajectoryBillList");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Cg_CarTrajectoryBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_CarTrajectoryBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ 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 杞﹁締杞ㄨ抗鍗曟嵁瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍歌溅杈嗚建杩瑰崟鎹�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/AuditCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object AuditCg_CarTrajectoryBill(Int64 HInterID, int IsAudit, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsCg_CarTrajectoryBill oBill = new DAL.ClsCg_CarTrajectoryBill();
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // IsAudit 1 瀹℃牳 2 鍙嶅鏍�
+ if (IsAudit == 1)
+ {
+ // 瀹℃牳鍓嶆鏌�
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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;
+ }
+
+ // 瀹℃牳鍓嶆帶鍒�
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_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(HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else // 鍙嶅鏍�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶅鏍稿墠鎺у埗
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_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;
+ }
+
+ // 鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂溅杈嗚建杩瑰崟鎹�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/CloseCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object CloseCg_CarTrajectoryBill(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ 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 (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else // 鍙嶅叧闂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐ワ紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴鎴栧弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴熻溅杈嗚建杩瑰崟鎹�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/DropCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object DropCg_CarTrajectoryBill(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.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;
+ }
+
+ // 浣滃簾鍓嶆帶鍒�
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeDropCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeDropCtrl");
+
+ 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.Cancelltion(HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterDropCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else // 鍙嶄綔搴�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶄綔搴熷墠鎺у埗
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeUnDropCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeUnDropCtrl");
+
+ 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.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterUnDropCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐ワ紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾鎴栧弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁缂栬緫
+ /// <summary>
+ /// 杞﹁締杞ㄨ抗鍗曟嵁缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/EditCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object EditCg_CarTrajectoryBill(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 杩斿洖缂栬緫淇℃伅
+ ds = oCn.RunProcReturn("SELECT * FROM h_v_Cg_CarTrajectoryBillMainEdit WHERE 鍗曟嵁鍐呯爜 = " + HInterID, "h_v_Cg_CarTrajectoryBillMainEdit");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖杞﹁締杞ㄨ抗鍗曟嵁淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁 鏂板
+ [Route("Cg_CarTrajectoryBill/SaveCg_CarTrajectoryBill")]
+ [HttpPost]
+ public object SaveCg_CarTrajectoryBill([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(); // 鎿嶄綔鏂瑰紡锛欰dd娣诲姞 Update淇敼
+ string msg4 = sArray[3].ToString(); // 鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ // 缂栬緫鏉冮檺妫�鏌�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameEdit, 3, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsCg_CarTrajectoryBill oBill = new DAL.ClsCg_CarTrajectoryBill();
+ List<Model.ClsCg_CarTrajectoryBillMain> lsmain = new List<Model.ClsCg_CarTrajectoryBillMain>();
+
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_ClsCg_CarTrajectoryBillMain(msg2);
+
+ foreach (Model.ClsCg_CarTrajectoryBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ // 鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.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 = "CT";
+ oItem.HBillSubType = "CT";
+ oItem.HYear = DateTime.Now.Year;
+ oItem.HPeriod = DateTime.Now.Month;
+ oItem.HMakeDate = DateTime.Now;
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ oBill.omodel = oItem;
+ }
+
+ // 琛ㄤ綋鏁版嵁澶勭悊锛堝鏋滈渶瑕侊級
+ if (!string.IsNullOrEmpty(msg3) && msg3 != "[]")
+ {
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", "");
+
+ List<Model.ClsCg_CarTrajectoryBillSub> ls = new List<Model.ClsCg_CarTrajectoryBillSub>();
+ ls = oListModels.getObjectByJson_ClsCg_CarTrajectoryBillSub(msg3);
+
+ int i = 0;
+ foreach (Model.ClsCg_CarTrajectoryBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; // 鍏抽棴绫诲瀷
+ oBill.DetailColl.Add(oItemSub);
+ }
+ }
+
+ // 淇濆瓨鍗曟嵁
+ 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)
+ {
+ // 鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); // 杩斿洖涓籌D
+
+ //// 绯荤粺鍙傛暟 - 鑷姩瀹℃牳
+ //string sReturn = "";
+ //if (oSystemParameter.ShowBill(ref sReturn) == true)
+ //{
+ // // 杩欓噷闇�瑕佹牴鎹疄闄呯郴缁熷弬鏁伴厤缃�
+ // if (oSystemParameter.omodel.Cg_CarTrajectoryBill_AutoCheck == "Y") // 绯荤粺鍙傛暟 鑷姩瀹℃牳
+ // {
+ // objJsonResult.Verify = "Y";
+ // }
+ // else
+ // {
+ // objJsonResult.Verify = "N";
+ // }
+ //}
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); // 杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
+ 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
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index ddfa10a..0e39a7e 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -4746,6 +4746,33 @@
}
#endregion
+ #region 杞﹁締杞ㄨ抗鍗曟嵁
+ /// <summary>
+ /// 杞﹁締杞ㄨ抗鍗曟嵁涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_CarTrajectoryBillMain> getObjectByJson_ClsCg_CarTrajectoryBillMain(string jsonString)
+ {
+ // 鎸夌収鎮ㄧ殑妯″紡锛屾坊鍔犳柟鎷彿鍖呰
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_CarTrajectoryBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_CarTrajectoryBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 杞﹁締杞ㄨ抗鍗曟嵁瀛愯〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_CarTrajectoryBillSub> getObjectByJson_ClsCg_CarTrajectoryBillSub(string jsonString)
+ {
+ // 鎸夌収鎮ㄧ殑妯″紡锛屾坊鍔犳柟鎷彿鍖呰
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_CarTrajectoryBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_CarTrajectoryBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
#region 鎺掍骇閿佸畾鐢宠鍗�
/// <summary>
/// 鎺掍骇閿佸畾鐢宠鍗曚富琛╦son
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 8ea1add..0be7814 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
- <History>True|2025-12-11T08:34:18.2286479Z;True|2025-12-11T16:25:03.6684824+08:00;True|2025-12-11T15:19:27.7542472+08:00;True|2025-12-11T15:09:46.6354048+08:00;True|2025-12-11T11:12:05.6798003+08:00;True|2025-12-11T10:32:15.1262803+08:00;True|2025-12-11T10:14:58.6988444+08:00;True|2025-12-11T09:46:20.5053893+08:00;True|2025-12-11T09:37:47.2905248+08:00;True|2025-12-11T09:01:44.3527409+08:00;False|2025-12-11T08:54:26.1829984+08:00;True|2025-12-11T08:44:02.1955946+08:00;True|2025-12-11T08:42:19.6321305+08:00;True|2025-12-11T08:29:21.8963360+08:00;True|2025-12-11T08:01:49.9994713+08:00;True|2025-12-11T07:54:24.8110893+08:00;True|2025-12-11T07:51:49.1569200+08:00;False|2025-12-11T07:51:35.2583285+08:00;True|2025-12-10T16:51:17.2118031+08:00;True|2025-12-10T16:38:42.2021141+08:00;True|2025-12-10T16:28:59.3351097+08:00;False|2025-12-10T16:25:39.0701282+08:00;True|2025-12-10T13:48:18.2826625+08:00;True|2025-12-10T13:13:33.8087883+08:00;False|2025-12-10T13:07:58.6662619+08:00;True|2025-12-10T13:01:57.0050047+08:00;True|2025-12-10T11:27:30.1389865+08:00;True|2025-12-10T11:18:54.9338464+08:00;True|2025-12-10T11:11:10.4500171+08:00;True|2025-12-10T11:06:30.2945401+08:00;True|2025-12-10T11:03:56.4911771+08:00;True|2025-12-10T11:01:40.0726896+08:00;True|2025-12-10T10:59:59.0524547+08:00;True|2025-12-10T10:58:36.1532569+08:00;True|2025-12-10T10:55:58.0328508+08:00;True|2025-12-10T10:55:38.9128685+08:00;False|2025-12-10T10:54:42.0747084+08:00;False|2025-12-10T10:54:32.9305200+08:00;True|2025-12-10T09:42:35.6599111+08:00;True|2025-12-10T09:39:42.3067823+08:00;True|2025-12-10T09:18:03.8247860+08:00;True|2025-12-10T09:07:40.9609222+08:00;False|2025-12-10T09:04:41.3274271+08:00;False|2025-12-10T09:04:35.4614345+08:00;False|2025-12-10T09:04:28.5108048+08:00;True|2025-12-10T08:43:42.5026624+08:00;False|2025-12-10T08:43:05.0557534+08:00;True|2025-12-10T08:03:05.3393161+08:00;False|2025-12-10T08:02:51.6498739+08:00;True|2025-12-09T15:44:41.4253971+08:00;True|2025-12-09T15:22:38.7362157+08:00;True|2025-12-09T14:44:20.3719785+08:00;True|2025-12-09T14:42:54.3480629+08:00;True|2025-12-09T14:33:45.5473815+08:00;True|2025-12-09T11:24:53.4316326+08:00;True|2025-12-09T09:12:42.1851533+08:00;True|2025-12-09T08:51:41.5250104+08:00;True|2025-12-09T08:50:16.5728922+08:00;</History>
+ <History>True|2025-12-23T02:24:35.4754773Z;True|2025-12-23T10:17:44.1961719+08:00;True|2025-12-23T10:08:39.7701021+08:00;True|2025-12-23T09:51:53.3364693+08:00;True|2025-12-23T09:36:04.2616368+08:00;True|2025-12-23T09:06:46.1666847+08:00;True|2025-12-23T09:05:33.2687731+08:00;True|2025-12-23T08:56:18.6678340+08:00;True|2025-12-23T08:46:18.9952807+08:00;False|2025-12-23T08:39:59.0144170+08:00;True|2025-12-22T18:00:47.7249009+08:00;True|2025-12-22T17:57:38.5478545+08:00;False|2025-12-22T17:57:16.3832026+08:00;True|2025-12-22T17:00:33.5665247+08:00;True|2025-12-22T16:57:25.0555116+08:00;True|2025-12-22T16:53:44.1106242+08:00;True|2025-12-22T16:44:24.1864298+08:00;True|2025-12-22T16:33:59.7444130+08:00;True|2025-12-22T16:28:42.7442168+08:00;True|2025-12-22T16:23:53.9420059+08:00;True|2025-12-22T15:44:01.8406153+08:00;True|2025-12-22T15:36:15.8542845+08:00;True|2025-12-22T15:07:14.4064973+08:00;True|2025-12-22T13:44:39.1483456+08:00;True|2025-12-22T12:35:53.7951228+08:00;True|2025-12-22T11:25:41.6070045+08:00;True|2025-12-22T11:22:53.7625130+08:00;True|2025-12-22T11:14:59.7419708+08:00;True|2025-12-22T11:12:31.7769783+08:00;True|2025-12-22T11:10:32.3218587+08:00;True|2025-12-22T11:07:07.1189966+08:00;True|2025-12-22T10:32:09.8822738+08:00;True|2025-12-22T10:19:35.9799201+08:00;True|2025-12-22T09:58:48.7158182+08:00;False|2025-12-22T09:58:23.6500441+08:00;True|2025-12-22T09:04:46.4351793+08:00;True|2025-12-22T09:02:18.3037006+08:00;False|2025-12-22T08:48:58.6740068+08:00;True|2025-12-21T14:27:49.3790838+08:00;False|2025-12-21T14:27:31.8942961+08:00;True|2025-12-20T21:37:58.5356880+08:00;False|2025-12-20T21:37:36.4615240+08:00;True|2025-12-19T16:20:56.4661781+08:00;True|2025-12-19T15:00:28.5376490+08:00;False|2025-12-19T15:00:00.2629357+08:00;True|2025-12-11T16:34:18.2286479+08:00;True|2025-12-11T16:25:03.6684824+08:00;True|2025-12-11T15:19:27.7542472+08:00;True|2025-12-11T15:09:46.6354048+08:00;True|2025-12-11T11:12:05.6798003+08:00;True|2025-12-11T10:32:15.1262803+08:00;True|2025-12-11T10:14:58.6988444+08:00;True|2025-12-11T09:46:20.5053893+08:00;True|2025-12-11T09:37:47.2905248+08:00;True|2025-12-11T09:01:44.3527409+08:00;False|2025-12-11T08:54:26.1829984+08:00;True|2025-12-11T08:44:02.1955946+08:00;True|2025-12-11T08:42:19.6321305+08:00;True|2025-12-11T08:29:21.8963360+08:00;True|2025-12-11T08:01:49.9994713+08:00;True|2025-12-11T07:54:24.8110893+08:00;True|2025-12-11T07:51:49.1569200+08:00;False|2025-12-11T07:51:35.2583285+08:00;True|2025-12-10T16:51:17.2118031+08:00;True|2025-12-10T16:38:42.2021141+08:00;True|2025-12-10T16:28:59.3351097+08:00;False|2025-12-10T16:25:39.0701282+08:00;True|2025-12-10T13:48:18.2826625+08:00;True|2025-12-10T13:13:33.8087883+08:00;False|2025-12-10T13:07:58.6662619+08:00;True|2025-12-10T13:01:57.0050047+08:00;True|2025-12-10T11:27:30.1389865+08:00;True|2025-12-10T11:18:54.9338464+08:00;True|2025-12-10T11:11:10.4500171+08:00;True|2025-12-10T11:06:30.2945401+08:00;True|2025-12-10T11:03:56.4911771+08:00;True|2025-12-10T11:01:40.0726896+08:00;True|2025-12-10T10:59:59.0524547+08:00;True|2025-12-10T10:58:36.1532569+08:00;True|2025-12-10T10:55:58.0328508+08:00;True|2025-12-10T10:55:38.9128685+08:00;False|2025-12-10T10:54:42.0747084+08:00;False|2025-12-10T10:54:32.9305200+08:00;True|2025-12-10T09:42:35.6599111+08:00;True|2025-12-10T09:39:42.3067823+08:00;True|2025-12-10T09:18:03.8247860+08:00;True|2025-12-10T09:07:40.9609222+08:00;False|2025-12-10T09:04:41.3274271+08:00;False|2025-12-10T09:04:35.4614345+08:00;False|2025-12-10T09:04:28.5108048+08:00;True|2025-12-10T08:43:42.5026624+08:00;False|2025-12-10T08:43:05.0557534+08:00;True|2025-12-10T08:03:05.3393161+08:00;False|2025-12-10T08:02:51.6498739+08:00;True|2025-12-09T15:44:41.4253971+08:00;True|2025-12-09T15:22:38.7362157+08:00;True|2025-12-09T14:44:20.3719785+08:00;True|2025-12-09T14:42:54.3480629+08:00;True|2025-12-09T14:33:45.5473815+08:00;True|2025-12-09T11:24:53.4316326+08:00;True|2025-12-09T09:12:42.1851533+08:00;True|2025-12-09T08:51:41.5250104+08:00;True|2025-12-09T08:50:16.5728922+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/10/2025 13:05:26</publishTime>
+ <publishTime>12/23/2025 10:24:27</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/10/2025 13:05:26</publishTime>
+ <publishTime>12/23/2025 10:24:27</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/10/2025 13:05:25</publishTime>
+ <publishTime>12/23/2025 10:24:25</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/10/2025 13:05:25</publishTime>
+ <publishTime>12/23/2025 10:24:25</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/19/2025 15:00:10</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/19/2025 15:00:10</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/10/2025 13:05:23</publishTime>
+ <publishTime>12/23/2025 09:35:51</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/10/2025 13:05:23</publishTime>
+ <publishTime>12/23/2025 09:35:51</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>11/12/2025 10:43:47</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:07</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:07</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/10/2025 13:05:19</publishTime>
+ <publishTime>12/12/2025 08:26:25</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/10/2025 13:05:19</publishTime>
+ <publishTime>12/12/2025 08:26:25</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/12/2025 08:26:28</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/12/2025 08:26:28</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/11/2025 16:34:14</publishTime>
+ <publishTime>12/23/2025 10:24:31</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/11/2025 16:34:14</publishTime>
+ <publishTime>12/23/2025 10:24:31</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/11/2025 16:34:17</publishTime>
+ <publishTime>12/23/2025 10:24:35</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -394,6 +394,9 @@
</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>
@@ -498,7 +501,7 @@
<publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/10/2025 13:13:33</publishTime>
+ <publishTime>12/19/2025 15:00:27</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 521bdd1..ea6762a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -474,6 +474,7 @@
<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
+ <Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index db86229..4ee9da7 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,5 +2,38 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <UseIISExpress>true</UseIISExpress>
+ <Use64BitIISExpress />
+ <IISExpressSSLPort />
+ <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
+ <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
+ <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
+ <UseGlobalApplicationHostFile />
+ <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1