From 30f332f62156d0e3460ed20a4865911f9a1912e6 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 17 十二月 2025 09:19:23 +0800
Subject: [PATCH] 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
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 2
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
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
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 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
Model/采购管理/ClsCg_OrderTransportBill_Model.cs | 60 ++
DBUtility/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Model/bin/Release/Pub_Control.dll | 0
Model/采购管理/ClsCg_OrderTransportBillSub_Model.cs | 29 +
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/ListModels.cs | 37 +
Pub_Control/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/DAL.csproj | 1
WebAPI/WebAPI.csproj | 2
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/Release/Pub_Control.pdb | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 2
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 31 +
SQLHelper/bin/Release/Pub_Class.pdb | 0
Model/Model.csproj | 3
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
Model/采购管理/ClsCg_OrderTransportBillSub_Money_Model.cs | 29 +
SQLHelper/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs | 926 ++++++++++++++++++++++++++++++++++++++++
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
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
DAL/采购管理/ClsCg_OrderTransportBill_Ctl.cs | 146 ++++++
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
DBUtility/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 58 +-
91 files changed, 1,300 insertions(+), 28 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index b83c3a2..b9d88ad 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 f81198b..27a99b1 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 95bd479..0d29c83 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 17245d0..67e0350 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 9a88809..da1a8af 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 ff03791..2c1b979 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 e0434b2..696ad59 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 cf93b03..fa8600e 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 a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 386d598..8bb1c35 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 1cfb712..0a1c141 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 f231b7f..cbd3f39 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 076a26a..4973c94 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..31414d2 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -746,6 +746,7 @@
<Compile Include="閲囪喘绠＄悊\ClsCg_InvoiceSpecBill.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBill_Ctl.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_POInStockBackBill.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 95bd479..0d29c83 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 17245d0..67e0350 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 9a88809..da1a8af 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 ff03791..2c1b979 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 e0434b2..696ad59 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 cf93b03..fa8600e 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 a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 386d598..8bb1c35 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 1cfb712..0a1c141 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 f231b7f..cbd3f39 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 076a26a..4973c94 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Ctl.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Ctl.cs"
new file mode 100644
index 0000000..a752139
--- /dev/null
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Ctl.cs"
@@ -0,0 +1,146 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DBUtility;
+
+namespace DAL
+{
+ public class ClsCg_OrderTransportBill_Ctl : ClsXt_BaseBill
+ {
+
+ public ClsCg_OrderTransportBill_Ctl()
+ {
+ base.MvarItemKeySub = "ClsCg_OrderTransportBillSub";
+ base.MvarItemKeySub2 = "ClsCg_OrderTransportBillSub_Money";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "ClsCg_OrderTransportBillMain";
+ base.MvarReportTitle = "杩愬崟鐢宠";
+ base.BillType = "1118";
+ base.HBillSubType = "1118";
+
+ }
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsCg_OrderTransportBill_Model oModel = new Model.ClsCg_OrderTransportBill_Model();
+ public Model.ClsCg_OrderTransportBillSub_Model oModel_Sub = new Model.ClsCg_OrderTransportBillSub_Model();
+ public Model.ClsCg_OrderTransportBillSub_Money_Model oModel_Sub_Money = new Model.ClsCg_OrderTransportBillSub_Money_Model();
+
+ public override bool DeleteBill(long lngBillKey, ref string sReturn)
+ {
+ return base.DeleteBill(lngBillKey, ref sReturn);
+ }
+
+ public override bool IsExistMainID(ref string sReturn, long lngBillKey, Pub_Class.ClsPub.Enum_BillStatus oBillStatus)
+ {
+ return base.IsExistMainID(ref sReturn, lngBillKey, oBillStatus);
+ }
+
+ public override bool IsExistBillNo(ref string sReturn, string sBillNo, Pub_Class.ClsPub.Enum_BillStatus oBillStatus, long lngBillKey)
+ {
+ return base.IsExistBillNo(ref sReturn, sBillNo, oBillStatus, lngBillKey);
+ }
+
+ public override bool ModifyBill(long lngBillKey, ref string sReturn)
+ {
+ return base.ModifyBill(lngBillKey, ref sReturn);
+ }
+
+ public override bool AddBill(ref string sReturn)
+ {
+ bool success = false;
+ // 娣诲姞涓昏〃
+ string sql = $@" Insert Into {MvarItemKey}
+ INSERT INTO BillMain (
+ 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, HItemMainID, HCusID, HStockOutBillMainID, HStockOutBillNo,
+ HSupID, HOrderBillNumber, HOrderType, HTransportType, HTransportMoney, HSendAddr,
+ HReceAddr, HGoodsVolume, HTakeGoodsTime, HArriveGoodsTime, HCarID, HDriverID,
+ HLoadRate, HOrderStatus
+ ) VALUES (
+ {oModel.HYear}, {oModel.HPeriod}, '{oModel.HBillType}', '{oModel.HBillSubType}', {oModel.HInterID}, '{oModel.HDate}', '{oModel.HBillNo}', {oModel.HBillStatus},
+ {oModel.HCheckItemNowID}, {oModel.HCheckItemNextID}, {oModel.HCheckFlowID}, '{oModel.HRemark}', '{oModel.HBacker}', '{oModel.HBackDate}', '{oModel.HBackRemark}',
+ '{oModel.HChecker}', '{oModel.HCheckDate}', '{oModel.HMaker}', '{oModel.HMakeDate}', '{oModel.HUpDater}', '{oModel.HUpDateDate}', '{oModel.HCloseMan}', '{oModel.HCloseDate}',
+ {oModel.HCloseType}, '{oModel.HDeleteMan}', '{oModel.HDeleteDate}', '{oModel.HMainSourceBillType}', {oModel.HMainSourceInterID}, {oModel.HMainSourceEntryID},
+ '{oModel.HMainSourceBillNo}', {oModel.HPrintQty}, {oModel.HItemMainID}, {oModel.HCusID}, {oModel.HStockOutBillMainID}, '{oModel.HStockOutBillNo}',
+ {oModel.HSupID}, '{oModel.HOrderBillNumber}', '{oModel.HOrderType}', '{oModel.HTransportType}', {oModel.HTransportMoney}, '{oModel.HSendAddr}',
+ '{oModel.HReceAddr}', {oModel.HGoodsVolume}, '{oModel.HTakeGoodsTime}', '{oModel.HArriveGoodsTime}', {oModel.HCarID}, {oModel.HDriverID},
+ {oModel.HLoadRate}, {oModel.HOrderStatus}
+ ";
+
+ oCn.RunProc(sql);
+ // 娣诲姞瀛愯〃
+ success = AddBillSub(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // 娣诲姞瀛愯〃-閲戦
+ success = AddBillSub_Money(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ return success;
+ }
+
+ public override bool ShowBill(long lngBillKey, ref string sReturn)
+ {
+ return base.ShowBill(lngBillKey, ref sReturn);
+ }
+
+ public override void DeleteRelation(ref string sReturn, long lngBillKey)
+ {
+ base.DeleteRelation(ref sReturn, lngBillKey);
+ }
+
+ public override void AddNewRelation(ref string sReturn, long lngBillKey)
+ {
+ base.AddNewRelation(ref sReturn, lngBillKey);
+ }
+
+ // 娣诲姞瀛愬崟鎹�
+ public bool AddBillSub(ref string sReturn)
+ {
+ string sql = $@"
+ INSERT INTO {MvarItemKeySub} (
+ HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType,
+ HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,
+ HRelationQty, HRelationMoney, HItemSubID, HMaterID, HVolume, HPack, HUnitID
+ ) VALUES (
+ {oModel_Sub.HInterID}, '{oModel_Sub.HBillNo_bak}', {oModel_Sub.HEntryID},
+ '{oModel_Sub.HCloseMan}', '{oModel_Sub.HEntryCloseDate}', {oModel_Sub.HCloseType},
+ '{oModel_Sub.HRemark}', {oModel_Sub.HSourceInterID}, {oModel_Sub.HSourceEntryID},
+ '{oModel_Sub.HSourceBillNo}', '{oModel_Sub.HSourceBillType}', {oModel_Sub.HRelationQty},
+ '{oModel_Sub.HRelationMoney}', {oModel_Sub.HItemSubID}, {oModel_Sub.HMaterID},
+ {oModel_Sub.HVolume}, '{oModel_Sub.HPack}', {oModel_Sub.HUnitID}
+ )
+ ";
+ oCn.RunProc(sql);
+
+ return true;
+ }
+
+ // 娣诲姞瀛愬崟鎹� 璐圭敤
+ public bool AddBillSub_Money(ref string sReturn)
+ {
+ string sql = $@"
+ INSERT INTO {MvarItemKeySub} (
+ HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType,
+ HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,
+ HRelationQty, HRelationMoney, HItemSubID, HMaterID, HVolume, HPack, HUnitID
+ ) VALUES (
+ {oModel_Sub.HInterID}, '{oModel_Sub.HBillNo_bak}', {oModel_Sub.HEntryID},
+ '{oModel_Sub.HCloseMan}', '{oModel_Sub.HEntryCloseDate}', {oModel_Sub.HCloseType},
+ '{oModel_Sub.HRemark}', {oModel_Sub.HSourceInterID}, {oModel_Sub.HSourceEntryID},
+ '{oModel_Sub.HSourceBillNo}', '{oModel_Sub.HSourceBillType}', {oModel_Sub.HRelationQty},
+ '{oModel_Sub.HRelationMoney}', {oModel_Sub.HItemSubID}, {oModel_Sub.HMaterID},
+ {oModel_Sub.HVolume}, '{oModel_Sub.HPack}', {oModel_Sub.HUnitID}
+ )
+ ";
+ oCn.RunProc(sql);
+
+ return true;
+ }
+ }
+}
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 9a88809..da1a8af 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 ff03791..2c1b979 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 a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 386d598..8bb1c35 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 1cfb712..0a1c141 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 f231b7f..cbd3f39 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 076a26a..4973c94 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 bac4e68..c078d28 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..5e8f145 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 9a88809..da1a8af 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 ff03791..2c1b979 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 f6f1c25..1880c81 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 efadc9e..6523c08 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -946,6 +946,9 @@
<Compile Include="閲囪喘绠＄悊\ClsCg_InvoiceSpecBillSub.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Money_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBill_Model.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_POInStockBackBillMain.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 9a88809..da1a8af 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 ff03791..2c1b979 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 e0434b2..696ad59 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 cf93b03..fa8600e 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 a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 386d598..8bb1c35 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 1cfb712..0a1c141 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 f231b7f..cbd3f39 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 076a26a..4973c94 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 f9a0d8a..db224d9 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 e0434b2..696ad59 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 cf93b03..fa8600e 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 caf75e6..6c55bdc 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/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Model.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Model.cs"
new file mode 100644
index 0000000..2812826
--- /dev/null
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Model.cs"
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using DBUtility;
+
+namespace Model
+{
+ public class ClsCg_OrderTransportBillSub_Model : ClsGy_Base_Model
+ {
+ 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; }
+ public int? HSourceEntryID { get; set; }
+ 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; }
+ public int? HMaterID { get; set; }
+ public decimal? HVolume { get; set; }
+ public string HPack { get; set; }
+ public int? HUnitID { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Money_Model.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Money_Model.cs"
new file mode 100644
index 0000000..9b0021e
--- /dev/null
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Money_Model.cs"
@@ -0,0 +1,29 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Model
+{
+ public class ClsCg_OrderTransportBillSub_Money_Model : ClsGy_Base_Model
+ {
+ 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; }
+ public int? HSourceEntryID { get; set; }
+ 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; }
+ public int? HMoneysItemID { get; set; }
+ public decimal? HMoneys { get; set; }
+ public string HPic { get; set; }
+ public DateTime? HLoadTime { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Model.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Model.cs"
new file mode 100644
index 0000000..99880fd
--- /dev/null
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Model.cs"
@@ -0,0 +1,60 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Model
+{
+ public class ClsCg_OrderTransportBill_Model : ClsGy_Base_Model
+ {
+ 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 HItemMainID { get; set; }
+ public int? HCusID { get; set; }
+ public int? HStockOutBillMainID { get; set; }
+ public string HStockOutBillNo { get; set; }
+ public int? HSupID { get; set; }
+ public string HOrderBillNumber { get; set; }
+ public string HOrderType { get; set; }
+ public string HTransportType { get; set; }
+ public decimal? HTransportMoney { get; set; }
+ public string HSendAddr { get; set; }
+ public string HReceAddr { get; set; }
+ public decimal? HGoodsVolume { get; set; }
+ public DateTime? HTakeGoodsTime { get; set; }
+ public DateTime? HArriveGoodsTime { get; set; }
+ public int? HCarID { get; set; }
+ public int? HDriverID { get; set; }
+ public decimal? HLoadRate { get; set; }
+ public int HOrderStatus { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 17069e8..48f07b9 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 386d598..8bb1c35 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 1cfb712..0a1c141 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 a90f8bf..7fdd8e7 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 48aa0de..26c8b0e 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 f231b7f..cbd3f39 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 076a26a..4973c94 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 5720bb0..8676f14 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 f231b7f..cbd3f39 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 076a26a..4973c94 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index ccb6a33..c1cb681 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 5f77762..d4f984c 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index ccb6a33..c1cb681 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 5f77762..d4f984c 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
index fea44e6..2b5225b 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs b/WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs
new file mode 100644
index 0000000..73705ef
--- /dev/null
+++ b/WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs
@@ -0,0 +1,926 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+using WebAPI.Service;
+
+namespace WebAPI.Controllers
+{
+ public class Cg_OrderTransportBillListController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ /// <summary>
+ /// 杩斿洖杩愬崟鐢宠鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cg_OrderTransportBill/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Query", 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_Cg_OrderTransportBillList where 1=1 order by hmainid ", "h_v_Cg_OrderTransportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cg_OrderTransportBillList where 1=1 ";
+ string sql = sql1 + sWhere + " order by hmainid";
+ ds = oCN.RunProcReturn(sql, "h_v_Cg_OrderTransportBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 杩愬崟鐢宠鍒楄〃-鍒嗛〉
+ [Route("Cg_OrderTransportBill/list_byPage")]
+ [HttpGet]
+ public object GetCarList_byPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Cg_OrderTransportBillListPage " + page + "," + size + "," + "''", "h_p_Cg_OrderTransportBillList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn("exec h_p_Cg_OrderTransportBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_OrderTransportBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇濆瓨 杩愬崟鐢宠淇℃伅
+ /// <summary>
+ /// 淇濆瓨杩愬崟鐢宠淇℃伅
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Cg_OrderTransportBill/SaveCg_OrderTransportBill")]
+ [HttpPost]
+ public object SaveCg_OrderTransportBill([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ string oprType = sArray[2].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ // DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Cg_OrderTransportBill ", "Cg_OrderTransportBill");
+ // if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ // {
+ // var maxid = 0;
+ // if (Maxds.Tables[0].Rows[0]["HItemID"] != DBNull.Value)
+ // {
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ // maxid += 1;
+ // }
+ //
+ // HItemID = maxid;
+ // }
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ List<Model.ClsCg_OrderTransportBill_Model> lsmain = new List<Model.ClsCg_OrderTransportBill_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Cg_OrderTransportBill(msg1);
+ foreach (Model.ClsCg_OrderTransportBill_Model oItem in lsmain)
+ {
+ //鏂板鏃跺垽鏂�
+ if (oprType == "1" || oprType == "2")
+ {
+ oItem.HMaker = msg2;//鍒涘缓浜�
+ }
+ else if(oprType == "3")//缂栬緫鏃跺垽鏂�
+ {
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Cg_OrderTransportBill where HItemID=" + oItem.HItemID, "Cg_OrderTransportBill");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oprType == "1" || oprType == "2")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if(oprType == "3")
+ {
+ oBill.oModel.HModifyEmp = msg2;
+ bResult = oBill.ModifyBill(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ throw new Exception("璇ュ崟鎹负娴忚鐘舵�侊紝涓嶅彲淇濆瓨");
+ }
+ 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 杩愬崟鐢宠瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Cg_OrderTransportBill/AuditCg_OrderTransportBill")]
+ [HttpGet]
+ public object AuditCg_OrderTransportBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ string sReturn = "";
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Cg_OrderTransportBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Cg_OrderTransportBillMain where HItemID=" + HInterID, "Cg_OrderTransportBill");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Cg_OrderTransportBill_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cg_OrderTransportBill_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;
+ }
+ //==================================================================================
+
+
+ oBill.CheckBill(HInterID, ref sReturn);
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Cg_OrderTransportBill_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Cg_OrderTransportBill_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Cg_OrderTransportBill_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cg_OrderTransportBill_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;
+ }
+ //==================================================================================
+
+ oBill.AbandonCheck(HInterID, ref sReturn);
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Cg_OrderTransportBill_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Cg_OrderTransportBill_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杩愬崟鐢宠鍗� 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("Cg_OrderTransportBill/DropCg_OrderTransportBill")]
+ [HttpGet]
+ public object DropCg_OrderTransportBill(string HInterID, int Type, string user)
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵枡閫氱煡鍗� 鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Cg_OrderTransportBill/CloseCg_OrderTransportBill")]
+ [HttpGet]
+ public object CloseCg_OrderTransportBill(string HInterID, int Type, string user)
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oBill.MvarItemKey = "Cg_OrderTransportBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂栬緫鏃惰繍鍗曠敵璇蜂俊鎭幏鍙�
+ [Route("Cg_OrderTransportBill/GetCg_OrderTransportBillDetail")]
+ [HttpGet]
+ public object GetCg_OrderTransportBillDetail(int HID)
+ {
+
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string sql1 = $@"select * from h_v_Cg_OrderTransportBillList where HItemID = {HID}";
+ ds = oCN.RunProcReturn(sql1, "h_v_Cg_OrderTransportBillList");
+ //娣诲姞鍒楀悕
+ 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("Cg_OrderTransportBill/Cg_OrderTransportBill_UploadFile")]
+ [HttpPost]
+ public object Cg_OrderTransportBill_UploadFile()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //杞︾墝鍙�
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Cg_OrderTransportBill/" + HBillNo);
+
+ dynamic dyResult = UpLoadFile(files, path, HBillNo, 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;
+ }
+
+ }
+ #endregion
+
+ public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, 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
+ 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/Cg_OrderTransportBill/" + 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(),'','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Cg_OrderTransportBill/" + 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(),'','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;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 0a0fcdf..7590cd2 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -304,7 +304,7 @@
}
#endregion
- #region [閫氳繃婧愬崟绫诲瀷鏌ユ壘涓嶅悓鍗曟嵁淇℃伅]
+ #region [閫氳繃婧愬崟绫诲瀷鏌ユ壘涓嶅悓鍗曟嵁淇℃伅] 浣跨敤鏂扮殑鍒嗛〉鏂瑰紡
[Route("Sc_BarCode/ReportFromBillList_New")]
[HttpGet]
public object ReportFromBillList_New(int page, int limit, string sWhere, string HSouceBillType, string HOrgID)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 34e16f8..759f597 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -13202,7 +13202,8 @@
}
#endregion
- //杞Щ妯″潡
+ #region 杞Щ妯″潡
+ // 杞Щ妯″潡
[Route("WEBSController/CheckHW")]
[HttpGet]
public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
@@ -13247,8 +13248,9 @@
return objJsonResult;
}
}
+ #endregion
- #region 鎯犲悍 鐢熶骇棰嗘枡鍗曟牎楠� 鎵弿婧愬崟 鑾峰彇鐢熶骇棰嗘枡鍗曞拰涓嬫父棰嗘枡鍗曟湭瀹℃牳 鍗曟嵁
+ #region 鎯犲悍 鐢熶骇棰嗘枡鍗曟牎楠� 鎵弿婧愬崟 鑾峰彇鐢熶骇棰嗘枡鍗曞拰涓嬫父棰嗘枡鍗曟湭瀹℃牳 鍗曟嵁
[Route("WEBSController/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
[HttpGet]
public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
@@ -13360,5 +13362,30 @@
#endregion
+
+ #region 妫�楠屽崟 鎵弿婧愬崟 鏍规嵁鍗曟嵁绫诲瀷 婧愬崟绫诲瀷 婧愬崟鍙� 瑙ｆ瀽骞惰繑鍥炴楠岄」鐩�
+ [Route("WEBSController/get_BillBarCode_Json_CheckItem")]
+ [HttpGet]
+ public Object get_BillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HSourceBillNo)
+ {
+ try
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "success锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index ddfa10a..6bcf816 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -5244,5 +5244,42 @@
List<ClsWW_EntrustOrderBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsWW_EntrustOrderBillMain_1>>(jsonString);
return list;
}
+
+ /// <summary>
+ /// 杩愬崟鐢宠 涓昏〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBill_Model> getObjectByJson_Cg_OrderTransportBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBill_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBill_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBillSub_Model> getObjectByJson_Cg_OrderTransportBill_Sub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBillSub_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 瀛愯〃 Money
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBillSub_Money_Model> getObjectByJson_Cg_OrderTransportBill_SubMoney(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBillSub_Money_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Money_Model>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index ab9c650..b0fc3b6 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-TM</_PublishTargetUrl>
- <History>False|2025-12-14T11:49:03.3551714Z;True|2025-12-09T08:45:50.1203655+08:00;True|2025-12-09T08:21:11.0727775+08:00;</History>
+ <History>False|2025-12-14T13:30:46.1937966Z;False|2025-12-14T19:49:03.3551714+08:00;True|2025-12-09T08:45:50.1203655+08:00;True|2025-12-09T08:21:11.0727775+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
index bc97764..44deb08 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-08-13T05:32:18.1126471Z;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
+ <History>True|2025-12-16T08:18:59.7366636Z;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/08/2025 13:13:07</publishTime>
+ <publishTime>12/16/2025 10:23:25</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/08/2025 13:13:07</publishTime>
+ <publishTime>12/16/2025 10:23:25</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/08/2025 13:13:05</publishTime>
+ <publishTime>12/16/2025 10:23:21</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/08/2025 13:13:05</publishTime>
+ <publishTime>12/16/2025 10:23:21</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/08/2025 13:13:01</publishTime>
+ <publishTime>12/14/2025 21:30:55</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/08/2025 13:13:01</publishTime>
+ <publishTime>12/14/2025 21:30:55</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>08/08/2025 13:13:02</publishTime>
+ <publishTime>12/16/2025 10:23:16</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/08/2025 13:13:02</publishTime>
+ <publishTime>12/16/2025 10:23:16</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/08/2025 13:12:59</publishTime>
+ <publishTime>12/14/2025 21:30:53</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/08/2025 13:12:59</publishTime>
+ <publishTime>12/14/2025 21:30:53</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/14/2025 21:30:54</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/14/2025 21:30:54</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/14/2025 21:30:54</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/14/2025 21:30:54</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>08/08/2025 10:08:01</publishTime>
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>08/08/2025 10:08:01</publishTime>
+ <publishTime>12/14/2025 21:28:19</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>08/08/2025 12:29:49</publishTime>
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/08/2025 12:29:52</publishTime>
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/13/2025 13:31:56</publishTime>
+ <publishTime>12/16/2025 16:18:41</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/13/2025 13:31:56</publishTime>
+ <publishTime>12/16/2025 16:18:41</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>08/13/2025 13:32:16</publishTime>
+ <publishTime>12/16/2025 16:18:58</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -331,6 +331,9 @@
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>04/21/2025 11:46:16</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -388,6 +391,15 @@
</File>
<File Include="packages.config">
<publishTime>04/21/2025 11:46:17</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/07/2025 12:01:10</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>08/29/2025 09:43:09</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>04/21/2025 11:46:17</publishTime>
@@ -495,7 +507,7 @@
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/13/2025 09:59:38</publishTime>
+ <publishTime>12/14/2025 21:32:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 521bdd1..ec812df 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -272,6 +272,7 @@
<Content Include="DLL\BLL.dll" />
<Content Include="DLL\DAL.dll" />
<Content Include="DLL\DBUtility.dll" />
+ <Content Include="DLL\Interop.grsvr6Lib.dll" />
<Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
<Content Include="DLL\Model.dll" />
<Content Include="DLL\Newtonsoft.Json.Net35.dll" />
@@ -429,6 +430,7 @@
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_OrderTransportBillListController.cs" />
<Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 3ec7013..c14c7de 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -12,7 +12,7 @@
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\WMES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile15.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile6.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index b61ec76..c842fb4 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 766275e..6a4fbce 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 6631c76..c842fb4 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 794dfe1..6a4fbce 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 203a45e..8286984 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.1