Commit Graph

186 Commits (bb1308e30e31812519989753b2f8422e7138b71a)

Author SHA1 Message Date
ddlucky e02ee889c8 20230221-1 2 years ago
ddlucky e310429d14 2 2 years ago
ddlucky 4de20094f9 20230220-1 2 years ago
ddlucky e803ebac8f 20230217-1 2 years ago
ddlucky f6b56ae0da 业务综合台帐,查询条件所属分部和部门改成和业务利润统计的一样,增加国家和区域;界面增加国家和区域 2 years ago
ddlucky 176bd0d6ab 佣金导入,解决:【导入费用时生成到更改单的费用同时也生成一条bsno为空白的chfee 】的问题 2 years ago
ddlucky 310bd7920b 特殊放单准入算法修改:1:海运出口列表,选择业务,点选其他操作-放单通知,首先判断(1)该业务是否最后一票(2)该委托单位是否存在超期欠费,如有一条为是则告警并不弹出特放申请页面;2:特殊放单管理页面:添加业务时如BLNO为空则禁止添加;提交审核时做上述判断,如有一条为是则禁止提交;
审核审批-付款申请:下方明细表增加导出excel
2 years ago
ddlucky e1d4971e8b 20230213-1 2 years ago
ddlucky 1fba15e2d4 20230209-2 2 years ago
ddlucky ee3efdf9c9 20230208-1 2 years ago
ddlucky 4a31e83c92 20230207-1 2 years ago
ddlucky 4f4b625b35 20230206-2 2 years ago
ddlucky f784f6405d 20230203-1 2 years ago
ddlucky 7a77e53ba3 三申请应当已改为工作流以salecorpid/paycompanyid为准 2 years ago
ddlucky 252008ccd5 利润报表中关于退舱的查询条件 2 years ago
ddlucky 3e4d63147f 收付费发票三申请修改 2 years ago
ddlucky 5b6ccec89f 收费申请的查询,权限增加对salecorpid的支持,列表增加查询条件salecorpid 2 years ago
ddlucky 45b3945507 收费申请修改:默认所属分部为空;选择业务或费用向上添加时添加所选业务的销售公司进所属分部 2 years ago
ddlucky d2511ea0a9 自动对账对比提单号时大小写问题,都转换为大写后判断 2 years ago
ddlucky 726eefdd49 调整销售订舱中确认订舱时accdate默认值的逻辑,改为跟着etd走 2 years ago
ddlucky 03e40e01f8 一处js错误 2 years ago
ddlucky 69a06df798 20230105-1 2 years ago
ddlucky 6711b6344d Merge branch 'ShenZhenCHJY' of http://60.209.125.238:13080/dengyu/DS7 into ShenZhenCHJY 2 years ago
ddlucky 99a6f4a36a 20230103 2 years ago
ddlucky d9baf158a3 Merge branch 'ShenZhenCHJY' of http://60.209.125.238:13080/dengyu/DS7 into ShenZhenCHJY 2 years ago
ddlucky 88557f614e 20221229-1 2 years ago
ddlucky 6e318a8f5b 删单退舱2 2 years ago
ddlucky 32b09a317c 20221223-3 2 years ago
ddlucky cfe1e7d9e8 新的退舱改为仅通过服务项目勾选来变更 2 years ago
ddlucky 9197eb6e60 20221223-2 2 years ago
ddlucky 2cc953a102 佣金导入改为只导入正常和退舱的业务,删单和申请删单的不导入费用; 2 years ago
ddlucky 6027c55de4 Merge branch 'ShenZhenCHJY' of http://60.209.125.238:13080/dengyu/DS7 into ShenZhenCHJY 2 years ago
ddlucky 6c4a4b4cb0 20221220海运出口ETDATD;海运出口的退舱和删单 2 years ago
dengyu f212f3536b Merge branch 'ShenZhenCHJY' of http://60.209.125.238:13080/dengyu/DS7 into ShenZhenCHJY
# Conflicts:
#	DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
#	DSWeb/bin/DSWeb.XmlSerializers.dll
#	DSWeb/bin/DSWebComponent.pdb
#	DSWeb/bin/JsonHelper.dll
#	DSWeb/bin/JsonHelper.pdb
#	DSWeb/bin/OfficeHelper.dll
#	DSWeb/bin/OfficeHelper.pdb
#	DSWeb/bin/WebSqlHelper.dll
#	DSWeb/bin/WebSqlHelper.pdb
2 years ago
dengyu 858242a560 '20221218' 2 years ago
ddlucky e9acd90d00 '20221209-2' 2 years ago
ddlucky 06e0811d5a '20221209-1' 2 years ago
ddlucky ae43d0b9a4 '20221209-1' 2 years ago
ddlucky 4863633b84 导入佣金时,对已费用锁定的业务产生费用更改单 2 years ago
ddlucky 24975477fd 20221202-1 2 years ago
ddlucky fe7d023f47 '20221125-1' 2 years ago
ddlucky d0431f49d1 '20221121-1' 2 years ago
ddlucky 00a65b1043 '20221109工作台待办事项增加顺序号' 2 years ago
ddlucky 4a23b9a398 '20221104工作台待办事项完成' 2 years ago
ddlucky 6b12544725 '20221103工作台待办事项接近完成' 2 years ago
ddlucky f13ae95eac '20221102-1' 2 years ago
ddlucky 89461dee5e '20221101-1工作台未完成' 2 years ago
ddlucky afb6220f5a '待办事项未完20221031' 2 years ago
ddlucky 386d2def9e '20221021-1' 2 years ago
ddlucky 1c365a08d7 '20221020-1' 2 years ago
ddlucky 49fb876b5e '20221014-1' 2 years ago
ddlucky a636639d17 '20221009-1' 2 years ago
ddlucky 9d634e18b6 20221003-1 2 years ago
ddlucky e0392c8a10 '20220930-1' 2 years ago
ddlucky 83661660bd '20220928-1' 2 years ago
ddlucky 17d6bdfd13 '到20220926位置前期文档内修改内容已完成' 2 years ago
ddlucky 5807abe3f4 '20220923-2' 2 years ago
ddlucky c9f2e2ea09 '20220923-2' 2 years ago
ddlucky 974b7db259 '20220919-1' 2 years ago
ddlucky 74e6908ccc '20220917-1' 2 years ago
ddlucky 97215830d6 '20220916-2' 2 years ago
ddlucky dc77912954 '20220915-1' 2 years ago
ddlucky 368d4b83bd '20220913-1' 2 years ago
ddlucky 4dfbee191d '20220909-3' 2 years ago
ddlucky 91efefedd5 '20220909-2' 2 years ago
ddlucky aed34ff454 '20220908-1' 2 years ago
ddlucky 7ca7841744 '20220908-1' 2 years ago
ddlucky 52d614a41d '20220906-1' 2 years ago
ddlucky c5c046a26d '20220905-1' 2 years ago
ddlucky b8c43c2b27 '20220904-1' 2 years ago
ddlucky dac4b7c3e2 '20220902-1' 2 years ago
ddlucky dd1308e98f '20220901-1' 2 years ago
ddlucky 8809101492 '20220831-1' 2 years ago
ddlucky 63ef5517d7 '20220829-2' 2 years ago
ddlucky 9887da83f3 '20220827-1' 2 years ago
ddlucky 24c6104515 '20220826-4' 2 years ago
dengyu 8d6913f00a '20220826-3' 2 years ago
dengyu a51ef4c9c2 '20220826-2' 2 years ago
ddlucky 75747979bc '20220826-1' 2 years ago
ddlucky 9cf29b2c47 '20220824-1' 2 years ago
ddlucky 7b13caa9a1 '20220823-1' 2 years ago
ddlucky 2153e0520e '20220821-2' 2 years ago
ddlucky 4c0948cac7 '20220821' 2 years ago
ddlucky a7f33846eb '20220819-2' 2 years ago
ddlucky d669c98767 '20220818-2' 2 years ago
ddlucky 505db04cf0 '20220817空运销售基本完成' 2 years ago
ddlucky 217d8d60eb '20220814-5' 2 years ago
ddlucky 2bd6a418d1 '20220814-4' 2 years ago
ddlucky e042430e09 '20220814_3' 2 years ago
ddlucky b934890cc8 '20220814-2' 2 years ago
ddlucky 2e9b70745a '2022-813_2' 2 years ago
ddlucky b1ee4c25e3 '20220813' 2 years ago
ddlucky 37d1f06e30 '20220813修改' 2 years ago
ddlucky 6047541ad9 '20220812初步完成' 2 years ago
ddlucky b11afb5012 '删除多余的图片' 2 years ago
ddlucky 3926752bad Merge branch 'ShenZhenCHJY' of http://123.234.225.158:13080/dengyu/DS7 into ShenZhenCHJY 2 years ago
ddlucky f467787364 '20220805修改完成' 2 years ago
ddlucky 74a2b54866 '20220804下班前' 2 years ago
ddlucky ebf95caf1c '20220803空运出口销售订舱未完成' 2 years ago
ddlucky dc1f652fc0 '20220802未完成' 2 years ago