yusijie
2024-11-22 3697b0dda739b38c33406d6e164714167e9ad5b5
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
7个文件已删除
129个文件已修改
3个文件已添加
2005 ■■■■ 已修改文件
APSM/bin/Release/APSM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/APSM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BaseSet.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BaseSet.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/PlanM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/PlanM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WarM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WarM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WorkM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WorkM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BaseSet.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BaseSet.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/PayM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/PayM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/PlanM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/PlanM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/bin/Debug/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/bin/Debug/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/WarM.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/WarM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs 214 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs 192 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs 73 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs 525 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs 242 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user 168 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WarM.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WarM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WorkM.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WorkM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Release/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/APSM.dll
Binary files differ
APSM/bin/Release/APSM.pdb
Binary files differ
APSM/bin/Release/BLL.dll
Binary files differ
APSM/bin/Release/BLL.pdb
Binary files differ
APSM/bin/Release/BaseSet.dll
Binary files differ
APSM/bin/Release/BaseSet.pdb
Binary files differ
APSM/bin/Release/DAL.dll
Binary files differ
APSM/bin/Release/DAL.pdb
Binary files differ
APSM/bin/Release/Model.dll
Binary files differ
APSM/bin/Release/Model.pdb
Binary files differ
APSM/bin/Release/PlanM.dll
Binary files differ
APSM/bin/Release/PlanM.pdb
Binary files differ
APSM/bin/Release/WarM.dll
Binary files differ
APSM/bin/Release/WarM.pdb
Binary files differ
APSM/bin/Release/WorkM.dll
Binary files differ
APSM/bin/Release/WorkM.pdb
Binary files differ
BLL/bin/Release/BLL.dll
Binary files differ
BLL/bin/Release/BLL.pdb
Binary files differ
BLL/bin/Release/DAL.dll
Binary files differ
BLL/bin/Release/DAL.pdb
Binary files differ
BLL/bin/Release/Model.dll
Binary files differ
BLL/bin/Release/Model.pdb
Binary files differ
BaseSet/bin/Release/BLL.dll
Binary files differ
BaseSet/bin/Release/BLL.pdb
Binary files differ
BaseSet/bin/Release/BaseSet.dll
Binary files differ
BaseSet/bin/Release/BaseSet.pdb
Binary files differ
BaseSet/bin/Release/DAL.dll
Binary files differ
BaseSet/bin/Release/DAL.pdb
Binary files differ
BaseSet/bin/Release/Model.dll
Binary files differ
BaseSet/bin/Release/Model.pdb
Binary files differ
DAL/bin/Release/DAL.dll
Binary files differ
DAL/bin/Release/DAL.pdb
Binary files differ
DAL/bin/Release/Model.dll
Binary files differ
DAL/bin/Release/Model.pdb
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
Model/bin/Release/Model.dll
Binary files differ
Model/bin/Release/Model.pdb
Binary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
Model/obj/Release/Model.dll
Binary files differ
Model/obj/Release/Model.pdb
Binary files differ
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
PayM/bin/x86/Debug/BLL.dll
Binary files differ
PayM/bin/x86/Debug/BLL.pdb
Binary files differ
PayM/bin/x86/Debug/DAL.dll
Binary files differ
PayM/bin/x86/Debug/DAL.pdb
Binary files differ
PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
PayM/bin/x86/Debug/Model.dll
Binary files differ
PayM/bin/x86/Debug/Model.pdb
Binary files differ
PayM/bin/x86/Debug/PayM.dll
Binary files differ
PayM/bin/x86/Debug/PayM.pdb
Binary files differ
PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
PayM/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
76d6e649eaf418858fb80b047dbac5a1964f90f8
4af767f9af5d42f2c393c62e78567bbdb3e4f775
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -1672,7 +1672,6 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
PayM/obj/x86/Debug/PayM.dll
Binary files differ
PayM/obj/x86/Debug/PayM.pdb
Binary files differ
PlanM/bin/Release/BLL.dll
Binary files differ
PlanM/bin/Release/BLL.pdb
Binary files differ
PlanM/bin/Release/DAL.dll
Binary files differ
PlanM/bin/Release/DAL.pdb
Binary files differ
PlanM/bin/Release/Model.dll
Binary files differ
PlanM/bin/Release/Model.pdb
Binary files differ
PlanM/bin/Release/PlanM.dll
Binary files differ
PlanM/bin/Release/PlanM.pdb
Binary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,10 +1,15 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> 3a1239dbd6e9cce019acaae934f1675298ef8a06
SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
File was deleted
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
File was deleted
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
File was deleted
SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
WarM/bin/Release/BLL.dll
Binary files differ
WarM/bin/Release/BLL.pdb
Binary files differ
WarM/bin/Release/DAL.dll
Binary files differ
WarM/bin/Release/DAL.pdb
Binary files differ
WarM/bin/Release/Model.dll
Binary files differ
WarM/bin/Release/Model.pdb
Binary files differ
WarM/bin/Release/WarM.dll
Binary files differ
WarM/bin/Release/WarM.pdb
Binary files differ
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -166,11 +166,20 @@
                List<object> columnNameList = new List<object>();
                if (num=="1")
                {
                    ds = oCN.RunProcReturn("select b.HEquipFileNumber è®¾å¤‡ç¼–码,b.HName è®¾å¤‡åç§° from Sc_ICMOBillStatus_Tmp a left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID where HSourceInterID='" + linterid + "' and HProcID='85'", "Gy_EquipFileBillMain");
                    ds = oCN.RunProcReturn("select b.HEquipFileNumber è®¾å¤‡ç¼–码,b.HName è®¾å¤‡åç§°,c.HProjectNum é¡¹ç›®ç¼–号,d.HRelBeginDate å¼€å§‹æ—¶é—´,d.HRelEndDate ç»“束时间 from Sc_ICMOBillStatus_Tmp a " +
                        "left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID  " +
                        "left  join Sc_ProcessExchangeBillMain c on a.HSourceInterID=c.HInterID " +
                        "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and a.HSourceEntryID=d.HEntryID " +
                        "where a.HSourceInterID='" + linterid + "' and a.HProcID='85'", "Gy_EquipFileBillMain");
                }
                else if (num=="2")
                {
                    ds = oCN.RunProcReturn("SELECT ef.HEquipFileNumber AS è®¾å¤‡ç¼–码,ef.HName AS è®¾å¤‡åç§° FROM Gy_EquipFileBillMain ef JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID where HSourceInterID='" + linterid + "' and HProcID='186')", "Gy_EquipFileBillMain");
                    ds = oCN.RunProcReturn("SELECT ef1.HEquipFileNumber AS è®¾å¤‡ç¼–码,ef1.HName AS è®¾å¤‡åç§°,d.HRelBeginDate å¼€å§‹æ—¶é—´,d.HRelEndDate ç»“束时间 FROM Gy_EquipFileBillMain ef " +
                        "JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID " +
                        "left join Gy_EquipFileBillMain ef1 on ef1.HMainSourceID=ef.HInterID " +
                        "left  join Sc_ProcessExchangeBillMain c on tmp.HSourceInterID=c.HInterID " +
                        "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and tmp.HSourceEntryID=d.HEntryID " +
                        "where tmp.HSourceInterID='" + linterid + "' and tmp.HProcID='186'", "Gy_EquipFileBillMain");
                }
                //添加列名
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -2431,10 +2431,9 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核工艺路线失败!" + e.ToString();
                objJsonResult.Message = "驳回工艺路线失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
