Commit Graph

111 Commits (faf21b862a55d26d78f4501ecd72ffea8d56be41)

Author SHA1 Message Date
ddlucky 428350e3f7 '泰邦-资金占用表:增加【应结日期-ETD】用来显示按ETD+60天计算的应结日期,该日期只在该模块内起作用' 2 years ago
hanxuntao 380d7404d6 1 2 years ago
hanxuntao 90e5b66de2 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
# Conflicts:
#	DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user
2 years ago
hanxuntao a0c925375e 1 2 years ago
ddlucky e7a444b2d9 '泰邦修改提成计算方法' 2 years ago
hanxuntao a345036932 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 6cedf7dd31 1 2 years ago
ddlucky 553284d17f 泰邦 提成计算模块 增加乘以天数 2 years ago
hanxuntao 8c0d5375a5 1 2 years ago
hanxuntao 6626a76cf6 1 2 years ago
hanxuntao 107b06b73c Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao b7bbf5d833 1 2 years ago
ddlucky 23563040fc 内贸空运分单变更主单燃油费时 同时变更主单的杂费(otfee1-8之和)和总金额(杂费运费声明价值费和地面运费) 2 years ago
hanxuntao 28ba1f7056 1 2 years ago
hanxuntao 9b9690d872 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 7315ad6b7d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 778509809e '20220909网上订舱业务生成时BOOKING.OP_SEAE_ORDER.ORDERNO防止重复' 2 years ago
ddlucky 2999d1828a 增加对东胜接口发VGM的客户的【生成对大简云】的应付的业务逻辑。需要配合数据库版本7220906 2 years ago
hanxuntao 3de3d1c480 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao d86993e3e2 1 2 years ago
ddlucky 179f2d835f '20220907网上订舱确认增加防止重复' 2 years ago
hanxuntao 5308f38e96 1 2 years ago
hanxuntao 3525e55ec2 1 2 years ago
hanxuntao 1b94f59ec1 1 2 years ago
hanxuntao ed89d3ace7 1 2 years ago
hanxuntao 9b516f3104 1 2 years ago
hanxuntao d21e63bc97 1 2 years ago
ddlucky 862d39f343 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 1db11f5546 '20220829直发舱单分单时也增加对大简云应付' 2 years ago
hanxuntao 9ebda82302 1 2 years ago
hanxuntao 7b8c377c69 r 2 years ago
hanxuntao cf2d4d1132 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 202fc0c534 箱管 2 years ago
ddlucky 86a3ad7d52 从应收应付费用生成收费申请后清空收费申请下方的查询结果 2 years ago
ddlucky 726752d29e '消除几个列表的重复字段' 2 years ago
hanxuntao 4ae5e8a67e 0815 2 years ago
hanxuntao b05239955e 1 2 years ago
hanxuntao 08756d4289 Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 0543aeeaab 1 2 years ago
ddlucky bcfad35e3c '往来单位中上一客户下一客户改好' 2 years ago
ddlucky f10d9c163c 'DJY账号注册_未完成,暂时隐藏' 2 years ago
ddlucky b6a8571918 内贸空运 部分修改 2 years ago
hanxuntao c896e7c875 2 2 years ago
ddlucky 3eb069907b '内贸空运主单显示揽货人和客服' 2 years ago
ddlucky 1c4cf0e6d1 '内贸空运主单显示揽货人和客服' 2 years ago
hanxuntao 55cef2da8c q 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
hanxuntao 077b95db40 2 2 years ago
hanxuntao d634a95779 ss 2 years ago
hanxuntao 16a97d6174 0721 2 years ago
ddlucky fd1b76a758 'bc解析修改初步完成' 2 years ago
ddlucky 53a8df8fb5 'temp' 2 years ago
hanxuntao 749f067ccc A 2 years ago
ddlucky 0cedf20ee1 '几处js中的合计数由使用加号改为使用add' 2 years ago
ddlucky 7c3182f0b0 '20220711' 2 years ago
hanxuntao 658e6ce3b2 2022-7-1 2 years ago
ddlucky 14e6227ce6 '自动生成舱单费,分单功能' 2 years ago
ddlucky 4b7ab86c1a '海运出口-直发舱单,发送成功后产生应收应付费用' 2 years ago
hanxuntao b52e179fbd 11 2 years ago
ddlucky a51c24da13 'first' 2 years ago