dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
357 Commits
11 Branches
0 Tags
1.4 GiB
DS7_HYRD
ShenZhenCHJY
DS7_JinGang
dev
QDHHYT
master
临时发布20240103
DS7_JingHan
DS7Zhanhao
HuanHaiYunTong
shenzhenchjy
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7f41fc6bd7'
${ noResults }
Commit Graph

21 Commits (7f41fc6bd73882f99d47be5fb8cc2712a2bab92b)

Author SHA1 Message Date
ddlucky e93575c11a 读取大简云发布的舱单业务，修改逻辑 
大简云舱单界面的【委托发送方】录入东胜系统的实际客户，

大简云业务中的【订舱编号】录入"市场部/海运部,MKT1(英文逗号分割)"，根据【订舱编号】录入的"市场部/海运部"对应到东胜系统里的【委托单位】，通过EDI代码设置中的EDICODE=市场部/海运部 EDINAME=大简云选择填入【委托单位】字段的内容
如果大简云业务中的【订舱编号】空着，则用大简云舱单界面的【委托发送方】 ，寻找EDI代码设置中的EDICODE=【委托发送方】 EDINAME=大简云的客户 填入【委托单位】字段的内容

订舱编号里逗号后面的“MKT1”放到源操作上

大简云业务中的【备注 】，导入到东胜系统的对账约号里；

导入舱单时产生的舱单费

1 单价从cust_fee_templatedetail当中的舱单费选取
选取标准为：根据大简云舱单界面的【委托发送方】，寻找EDI代码设置中的EDICODE=【委托发送方】 EDINAME=大简云的客户 ，用这个客户名称查询cust_fee_templatedetail当中的舱单费

2费用的结算对象 为这票业务在东胜系统中的委托单位
 2 years ago
ddlucky a1394d8f3b 20230223-钉钉通讯录读取-开始 2 years ago
hanxuntao 62e93b79dc 1 2 years ago
ddlucky 6f1188220b 关贸云调整几个字段对应，和委托单位未对应的报警 2 years ago
ddlucky 5695bfb548 '忽略提交部分配置文件' 2 years ago
ddlucky df384f57df '忽略不需要提交的文件' 2 years ago
hanxuntao 497f872870 1 2 years ago
hanxuntao 1a4079951e Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 
# Conflicts:
#	.gitignore
 2 years ago
hanxuntao aa5a97d4a9 1 2 years ago
ddlucky fd33e107ab '20220923网上订舱,流程略变动,已审核通过产生了海运出口业务的网上订舱改为不允许驳回' 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 7b8c377c69 r 2 years ago
hanxuntao a0fe16a9a2 1 2 years ago
hanxuntao ef3447e2e1 1 2 years ago
hanxuntao f621b5a03d 111 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 7a489c2e89 '' 2 years ago
ddlucky 166500de26 '' 2 years ago
ddlucky 8021ab750e '可以在vs2022用x64编译' 2 years ago