WebAPI/Controllers/LMESController.cs
@@ -3788,6 +3788,17 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //获取系统参数设置失效时间
                    string Ret = "";
                    if (oSystemParameter.ShowBill(ref Ret))
                    {
                        //判断客户
                        if (oSystemParameter.omodel.WMS_CampanyName == "添康科技") //系统参数
                        {
                            //刷新失效时间
                            oCN.RunProc("update Gy_RoutingBillMain set HEndDate = CONVERT(date, DATEADD(day, -1, GETDATE())) where HInterID = " + HInterID);
                        }
                    }
                }
                else
                {
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -86,6 +86,112 @@
        }
        #endregion
        #region è®¾å¤‡å·¥è‰ºå‚数分页查询
        [Route("SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBillList_Page")]
        [HttpGet]
        public object GetSB_EquipICMOTechParamBillList_Page(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameList, 3, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillListPage " + page + "," + size + ",''", "h_p_SB_EquipICMOTechParamBillListPage");
                }
                else
                {
                    ds = oCn.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_SB_EquipICMOTechParamBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡å·¥è‰ºå‚数明细行分页查询
        [Route("Sb_EquipStopBill/getSb_EquipStopBillListPage")]
        [HttpGet]
        public object Sb_EquipBeginBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("ModRightNameList", 3, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn("exec h_p_Sb_EquipStopBillMainListPage " + page + "," + size + ",''", "h_p_Sb_EquipStopBillMainListPage");
                }
                else
                {
                    ds = oCn.RunProcReturn("exec h_p_Sb_EquipStopBillMainListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipStopBillMainListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡å·¥è‰ºå‚数订单点检表删除
        /// <summary>
        /// åˆ é™¤è®¾å¤‡å·¥è‰ºå‚数订单点检表
WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
@@ -33,7 +33,7 @@
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Check", 1, false, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -67,6 +67,59 @@
                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("Sb_EquipBeginBill/getSb_EquipBeginBillListPage")]
        [HttpGet]
        public object Sb_EquipBeginBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipBeginBillMainListPage " + page + "," + size + ",''", "h_p_Sb_EquipBeginBillMainListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipBeginBillMainListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipBeginBillMainListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
@@ -748,7 +801,7 @@
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Check", 1, false, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -107,6 +107,59 @@
            }
        }
        #region è®¾å¤‡ç‚¹æ£€è®°å½•分页查询
        [Route("Sb_EquipDotCheckBill/GetEquipDotCheckBillListPage")]
        [HttpGet]
        public object GetEquipDotCheckBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipDotCheckBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheckBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipDotCheckBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheckBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipDotCheckBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region sql语句
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -90,6 +90,59 @@
            }
        }
        #region è®¾å¤‡ä¿å…»è®°å½•分页查询
        [Route("Sb_EquipMaintainBill/GetEquipMaintainBillListPage")]
        [HttpGet]
        public object GetEquipMaintainBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipMaintainBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sc_EquipMaintainListPage " + page + "," + size + ",''", "h_p_Sc_EquipMaintainListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sc_EquipMaintainListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_EquipMaintainListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡ä¿å…»è®°å½•统计分析 
        /// <summary>
        /// è¿”回设备保养记录统计分析 åˆ—表
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -76,6 +77,60 @@
        }
        #endregion
        #region è®¾å¤‡æ´¾å·¥å•分页查询
        [Route("Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage")]
        [HttpGet]
        public object GetEquipRepairSendWorkBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipRepairSendWorkBillList", 3, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairSendWorkBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipRepairSendWorkBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairSendWorkBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipRepairSendWorkBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡ç»´ä¿®æ´¾å·¥å• æ·»åŠ /修改
        [Route("Sb_EquipRepairSendWorkBill/AddEquipRepairSendWorkBill")]
        [HttpPost]
WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
@@ -33,7 +33,7 @@
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipStopBillMain_Check", 1, false, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipStopBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -80,6 +80,59 @@
        }
        #endregion
        #region è®¾å¤‡åœæœºå•分页查询
        [Route("Sb_EquipStopBill/getSb_EquipStopBillListPage")]
        [HttpGet]
        public object Sb_EquipBeginBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipStopBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipStopBillMainListPage " + page + "," + size + ",''", "h_p_Sb_EquipStopBillMainListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipStopBillMainListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipStopBillMainListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡åœæœºå•列表 èŽ·å–ç¼–è¾‘åˆ—è¡¨æ•°æ®
        [Route("Sb_EquipStopBill/Sb_EquipStopBillMainEditList")]
        [HttpGet]
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -83,6 +83,60 @@
        }
        #endregion
        #region è®¾å¤‡ç»´ä¿®å·¥å•分页查询
        [Route("Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage")]
        [HttpGet]
        public object GetEqpRepairWorkBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipRepairWorkBillList", 3, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairWorkBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipRepairWorkBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairWorkBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipRepairWorkBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡ç»´ä¿®è®°å½•统计分析 
        /// <summary>
        /// è¿”回设备维修记录统计分析 åˆ—表
@@ -195,6 +249,59 @@
        }
        #endregion
        #region è®¾å¤‡ç»´ä¿®éªŒæ”¶å•分页查询
        [Route("Sb_EqpRepairWorkBill/GetEqpRepairCheckWorkBillListPage")]
        [HttpGet]
        public object GetEqpRepairCheckWorkBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipRepairCheckBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairCheckBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipRepairCheckBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairCheckBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipRepairCheckBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡ç»´ä¿®éªŒæ”¶å•列表sql语句
        public static DataSet Sb_EquipRepairCheckWorkBill_s(string sWhere)
        {
@@ -211,8 +318,6 @@
            
        }
        #endregion
        #region è®¾å¤‡æ•…障登记单列表
        /// <summary>
@@ -264,6 +369,58 @@
        }
        #endregion
        #region è®¾å¤‡æ•…障登记单分页查询
        [Route("Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage")]
        [HttpGet]
        public object GetEqpConkBookBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipConkBookBillList", 3, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipConkBookBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipConkBookBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipConkBookBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipConkBookBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡æ•…障记录统计分析 
        /// <summary>
