Commit Graph

22 Commits (6a8d72702dfd38c1e1e9d8249e10ddd014449f64)

Author SHA1 Message Date
hanxuntao 202b756f59 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 7 months ago
ddlucky 1a9c83cd59 20240506_2 7 months ago
hanxuntao 93a202b586 1 7 months ago
dengyu 5b0108843f 订舱确认部分 基础逻辑稍作修改,应对不规范的数据内容 1 year ago
ddlucky 4f5e05cb45 20230626 1 year ago
ddlucky a0800b629e newtonsoft.dll统一升级至13.0.3; 2 years ago
ddlucky 1d9dc08487 工作流增加功能,但未做调用。(GetWorkFlowmb)用于按companyid获取工作流 2 years ago
ddlucky 8e5e7ae17f vgm新直发与读取状态服务完成 2 years ago
ddlucky 35d720eef3 对大简云的信息对接:读取状态的消息队列已完成,目前使用测试地址;发送VGM未完成;对接合规接口未完成。20221227 2 years ago
ddlucky f81b265025 '20221208DBResult' 2 years ago
hanxuntao d7ed85e16d json新版本 2 years ago
hanxuntao a0fe16a9a2 1 2 years ago
ddlucky f10d9c163c 'DJY账号注册_未完成,暂时隐藏' 2 years ago
ddlucky 544f65308c '20220729编译后' 2 years ago
ddlucky 3eb069907b '内贸空运主单显示揽货人和客服' 2 years ago
ddlucky 1c4cf0e6d1 '内贸空运主单显示揽货人和客服' 2 years ago
hanxuntao d013f7c848 Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev
# Conflicts:
#	.gitignore
#	BookingJieFeng/obj/Debug/BookingJieFeng.csproj.CoreCompileInputs.cache
#	BookingJieFeng/obj/Release/BookingJieFeng.csproj.CoreCompileInputs.cache
#	BookingJieFeng/obj/Release/BookingJieFeng.csprojAssemblyReference.cache
#	BookingWeb/BookingWeb.csproj.user
#	BookingWeb/obj/Debug/BookingWeb.csproj.CoreCompileInputs.cache
#	BookingWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	BookingWeb/obj/Release/BookingWeb.csproj.CoreCompileInputs.cache
#	BookingWeb/obj/Release/BookingWeb.csprojAssemblyReference.cache
#	D7MqClient/D7MqClient/obj/Debug/D7MqClient.csproj.CoreCompileInputs.cache
#	D7MqClient/D7MqClient/obj/Debug/D7MqClient.csprojAssemblyReference.cache
#	D7MqClient/D7MqClient/obj/Release/D7MqClient.csproj.CoreCompileInputs.cache
#	D7MqClient/D7MqClient/obj/Release/D7MqClient.csprojAssemblyReference.cache
#	DSWeb.Common/bin/Debug/DSWeb.Common.dll
#	DSWeb.Common/bin/Debug/DSWeb.Common.pdb
#	DSWeb.Common/bin/Release/DSWeb.Common.dll
#	DSWeb.Common/bin/Release/DSWeb.Common.pdb
#	DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
#	DSWeb.Common/obj/Debug/DSWeb.Common.csproj.FileListAbsolute.txt
#	DSWeb.Common/obj/Debug/DSWeb.Common.dll
#	DSWeb.Common/obj/Debug/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Debug/DSWeb.Common.dll
#	DSWeb.Interface/bin/Debug/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
#	DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
#	DSWeb.Interface/bin/Debug/HcDBUtility.dll
#	DSWeb.Interface/bin/Debug/HcDBUtility.pdb
#	DSWeb.Interface/bin/Release/DSWeb.Common.dll
#	DSWeb.Interface/bin/Release/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Release/HcDBUtility.dll
#	DSWeb.Interface/bin/Release/HcDBUtility.pdb
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csprojAssemblyReference.cache
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
#	DSWeb/UploadFiles/SysUser_Sign/1BEC90E1-9780-472F-90C2-0C6390C044A4.jpg
#	DSWeb/Web.config
#	DSWeb/bin/DSWeb.Common.dll
#	DSWeb/bin/DSWeb.Common.pdb
#	DSWeb/bin/DSWeb.Interface.dll
#	DSWeb/bin/DSWeb.Interface.pdb
#	DSWeb/bin/DSWeb.XmlSerializers.dll
#	DSWeb/bin/DSWeb.dll
#	DSWeb/bin/DSWeb.dll.config
#	DSWeb/bin/DSWeb.pdb
#	DSWeb/bin/DSWebComponent.dll
#	DSWeb/bin/DSWebComponent.pdb
#	DSWeb/bin/FrmHttpHelper.dll
#	DSWeb/bin/FrmHttpHelper.pdb
#	DSWeb/bin/HcDBUtility.dll
#	DSWeb/bin/HcDBUtility.pdb
#	DSWeb/bin/JsonHelper.dll
#	DSWeb/bin/JsonHelper.pdb
#	DSWeb/bin/OfficeHelper.dll
#	DSWeb/bin/OfficeHelper.pdb
#	DSWeb/bin/SocialExplorer.FastDBF.dll
#	DSWeb/bin/SocialExplorer.FastDBF.pdb
#	DSWeb/bin/WebSqlHelper.dll
#	DSWeb/bin/WebSqlHelper.pdb
#	DispatchWeb/obj/Debug/DispatchWeb.csproj.CoreCompileInputs.cache
#	DispatchWeb/obj/Release/DispatchWeb.csproj.CoreCompileInputs.cache
#	DispatchWeb/obj/Release/DispatchWeb.csprojAssemblyReference.cache
#	HcDBUtility/bin/Debug/HcDBUtility.dll
#	HcDBUtility/bin/Debug/HcDBUtility.pdb
#	HcDBUtility/bin/Release/HcDBUtility.dll
#	HcDBUtility/bin/Release/HcDBUtility.pdb
#	JobAutoCreateFee/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	JobAutoCreateFee/obj/Debug/JobAutoCreateFee.csproj.CoreCompileInputs.cache
#	JobAutoCreateFee/obj/Release/JobAutoCreateFee.csproj.CoreCompileInputs.cache
#	JobAutoCreateFee/obj/Release/JobAutoCreateFee.csprojAssemblyReference.cache
#	JobPingTaiWork/obj/Debug/JobPingTaiWork.csproj.CoreCompileInputs.cache
#	JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Debug/JobReqWebData.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Release/JobReqWebData.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Release/JobReqWebData.csprojAssemblyReference.cache
#	JobScheduler/JobScheduler.csproj
#	JobScheduler/obj/Debug/JobScheduler.csproj.CoreCompileInputs.cache
#	JobScheduler/obj/Release/JobScheduler.csproj.CoreCompileInputs.cache
#	JobSendAgentMail/obj/Debug/JobSendAgentMail.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Debug/JobYunDang.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Release/JobYunDang.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Release/JobYunDang.csprojAssemblyReference.cache
#	Job_BoschEdi_FTP/obj/Debug/Job_BoschEdi_FTP.csproj.CoreCompileInputs.cache
#	Job_BoschEdi_FTP/obj/Release/Job_BoschEdi_FTP.csprojAssemblyReference.cache
#	Job_DSWMS_REPORT/obj/Debug/Job_DSWMS_REPORT.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Debug/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csprojAssemblyReference.cache
#	JsonHelper/obj/Debug/JsonHelper.csproj.CoreCompileInputs.cache
#	JsonHelper/obj/Release/JsonHelper.csproj.CoreCompileInputs.cache
#	OfficeHelper/obj/Debug/OfficeHelper.csproj.CoreCompileInputs.cache
#	OfficeHelper/obj/Release/OfficeHelper.csproj.CoreCompileInputs.cache
#	WebSqlHelper/obj/Debug/WebSqlHelper.csproj.CoreCompileInputs.cache
#	WebSqlHelper/obj/Release/WebSqlHelper.csproj.CoreCompileInputs.cache
2 years ago
hanxuntao 75f72d1ffb 'hxt20220726' 2 years ago
ddlucky fd1b76a758 'bc解析修改初步完成' 2 years ago
ddlucky 53a8df8fb5 'temp' 2 years ago
ddlucky 8021ab750e '可以在vs2022用x64编译' 2 years ago
ddlucky a51c24da13 'first' 2 years ago