@@ -2128,6 +2285,59 @@
        }
        #endregion
        #region è®¾å¤‡ç­¾åˆ°å•分页查询
        [Route("Sb_CheckEqpRepairWorkBill/Sb_EquipRepairSignBillListPage")]
        [HttpGet]
        public object Sb_EquipRepairSignBillListPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipRepairSignBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairSignBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipRepairSignBillListPage");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairSignBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipRepairSignBillListPage");
                }
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è®¾å¤‡ç»´ä¿®ç­¾åˆ°å•保存 æ–°å¢ž/编辑
        [Route("Sb_CheckEqpRepairWorkBill/SaveSb_EquipRepairSignBillMain")]
        [HttpPost]
WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs
@@ -170,12 +170,12 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutCompareToProductReport order by ç”Ÿäº§å•号 desc", "h_v_Xs_SellOutCompareToProductReport");
                    ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutCompareToProductReport order by æ—¥æœŸ desc", "h_v_Xs_SellOutCompareToProductReport");
                }
                else
                {
                    string sql1 = "select * from h_v_Xs_SellOutCompareToProductReport where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by ç”Ÿäº§å•号 desc";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xs_SellOutCompareToProductReport");
                }
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -568,14 +568,14 @@
            foreach (ClsXs_SeOutStockBillSub oSub in DetailColl)
            {
                i++;
                if (oSub.HQty <= 0 || oSub.HQty == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "第" + i + "行,数量不能为0或者小于0";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (oSub.HQty <= 0 || oSub.HQty == null)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "第" + i + "行,数量不能为0或者小于0";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (oSub.HMaterID == 0)
                {
@@ -1271,6 +1271,182 @@
        }
        #endregion
        #region å‘货通知单 è¡Œå…³é—­/行反关闭
        /// <summary>
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">关闭(0),反关闭(1)</param>
        /// <param name="CurUserName">关闭人</param>
        /// <returns></returns>
        [Route("Xs_SeOutStockBill/CloseRowXs_SeOutStockBill")]
        [HttpGet]
        public object CloseRowXs_SeOutStockBill(int HInterID, int HEntryID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Xs_SeOutStockBill_Close";
            string SubBillName = "Xs_SeOutStockBillSub";                   //子表表名
            DBUtility.ClsPub.CurUserName = CurUserName;
            DataSet ds = null;
            try
            {
                //检查权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "行关闭失败!无权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterID数据判断
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //对HInterID进行类型的转换
                DAL.ClsXs_SeOutStockBill oBill = new DAL.ClsXs_SeOutStockBill();              //实例化单据操作类,用于进行相关操作
                //针对需要进行的操作,检验当前单据的状态是否支持需要进行的操作
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //根据HInterID获取该单据的数据
                {
                    if (oBill.omodel.HDeleteMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已作废!不能进行行关闭!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HCloseMan.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;
                    }
                    string sql = "select * from " + SubBillName + " where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
                    ds = oCN.RunProcReturn(sql, "Xs_SeOutStockBillSub");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "该行数据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (IsAudit == 0)  //行关闭判断
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "行已关闭!不能再次行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //行反关闭判断
                    {
                        if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "行未关闭!不需要再行反关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //判断行是否为自动关闭
                        string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
                        if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "行反关闭失败!行为自动关闭,不能进行手动反关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //进行需要进行的行关闭/行反关闭操作
                if (IsAudit == 0) //行关闭提交
                {
                    //行关闭提交
                    if (oBill.CloseRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, "h_p_Xs_SeOutStockBill_AfterEntryCloseCtrl", ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "行关闭成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "行关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (IsAudit == 1) //行反关闭提交
                {
                    //行反关闭提交
                    if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反关闭成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "关闭失败或者反关闭失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å‘货通知单作废/反作废功能
        [Route("Xs_SeOutStockBill/CancellXs_SeOutStockBill")]
        [HttpGet]
WebAPI/Controllers/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillController.cs
@@ -251,7 +251,7 @@
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_QC_ProcessCheckBill_Edit where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by hmainid desc,hsubid asc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill_Edit");
                //添加列名
WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs
@@ -690,20 +690,20 @@
        }
        #endregion
        #region è´¨é‡æ¨¡å—    è®¾å¤‡å·¥è‰ºå‚数趋势图 æ ¹æ®æµè½¬å¡èŽ·å–è®¾å¤‡+模具
        #region è´¨é‡æ¨¡å—    è®¾å¤‡å·¥è‰ºå‚数趋势图 æ ¹æ®æµè½¬å¡+工序 èŽ·å–è®¾å¤‡
        [Route("QC_CustomerAppealReport/Get_EquipList")]
        [HttpGet]
        public object Get_EquipList(string HProcExchBillNo, string user)
        public object Get_EquipList(string HProcExchBillNo,string HProcID, string user)
        {
            try
            {   
                List<object> columnNameList = new List<object>();
                    
                ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HEquipFileNumber HEquipFileNumber,b.HName HName,d.HMouldNo HMouldNumber,d.HName HMouldName " +
                    " from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain  b on a.HEquipID=b.HInterID" +
                    " left join Sc_ICMOBillStatus_Tmp c on a.HProcExchInterID = c.HSourceInterID and a.HProcExchEntryID = c.HSourceEntryID and a.HProcID = c.HProcID" +
                    " left join Gy_MouldFileMain d on c.HMouldID = d.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
                ds = oCN.RunProcReturn("select  isnull(c.HInterID,0)设备id,isnull(c.HEquipFileNumber,'') è®¾å¤‡ä»£ç ,isnull(c.HName,'') è®¾å¤‡åç§°,b.HRelBeginDate å¼€å§‹æ—¶é—´,b.HRelEndDate ç»“束时间 from Sc_ProcessExchangeBillMain a " +
                        " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID" +
                        " left join Gy_EquipFileBillMain c on b.HSourceID=c.HSourceID" +
                        "  where a.HBillNo='" + HProcExchBillNo + "'and b.HProcID='"+ HProcID + "'  and b.HSourceID !=0 ", "Sc_ProcessExchangeBillMain");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -744,11 +744,13 @@
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
                string HProcExchBillNo = dic["HProcExchBillNo"].ToString();
                string HProcName = dic["HProcName"].ToString();
                string HProcID = dic["HProcID"].ToString();
                string HTechParamName = dic["HTechParamName"].ToString();               
                string HEquipName = dic["HEquipName"].ToString();
                string HEquipID = dic["HEquipID"].ToString();
                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();
                if ((HProcExchBillNo == null || HProcExchBillNo == "")&&(HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HEquipName == null || HEquipName == ""))
                if ((HProcExchBillNo == null || HProcExchBillNo == "")&&(HProcID == null || HProcID == "") && (HTechParamName == null || HTechParamName == "") && (HEquipID == null || HEquipID == ""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -757,7 +759,7 @@
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"','"+Type+"'", "h_p_SB_EquipICMOTechParamBillList");
                ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcID + "','" + HTechParamName + "','"+ HEquipID + "','" + HBeginDate + "','" + HEndDate + "','" + Type+"'", "h_p_SB_EquipICMOTechParamBillList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1604,13 +1606,13 @@
        //点击主表格的流转卡,查询子表格数据
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList_Right(string linterid, string user)
        public object Get_QC_FiveMenOneRingList_Right(string linterid,string SNs, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "'", "h_p_QC_FiveMenOneRingList_Query");
                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
                // éåŽ†æ‰€æœ‰è¡¨
                foreach (DataTable table in ds.Tables)
@@ -1800,14 +1802,55 @@
        [Route("QC_CustomerAppealReport/Get_EquipICMOTechParamList")]
        [HttpGet]
        public object Get_EquipICMOTechParamList(string linterid, string user)
        public object Get_EquipICMOTechParamList(string linterid, string HProcID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ds = oCN.RunProcReturn(@"select a.HProcExchBillNo,g.HEquipFileNumber,g.HName è®¾å¤‡åç§°,b.HName ç‰©æ–™åç§°,h.HName å·¥åºåç§°  from SB_EquipICMOTechParamBillMain a left join Gy_Material b on a.HMaterID = b.HItemID
                left join Gy_Source e on a.HSourceID = e.HItemID left join Gy_EquipFileBillMain g on a.HEquipID = g.HInterID left join Gy_Process h on a.HProcID = h.HItemID", "SB_EquipICMOTechParamBillMain");
                ds = oCN.RunProcReturn("select a.HBillNo å·¥åºæµè½¬å¡å·,e.HInterID è®¾å¤‡id,e.HEquipFileNumber è®¾å¤‡ä»£ç ,e.HName è®¾å¤‡åç§°,d.HName ç”Ÿäº§èµ„源,a.HMaterID ç‰©æ–™id,c.HName ç‰©æ–™åç§°,b.HProcID å·¥åºid,f.HName å·¥åºåç§°,b.HRelBeginDate å¼€å§‹æ—¶é—´,b.HRelEndDate ç»“束时间 " +
                    "from Sc_ProcessExchangeBillMain a inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
                    "left join Gy_Material c on a.HMaterID = c.HItemID  left join Gy_Source d on b.HSourceID = d.HItemID " +
                    "left join Gy_EquipFileBillMain e on b.HSourceID = e.HSourceID left join Gy_Process f on b.HProcID = f.HItemID where a.HInterID='"+linterid+ "' and b.HProcID='"+HProcID+"'", "SB_EquipICMOTechParamBillMain");
                //添加列名
                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));//获取到DataColumn列对象的列名
                }
                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("QC_CustomerAppealReport/Get_TechParamList")]
        [HttpGet]
        public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ds = oCN.RunProcReturn("select c.HName å·¥è‰ºå‚æ•°,b.HDataForm é‡‡é›†æ¥æº from Gy_MaterialTechParamBillMain a " +
                    "inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
                    "left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='"+ HProID + "' and a.HEquipID='"+ HEquId + "' and b.HDataForm='设备采集' ", "SB_EquipICMOTechParamBillMain");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs
@@ -17,6 +17,8 @@
using DingTalk.Api.Response;
using System.Globalization;
using System.Linq;
using AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models;
using System.Text.RegularExpressions;
namespace WebAPI.Controllers
{
@@ -85,6 +87,13 @@
            public long? TotalCount;
            public long? PageNumber;
            public List<string> Data;
        }
        //oa审批返回类
        public class OA_GetInstanceIDListResponse
        {
           public List<string> list;//获取的id列表
           public string nextToken;
           public bool? success;
        }
        #region åˆ†å±‚审核签到表
@@ -358,8 +367,83 @@
            public List<Sc_MouldRepairWorkBillSub> DetailColMouldRepair = new List<Sc_MouldRepairWorkBillSub>();
        }
        #endregion
        #region å¼‚常工时申请单
        #region ä¸»è¡¨+子表
        public class Pay_ErrWorkTimesRequestBill
        {
            public int HInterID;
            public string HBillNo;
            public string HDate;
            public string HInnerBillNo;
            public int HDeptID;
            public string HDeptName;
            public int HGroupID;
            public string HGroupName;
            public int HMangerID;
            public string HManagerName;
            public int HICMOInterID;
            public string HICMOBillNo;
            public string HExplanation;
            public double HSumRequestTimes;
            public int HMaterID;
            public string HMaterName;
            public int HUnitID;
            public string HUnitName;
            public double HPlanQty;
            public string HBatchNo;
            public string HRemark;
            public string HMaker;
            public string HMakerDate;
            public string HUpdater;
            public string HUpdaterDate;
            public string HChecker;
            public string HCheckerDate;
            public string HCloseMan;
            public string HCloseManDate;
            public string HDeleteMan;
            public string HDeleteManDate;
            public string HBacker;
            public string HBackerDate;
            public string HBackRemark;
            public List<Pay_ErrWorkTimesRequestBillSub> Pay_ErrWorkTimesRequestBillSub = new List<Pay_ErrWorkTimesRequestBillSub>();
        }
        #endregion
        #region å­è¡¨
        public class Pay_ErrWorkTimesRequestBillSub
        {
            public int HEmpID;
            public string HEmpNumber;
            public string HEmpName;
            public int HWorkTypeID;
            public string HWorkTypeNumber;
            public string HWorkTypeName;
            public double HPayMoney;
            public string HBTimes;
            public string HETimes;
            public double HTimes;
            public double HRelTimes;
            public double HRelPay;
            public string HRemark;
            public int HSourceInterID;
            public int HSourceEntryID;
            public string HSourceBillNo;
            public string HSourceBillType;
            public double HRelationQty;
            public double HRelationMoney;
            public string HCloseMan;
            public string HEntryCloseDate;
        }
        #endregion
        #endregion
        #endregion
        #region é’‰é’‰ é€šç”¨æ“ä½œæ–¹æ³•
@@ -722,6 +806,145 @@
            }
        }
        #endregion
        #endregion
        #region oa é€šç”¨æ“ä½œæ–¹æ³•
        #region OA èŽ·å–å®¡æ‰¹å®žä¾‹ID列表(单页)
        public bool getInstanceIDList_Page_OA(string processCode,DateTime startTime, DateTime endTime,long nextToken, int maxResult, List<string> statuses, ref OA_GetInstanceIDListResponse response, ref string msg)
        {
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient1();
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsHeaders listProcessInstanceIdsHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsHeaders();
            listProcessInstanceIdsHeaders.XAcsDingtalkAccessToken = this.accessToken;
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsRequest listProcessInstanceIdsRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsRequest
            {
                Statuses = statuses,
                StartTime = getTimeMillions(startTime),
                EndTime  = getTimeMillions(endTime),
                ProcessCode = processCode,
                NextToken = nextToken,
                MaxResults = maxResult,
            };
            try
            {
                ListProcessInstanceIdsResponse listProcessInstanceIdsResponse = client.ListProcessInstanceIdsWithOptions(listProcessInstanceIdsRequest, listProcessInstanceIdsHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions());
                response.success = listProcessInstanceIdsResponse.Body.Success;
                response.list = listProcessInstanceIdsResponse.Body.Result.List;
                response.nextToken = listProcessInstanceIdsResponse.Body.Result.NextToken;
                return true;
            }
            catch (TeaException err)
            {
                if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
                {
                    // err ä¸­å«æœ‰ code å’Œ message å±žæ€§ï¼Œå¯å¸®åŠ©å¼€å‘å®šä½é—®é¢˜
                }
                msg = "错误代码" + err.Code + ":" + err.Message;
                return false;
            }
            catch (Exception _err)
            {
                TeaException err = new TeaException(new Dictionary<string, object>
                {
                    { "message", _err.Message }
                });
                if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
                {
                    // err ä¸­å«æœ‰ code å’Œ message å±žæ€§ï¼Œå¯å¸®åŠ©å¼€å‘å®šä½é—®é¢˜
                }
                msg = "错误代码" + err.Code + ":" + err.Message;
                return false;
            }
        }
        #endregion
        #region èŽ·å– OA指定单据的实例ID列表(全部)
        public bool getInstanceIDList_OA(string processCode, DateTime startTime, DateTime endTime, long nextToken, int maxResult, List<string> statuses, ref List<string> IDList, ref string msg)
        {
            OA_GetInstanceIDListResponse response = new OA_GetInstanceIDListResponse();
            response.nextToken = nextToken.ToString();//赋值初始值
            do
            {
                nextToken = long.Parse(response.nextToken);
                if (getInstanceIDList_Page_OA(processCode, startTime, endTime, nextToken, maxResult, statuses,ref response, ref msg) == false)
                {
                    return false;
                }
                for (int i = 0; i < response.list.Count; i++)
                {
                    IDList.Add(response.list[i]);
                }
            } while (response.nextToken!=null);
            return true;
        }
        #endregion
        #region èŽ·å– OA æ ¹æ®å®žä¾‹ID获取实例详情
        public bool getInstanceDetailByInstanceID_OA(string processinstanceID,ref GetProcessInstanceResponse response, ref string msg)
        {
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient1();
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceHeaders getProcessInstanceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceHeaders();
            getProcessInstanceHeaders.XAcsDingtalkAccessToken = this.accessToken;
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceRequest getProcessInstanceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceRequest
            {
                ProcessInstanceId = processinstanceID,
            };
            try
            {
                response =  client.GetProcessInstanceWithOptions(getProcessInstanceRequest, getProcessInstanceHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions());
                return true;
            }
            catch (TeaException err)
            {
                if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
                {
                    // err ä¸­å«æœ‰ code å’Œ message å±žæ€§ï¼Œå¯å¸®åŠ©å¼€å‘å®šä½é—®é¢˜
                }
                msg = "错误代码" + err.Code + ":" + err.Message;
                return false;
            }
            catch (Exception _err)
            {
                TeaException err = new TeaException(new Dictionary<string, object>
                {
                    { "message", _err.Message }
                });
                if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message))
                {
                    // err ä¸­å«æœ‰ code å’Œ message å±žæ€§ï¼Œå¯å¸®åŠ©å¼€å‘å®šä½é—®é¢˜
                }
                msg = "错误代码" + err.Code + ":" + err.Message;
                return false;
            }
        }
        #endregion
        #region èŽ·å– OA æ ¹æ®å®žä¾‹ID列表获取实例详情列表
        public bool getInstanceDetailListByInstanceIDList_OA(List<string> processinstanceIDList, ref List<GetProcessInstanceResponse> responseList, ref string msg)
        {
            GetProcessInstanceResponse getProcessInstanceResponse = new GetProcessInstanceResponse();
            try
            {
                foreach(string processinstanceID in processinstanceIDList)
                {
                    if(!getInstanceDetailByInstanceID_OA(processinstanceID,ref getProcessInstanceResponse,ref msg))
                    {
                        return false;
                    }
                    responseList.Add(getProcessInstanceResponse);
                }
                return true;
            }
            catch (Exception e)
            {
                msg = e.Message;
                return false;
            }
        }
        #endregion
        #endregion
        #region æ•°æ®åŒæ­¥æ–¹æ³•
@@ -2857,6 +3080,272 @@
        #endregion
        #endregion
        #region æ•°æ®åŒæ­¥-异常工时单OA里获取
        #region ç±»åž‹è½¬æ¢æå–response中的value对象
        public class StatValue
        {
            public string Id { get; set; }
            public string Label { get; set; }
            public string Upper { get; set; }
            public string Num { get; set; }
        }
        public class ExtValue
        {
            public List<StatValue> StatValue { get; set; }
            public string ComponentName { get; set; }
        }
        public class RowValue
        {
            public string Label { get; set; }
            public object Value { get; set; }
            public string Key { get; set; }
            // æ³¨æ„ï¼šè¿™é‡Œä¸å®šä¹‰extendValue属性,因为我们不需要它
            // public SomeType ExtendValue { get; set; } // å¦‚果需要,可以注释掉或删除这行
        }
        public class Row
        {
            public List<RowValue> RowValue { get; set; }
            public string RowNumber { get; set; }
            // æ³¨æ„ï¼šè¿™é‡Œå‡è®¾ä½ ä¸éœ€è¦componentName,因为JSON示例中没有直接包含它
            // ä½†å¦‚果你的实际JSON或需求中包含,你应该添加这个属性
            // public string ComponentName { get; set; }
        }
        #endregion
        #region OA异常工时申请单 å®žä¾‹ID列表对应的实例详情
        public bool getInstanceDetailList___ErrWorkTimesRequest_OA(List<string> processinstanceIDList, DateTime startTime, DateTime endTime, ref List<Pay_ErrWorkTimesRequestBill> lsmain,ref string msg)
        {
            try
            {
                List<GetProcessInstanceResponse> getProcessInstanceResponses = new List<GetProcessInstanceResponse>();
                //获取钉钉response
                if (getInstanceDetailListByInstanceIDList_OA(processinstanceIDList,ref getProcessInstanceResponses,ref msg)==false)
                {
                    return false;
                }
                foreach(GetProcessInstanceResponse getProcessInstanceResponse in getProcessInstanceResponses)
                {
                    Pay_ErrWorkTimesRequestBill oItem = new Pay_ErrWorkTimesRequestBill();
                    //主表
                    oItem.HDate = getProcessInstanceResponse.Body.Result.FormComponentValues[1].Value;//单据日期计时时间
                    DateTime dateTime1 = DateTime.ParseExact(oItem.HDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
                    if (!(DateTime.Compare(dateTime1, startTime)>=0&& DateTime.Compare(dateTime1, endTime) <= 0))//控制时间
                    {
                        continue;
                    }
                    string[] deptNameAndGroupName = getProcessInstanceResponse.Body.Result.OriginatorDeptName.Split('-');//获取部门拼接字符串数组
                    oItem.HDeptName = deptNameAndGroupName[1];
                    oItem.HGroupName = deptNameAndGroupName[deptNameAndGroupName.Length-1];
                    //主管-负责人
                    string HManagerValue = getProcessInstanceResponse.Body.Result.FormComponentValues[9].Value;//获取的名字含后缀英文
                    string pattern = @"[\u4e00-\u9fff]+"; // ä¸­æ–‡å­—符的Unicode范围
                    MatchCollection matches = Regex.Matches(HManagerValue, pattern);
                    // åˆ›å»ºä¸€ä¸ªStringBuilder来拼接所有匹配的中文字符
                    System.Text.StringBuilder chineseChars = new System.Text.StringBuilder();
                    foreach (Match match in matches)
                    {
                        chineseChars.Append(match.Value);
                    }
                    string HManagerName = chineseChars.ToString();
                    DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where HName='" + HManagerName + "'", "Gy_Employee");
                    string HMangerID = "0";
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        HMangerID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                    }
                    oItem.HMangerID = int.Parse(HMangerID);
                    //处理部门和班组名称id
                    ds = oCN.RunProcReturn("select * from Gy_Department with(nolock)  where HName='" + oItem.HDeptName + "'", "Gy_Department");
                    string HDeptID = "0";
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                    }
                    oItem.HDeptID = int.Parse(HDeptID);
                    ds = oCN.RunProcReturn("select * from Gy_Group with(nolock)  where HName='" + oItem.HGroupName + "'", "Gy_Group");
                    string HGroupID = "0";
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        HGroupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                    }
                    oItem.HGroupID = int.Parse(HGroupID);
                    //反序列化明细内容
                    string tableFieldValue = getProcessInstanceResponse.Body.Result.FormComponentValues[11].Value;
                    List<Row> rows = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Row>>(tableFieldValue);
                    ExtValue extValue = Newtonsoft.Json.JsonConvert.DeserializeObject<ExtValue>(getProcessInstanceResponse.Body.Result.FormComponentValues[11].ExtValue);
                    oItem.HBatchNo = rows[0].RowValue[1].Value.ToString();//批次号-订单号码
                    //任务描述-任务类型+工作内容
                    oItem.HExplanation = getProcessInstanceResponse.Body.Result.FormComponentValues[2].Value + "-" + rows[0].RowValue[0].Value;
                    oItem.HSumRequestTimes = double.Parse(extValue.StatValue[1].Num);//总时长
                    oItem.HPlanQty = 0;//计划数量
                    oItem.HRemark = "钉钉导入" + getProcessInstanceResponse.Body.Result.Title;//备注
                    //循环遍历获取职员名称id,工时
                    for (int i = 0; i < rows.Count; i++)
                    {
                        string[] nameArray = rows[i].RowValue[4].Value.ToString().Split(',');//获取每个人的人名
                        oItem.HPlanQty += double.Parse(rows[i].RowValue[2].Value.ToString());//计划数量
                        for (int j = 0; j < int.Parse(rows[i].RowValue[5].Value.ToString()); j++)
                        {
                            Pay_ErrWorkTimesRequestBillSub pay_ErrWorkTimesRequestBillSub = new Pay_ErrWorkTimesRequestBillSub();
                            ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where HName='" + nameArray[j] + "'", "Gy_Employee");
                            string HEmpID = "0";
                            //设置子表职员id名称
                            if (ds.Tables[0].Rows.Count > 0)
                            {
                                HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            }
                            pay_ErrWorkTimesRequestBillSub.HEmpName = nameArray[j];
                            pay_ErrWorkTimesRequestBillSub.HEmpID = int.Parse(HEmpID);
                            pay_ErrWorkTimesRequestBillSub.HRelTimes = double.Parse(rows[i].RowValue[6].Value.ToString());
                            pay_ErrWorkTimesRequestBillSub.HTimes = double.Parse(rows[i].RowValue[6].Value.ToString());
                            pay_ErrWorkTimesRequestBillSub.HRelPay = double.Parse(rows[i].RowValue[10].Value.ToString());
                            pay_ErrWorkTimesRequestBillSub.HPayMoney = pay_ErrWorkTimesRequestBillSub.HRelPay / pay_ErrWorkTimesRequestBillSub.HTimes;
                            pay_ErrWorkTimesRequestBillSub.HRemark = "钉钉导入";
                            oItem.Pay_ErrWorkTimesRequestBillSub.Add(pay_ErrWorkTimesRequestBillSub);
                        }
                    }
                    lsmain.Add(oItem);
                }
                return true;
            }catch(Exception e)
            {
                msg = e.Message;
                return false;
            }
        }
        #endregion
        #region æ•°æ®åŒæ­¥
        public bool getData_ErrWorkTimesRequest(DateTime startTime, DateTime endTime,ref string msg)
        {
            string processCode = "PROC-21371550-FEF1-4EDD-A827-639746E22E43";
            long nextToken = 1;
            int maxResult = 20;//最大20
            List<string> statues = new List<string>{"COMPLETED"};
            this.AppKey = "ding7miekiaqn4rc2ert";
            this.AppSecret = "81qMrC5SvkgjT9t2A3wUyEEENzyl9jJLeXOpjv2SNULc_HSlFZF4NE21YFCXik4K";
            getAccessToken();//设置accessToken
            //获取工时申请的实例ID列表
            List<string> IDList = new List<string>();
            if (getInstanceIDList_OA(processCode,startTime,endTime,nextToken,maxResult,statues,ref IDList, ref msg) == false)
            {
                return false;
            }
            //获取详细信息并附加到列表lsmain中
            List<Pay_ErrWorkTimesRequestBill> lsmain = new List<Pay_ErrWorkTimesRequestBill>();
            if (getInstanceDetailList___ErrWorkTimesRequest_OA(IDList,startTime,endTime, ref lsmain, ref msg) == false)
            {
                return false;
            }
            try
            {
                oCN.BeginTran();
                //删除时间范围内的导入单据
                DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%钉钉导入%' and HDate >= '" + startTime + "' and HDate<='" + endTime + "'", "Pay_ErrWorkTimesRequestBillMain");
                if(dataSet != null && dataSet.Tables[0].Rows.Count > 0)
                {
                    foreach (DataRow row in dataSet.Tables[0].Rows)
                    {
                        int HInterID = row.Field<int>("HInterID");
                        oCN.RunProc(@"Delete From Pay_ErrWorkTimesRequestBillMain where HInterID = " + HInterID);
                        oCN.RunProc(@"Delete From Pay_ErrWorkTimesRequestBillSub where HInterID = " + HInterID);
                    }
                }
                //插入数据
                foreach(Pay_ErrWorkTimesRequestBill oItem in lsmain)
                {
                    if (oItem.Pay_ErrWorkTimesRequestBillSub.Count != 0)
                    {
                        string HBillType = "2231";
                        long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
                        string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                        int HYear = int.Parse(oItem.HDate.Split('-')[0]);
                        int HPeriod = int.Parse(oItem.HDate.Split('-')[1]);
                        //主表
                        string sql = "insert into Pay_ErrWorkTimesRequestBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
                        ",'" + HBillType +
                        "','" + " " +
                        "'," + 1 +
                        "," + HInterID +
                        ",'" + HBillNo +
                        "','" + oItem.HDate +
                        "','" + " " +
                        "'," + oItem.HDeptID +
                        "," + oItem.HGroupID +
                        "," + oItem.HMangerID +
                        "," + "0" +
                        ",'" + " " +
                        "','" + oItem.HExplanation +
                        "'," + oItem.HSumRequestTimes +
                        "," + 0 +
                        "," + 0 +
                        "," + oItem.HPlanQty +
                        ",'" + oItem.HBatchNo +
                        "','" + oItem.HRemark +
                        "','" + "System" +
                        "'," + "GETDATE()" +
                        ")";
                        //主表
                        LogService.Write(sql);
                        oCN.RunProc(sql);
                        int i = 1;
                        foreach (Pay_ErrWorkTimesRequestBillSub oItem_Detail in oItem.Pay_ErrWorkTimesRequestBillSub)
                        {
                            sql = "insert into Pay_ErrWorkTimesRequestBillSub" +
                            "(HInterID,HEntryID,HEmpID,HWorkTypeID,HPayMoney,HBTimes,HETimes,HTimes,HRelTimes,HRelPay,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo" +
                            ",HSourceBillType,HRelationQty,HRelationMoney) " +
                            "values(" +
                            "" + HInterID +
                            "," + i +
                            "," + oItem_Detail.HEmpID +
                            "," + 0 +
                            "," + oItem_Detail.HPayMoney +
                            ",'" + "" +
                            "','" + "" +
                            "'," + oItem_Detail.HTimes +
                            "," + oItem_Detail.HRelTimes +
                            "," + oItem_Detail.HRelPay +
                            ",'" + oItem_Detail.HRemark +
                            "'," + 0 +
                            "," + 0 +
                            ",'" + " " +
                            "','" + " " +
                            "'," + 0 +
                            "," + 0 +
                            ")";
                            LogService.Write(sql);
                            oCN.RunProc(sql);
                            i += 1;
                        }
                    }
                }
                oCN.Commit();
                return true;
            }
            catch (Exception e)
            {
                LogService.Write(e.Message);
                msg = e.Message;
                oCN.RollBack();
                return false;
            }
        }
        #endregion
        #endregion
        #endregion
@@ -2932,5 +3421,39 @@
        }
        #endregion
        #region é’‰é’‰æ•°æ®åŒæ­¥OA
        [Route("DD_DataSynchronization/DataSynchronization_DingDing_OA")]
        [HttpGet]
        public object DataSynchronization_DingDing_OA(DateTime startTime, DateTime endTime, string user)
        {
            string msg = "";
            try
            {
                if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "Exception!" + msg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESBeginStepWorkBillController.cs
@@ -1926,5 +1926,247 @@
            }
        }
        #endregion
        #region PDA开工单 æ‰«ææµè½¬å¡ æŸ¥å‡ºå¯¹åº”信息
        [Route("Sc_MESBeginStepWorkBill/GetHProcExchInterID")]
        [HttpGet]
        public object GetHProcExchInterID(string HBarCode, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条码信息为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    string sql = "select  a.*,b.HName HMaterName,b.HNumber HMaterNumbers,b.HModel HModel,c.HName HDeptName from Sc_ICMOBillStatus_Tmp a " +
                        "left join Gy_Material b on a.HMaterID=b.HItemID left  join  Gy_Department c on a.HDeptID=c.HItemID where HSourceBillNo = '" + HBarCode + "'";
                    ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");
                }
                if (ds.Tables[0].Rows.Count > 0)
                {
                    //添加列名
                    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));//获取到DataColumn列对象的列名
                    }
                    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 = "工序流转卡:" + HBarCode + " ,没有进行派工操作";
                    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 PDA开工单保存/编辑
        /// <summary>
        /// å¼€å·¥å•
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_MESBeginStepWorkBill/SaveSc_MESBeginWorkBill")]
        [HttpPost]
        public object SaveSc_MESBeginWorkBill([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 UserName = sArray[1].ToString();
            string refSav = sArray[2].ToString();
            //保存权限
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, false, UserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            //判断会计期是否合理
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = s;
                objJsonResult.data = null;
                return objJsonResult;
            }
            LogService.Write("开工:1" + msg1);
            ListModels oListModels = new ListModels();
            try
            {
                DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
                List<Models.ClsSc_MESBeginWorkBillMain> lsmain = new List<Models.ClsSc_MESBeginWorkBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_MESBeginWorkFrom(msg2);
                foreach (Models.ClsSc_MESBeginWorkBillMain 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;
                        }
                    }
                    oItem.HMaker = UserName;
                    oItem.HBillType = "3787";
                    oItem.HBillSubType = "3787";
                    oItem.HBillStatus = 1;   //单据状态(1未审,2审核通过,3关闭,4作废,5审核退回,6审核中,7已阅,8已回复,9结案,10验证,11下达,12开工,13申请审批,15申请检验,16 åˆ¤å®šåˆæ ¼ï¼Œ17判定不合格)
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HBarCodeMakeDate = Convert.ToDateTime(DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"))); //扫描日期(年-月-日-时-分-秒)
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                LogService.Write("开工:2" + msg1);
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    LogService.Write("开工:2.1" + msg1);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    if (bResult)
                    {
                        objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //返回主ID
                        //系统参数  è‡ªåŠ¨å®¡æ ¸
                        string sReturn = "";
                        if (oSystemParameter.ShowBill(ref sReturn) == true)
                        {
                            LogService.Write("开工:2.8");
                            objJsonResult.Verify = "Y";
                        }
                    }
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.Verify = "N";
                }
                LogService.Write("开工:3" + msg1);
                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.Message;
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -269,7 +269,7 @@
                {
                    return false;
                }
                LogService.Write("开工:2.3");
                LogService.Write("开工:2.3");
                //主表
                oCn.RunProc("Insert Into Sc_MESBeginWorkBillMain " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>False|2024-11-06T03:32:23.8339166Z;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <History>True|2024-11-20T02:16:03.7893118Z;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/24/2024 20:07:49</publishTime>
      <publishTime>11/11/2024 16:52:40</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/24/2024 20:07:49</publishTime>
      <publishTime>11/11/2024 16:52:40</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/24/2024 20:07:47</publishTime>
      <publishTime>11/11/2024 16:52:36</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/24/2024 20:07:47</publishTime>
      <publishTime>11/11/2024 16:52:36</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/24/2024 20:07:44</publishTime>
      <publishTime>11/04/2024 14:38:08</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/24/2024 20:07:44</publishTime>
      <publishTime>11/04/2024 14:38:08</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/08/2023 09:47:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>10/24/2024 20:07:44</publishTime>
      <publishTime>11/11/2024 16:52:30</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/24/2024 20:07:44</publishTime>
      <publishTime>11/11/2024 16:52:30</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/24/2024 20:07:42</publishTime>
      <publishTime>11/04/2024 14:38:05</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/24/2024 20:07:42</publishTime>
      <publishTime>11/04/2024 14:38:05</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/24/2024 20:07:43</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/24/2024 20:07:43</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/24/2024 20:07:43</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/24/2024 20:07:43</publishTime>
      <publishTime>11/04/2024 14:38:07</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/24/2024 16:24:33</publishTime>
      <publishTime>11/04/2024 14:38:03</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/24/2024 16:24:33</publishTime>
      <publishTime>11/04/2024 14:38:03</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>10/24/2024 16:24:33</publishTime>
      <publishTime>11/11/2024 16:52:35</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/24/2024 16:24:33</publishTime>
      <publishTime>11/11/2024 16:52:35</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/24/2024 20:08:11</publishTime>
      <publishTime>11/20/2024 10:15:54</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/24/2024 20:08:11</publishTime>
      <publishTime>11/20/2024 10:15:54</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>10/24/2024 20:08:15</publishTime>
      <publishTime>11/20/2024 10:16:02</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -312,58 +312,58 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>08/15/2022 15:46:13</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/08/2023 09:47:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -372,7 +372,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,121 +381,121 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/18/2023 17:26:29</publishTime>
      <publishTime>07/12/2023 08:14:21</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>09/19/2024 08:47:56</publishTime>
      <publishTime>09/19/2024 10:10:46</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>03/31/2023 09:57:09</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>03/31/2023 09:57:08</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/13/2024 10:26:00</publishTime>
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>10/24/2024 20:08:15</publishTime>
      <publishTime>11/11/2024 16:53:32</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-11-06T06:13:46.3129972Z;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <History>True|2024-11-20T01:08:48.6293480Z;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/06/2024 15:05:51</publishTime>
      <publishTime>11/20/2024 09:08:11</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/06/2024 15:05:51</publishTime>
      <publishTime>11/20/2024 09:08:11</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/06/2024 15:05:49</publishTime>
      <publishTime>11/20/2024 09:08:08</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/06/2024 15:05:49</publishTime>
      <publishTime>11/20/2024 09:08:08</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/05/2024 19:03:14</publishTime>
      <publishTime>11/20/2024 09:08:02</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/05/2024 19:03:14</publishTime>
      <publishTime>11/20/2024 09:08:02</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>11/06/2024 14:13:05</publishTime>
      <publishTime>11/20/2024 09:08:03</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/06/2024 14:13:05</publishTime>
      <publishTime>11/20/2024 09:08:03</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/05/2024 19:03:11</publishTime>
      <publishTime>11/20/2024 09:07:59</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/05/2024 19:03:11</publishTime>
      <publishTime>11/20/2024 09:07:59</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/05/2024 19:03:13</publishTime>
      <publishTime>11/20/2024 09:08:00</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/05/2024 19:03:13</publishTime>
      <publishTime>11/20/2024 09:08:00</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/05/2024 19:03:13</publishTime>
      <publishTime>11/20/2024 09:08:00</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/05/2024 19:03:13</publishTime>
      <publishTime>11/20/2024 09:08:00</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>11/05/2024 17:27:43</publishTime>
      <publishTime>11/20/2024 08:52:55</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>11/05/2024 17:27:43</publishTime>
      <publishTime>11/20/2024 08:52:55</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>11/05/2024 17:49:50</publishTime>
      <publishTime>11/20/2024 08:53:01</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>11/05/2024 16:13:00</publishTime>
      <publishTime>11/20/2024 08:53:01</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/13/2024 14:11:29</publishTime>
      <publishTime>11/20/2024 09:08:45</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/13/2024 14:11:29</publishTime>
      <publishTime>11/20/2024 09:08:45</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>10/25/2024 10:12:36</publishTime>
      <publishTime>11/15/2024 15:51:40</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-11-14T09:14:56.3660185Z;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
    <History>True|2024-11-21T05:48:31.7056264Z;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+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>11/14/2024 17:14:41</publishTime>
      <publishTime>11/21/2024 16:44:50</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/14/2024 17:14:41</publishTime>
      <publishTime>11/21/2024 16:44:50</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/14/2024 17:14:40</publishTime>
      <publishTime>11/19/2024 14:12:51</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/14/2024 17:14:40</publishTime>
      <publishTime>11/19/2024 14:12:51</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/14/2024 17:14:37</publishTime>
      <publishTime>11/19/2024 14:12:48</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/14/2024 17:14:37</publishTime>
      <publishTime>11/19/2024 14:12:48</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>11/14/2024 17:14:37</publishTime>
      <publishTime>11/19/2024 14:12:48</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/14/2024 17:14:37</publishTime>
      <publishTime>11/19/2024 14:12:48</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/14/2024 17:14:36</publishTime>
      <publishTime>11/19/2024 14:12:46</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/14/2024 17:14:36</publishTime>
      <publishTime>11/19/2024 14:12:46</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/14/2024 17:14:36</publishTime>
      <publishTime>11/19/2024 14:12:47</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/14/2024 17:14:36</publishTime>
      <publishTime>11/19/2024 14:12:47</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/14/2024 17:14:36</publishTime>
      <publishTime>11/19/2024 14:12:47</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/14/2024 17:14:36</publishTime>
      <publishTime>11/19/2024 14:12:47</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>11/14/2024 17:13:46</publishTime>
      <publishTime>11/19/2024 10:11:11</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>11/14/2024 17:13:46</publishTime>
      <publishTime>11/19/2024 10:11:11</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>11/12/2024 17:43:04</publishTime>
      <publishTime>11/21/2024 16:43:30</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>11/12/2024 17:43:04</publishTime>
      <publishTime>11/21/2024 16:43:30</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2024 17:14:11</publishTime>
      <publishTime>11/21/2024 16:53:57</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/14/2024 17:14:11</publishTime>
      <publishTime>11/21/2024 16:53:57</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
WebAPI/WebAPI.csproj.user
@@ -1,50 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <ProjectView>ProjectFiles</ProjectView>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
  </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 ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>
WorkM/bin/Release/BLL.dll
Binary files differ
WorkM/bin/Release/BLL.pdb
Binary files differ
WorkM/bin/Release/DAL.dll
Binary files differ
WorkM/bin/Release/DAL.pdb
Binary files differ
WorkM/bin/Release/Model.dll
Binary files differ
WorkM/bin/Release/Model.pdb
Binary files differ
WorkM/bin/Release/WarM.dll
Binary files differ
WorkM/bin/Release/WarM.pdb
Binary files differ
WorkM/bin/Release/WorkM.dll
Binary files differ
WorkM/bin/Release/WorkM.pdb
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,11 +1,15 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
<<<<<<< HEAD
=======
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
>>>>>>> e15856e05e8c9f2bf787dca73c6178e0326e3d6c
>>>>>>> a2bdf7e18d34fba0ef0d701faf4f277cef4f142a
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
>>>>>>> 3a1239dbd6e9cce019acaae934f1675298ef8a06
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
File was deleted
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,6 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