Commit Graph

274 Commits (f5ad899773a43eace41ba0acfb9410e13abe746c)

Author SHA1 Message Date
dengyu e6c9a5c386 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 0bd0a3f1ee 增加针对金港物流的dswms,读取客户合同的需求 1 year ago
hanxuntao e63193d9c1 1 1 year ago
hanxuntao 53500c0721 1 1 year ago
hanxuntao 7e9e2d2336 1 1 year ago
hanxuntao 80b5cef19f 1 1 year ago
hanxuntao b4d93a0e12 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 22f759046b 1 1 year ago
hanxuntao 81e0bfe49b Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao 3f6208b665 1 1 year ago
dengyu 4517264358 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 92465a9332 诺诺全电,增加分机号逻辑 1 year ago
hanxuntao 5ac4924f72 1 1 year ago
hanxuntao 42a7bb6411 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu c3c2a3b7f4 20230724 1 year ago
hanxuntao 79dd52bd5a 1 1 year ago
hanxuntao 1fb55c9be5 1 1 year ago
hanxuntao c88a5f7b21 1 1 year ago
dengyu d8614e2500 2 1 year ago
hanxuntao 6d056f2330 1 1 year ago
hanxuntao 9ac51debf2 1 1 year ago
hanxuntao df1ccb6350 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao 2e7432598c 1 1 year ago
dengyu c2f8c5b9fb 1 1 year ago
dengyu 0c88adba84 付费发票核销,查询子句除错 1 year ago
dengyu c636a7e6ac 海运进口的[引入报关信息]功能,改为优先匹配报关单号,如无报关单号则匹配主提单号;付费发票核销查询语句除错;针对dswebapp的接口未完成 1 year ago
dengyu 190d2eea91 全电红票的读取,改为不受“无流水号”的限制 1 year ago
hanxuntao 5b0aefc51b 1 1 year ago
hanxuntao 627a89cb8d 1 1 year ago
hanxuntao a6abc298f3 1 1 year ago
hanxuntao 3e6b28fa85 1 1 year ago
hanxuntao aef908a12b 1 1 year ago
hanxuntao 6a39663ff8 1 1 year ago
hanxuntao 21b681e64b 1 1 year ago
hanxuntao b8bc3b137d 1 1 year ago
hanxuntao 595d45f230 11 1 year ago
hanxuntao 642abc6d68 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
ddlucky 4f5e05cb45 20230626 1 year ago
ddlucky 98551247c0 针对dswms的app接口 1 year ago
hanxuntao 16ca4c4559 1 1 year ago
ddlucky 9d237e73aa 1 2 years ago
ddlucky 6c87545aa7 增加对dswms的手机app当中财务审批部分的接口 2 years ago
ddlucky 2492ae13e7 增加应对dswms的app当中财务审批功能的接口;
单一窗口读取后,增加刷新前端的文档
2 years ago
hanxuntao ec091f3048 1 2 years ago
hanxuntao 04a9414f84 1 2 years ago
hanxuntao f513acd9ab 1 2 years ago
hanxuntao 0a987e5115 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 2153dcb179 诺诺全电冲红,功能微调 2 years ago
hanxuntao 1e42243021 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao f9df8a838a 1 2 years ago
ddlucky 5120927697 全店冲红修改 2 years ago
hanxuntao 6e712f5f25 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 16701baf25 1 2 years ago
ddlucky 6eb6f26fac 20230614 2 years ago
ddlucky 8a10c204eb 签单条业务修改;报关业务修改(金港 增加查验通知记录); 2 years ago
hanxuntao 72ccee3461 1 2 years ago
hanxuntao 2c83c244ee 1 2 years ago
hanxuntao 6b9d774da9 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 79a9b578a2 1 2 years ago
ddlucky c6d712ab4b 1 2 years ago
ddlucky 347b395d78 增加一个可通用的客户欠费查询小窗口;诺诺冲红对蓝票的重复点击冲红增加处理细节 2 years ago
hanxuntao 309fb45515 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 0185e8ed32 1 2 years ago
ddlucky a02a7db2ef 诺诺全电 2 years ago
ddlucky ebe655e84a 发票接口信息增加分公司选项。 2 years ago
ddlucky bb3f81c7bd 全电发票冲红测完/业务信息发布,逻辑微调 2 years ago
hanxuntao 8afbc696e0 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 75e42a7945 1 2 years ago
ddlucky 6445723d7b 诺诺全电冲红测试1 2 years ago
hanxuntao faeb865ad9 dd 2 years ago
ddlucky f2f5476c1e 1 2 years ago
ddlucky 1c71220d7e 诺诺全电冲红逻辑修改未测试 2 years ago
ddlucky 891dd94e3d 单一窗口,保存时同步至海运进口业务,条件为:
如果在单一窗口点读取的时候,
存在一个海运进口业务的:
‘提单号不为空且与该单一窗口报关业务一致’
或‘报关单号不为空且与该单一窗口报关业务一致’

而且符合条件的业务只有一条

才做同步处理
2 years ago
hanxuntao 0b976f73f1 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 0029b847c4 1 2 years ago
ddlucky 7c99712b3a 增加对诺诺全电发票的支持。需配合升级脚本。未测试完成;原有的选择诺诺发票或者瑞宏发票的客户不受影响。 2 years ago
ddlucky 796611678c 荣圣达泛微OA审批,审批时如审批人没有业务权限范围,则增加报错 2 years ago
hanxuntao d8e565d89c Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 70ae224605 1 2 years ago
ddlucky 71118f6885 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky a09fef8a07 诺诺全电票未完成,但不妨碍原有逻辑运行。
报关业务针对金港物流提出的问题做部分调整:1:单一窗口读取优先使用唯一编号;2:进口业务的境外收发货人对应;3:在进口业务中获取报关业务信息,如有报关单号优先使用,如报关单号提单号都有同时使用,如都没有不进行获取。
2 years ago
hanxuntao ff09c32dc4 1 2 years ago
hanxuntao 8fba7ce094 1 2 years ago
hanxuntao b4d420d7c2 1 2 years ago
hanxuntao 43fb5ea25b 1 2 years ago
hanxuntao 4992b38cdf 1 2 years ago
hanxuntao 5ced9bfecb 1 2 years ago
hanxuntao a8cf2cc266 1 2 years ago
hanxuntao e6747f3cdb 1 2 years ago
hanxuntao 141d069377 1 2 years ago
hanxuntao a8b78968df 1 2 years ago
hanxuntao 4b634b7c7f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 2610a3f16f 12 2 years ago
ddlucky eae2a1a31b 签单业务模块完成;目前使用http://39.101.1.89:18886服务器地址,唯一对应一个证书 2 years ago
hanxuntao fdaf6cc78f 1 2 years ago
hanxuntao e058d0321a 1 2 years ago
hanxuntao 156d1941cb 1 2 years ago
hanxuntao 959fe906de 1 2 years ago
hanxuntao 317fcafa50 11 2 years ago
hanxuntao 2773f78a3f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 13fd390fba 1 2 years ago
ddlucky c06211b2b4 调整几个模块的本部门权限的写法 2 years ago
ddlucky 4af7716002 略微调整几个模块的本公司权限的写法 2 years ago
hanxuntao 9257d51a29 1 2 years ago
ddlucky 3e060d3d47 旧仓储,仓储费结算清单,改为对明细出库的业务同样适用。 2 years ago
hanxuntao 2ab901f249 1 2 years ago
hanxuntao 4a10c2c51d 1 2 years ago
hanxuntao 12cfcabc97 1 2 years ago
hanxuntao 779f5f1259 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
# Conflicts:
#	DSWeb/DSWeb.csproj.user
2 years ago
hanxuntao c2abbeebbe 1 2 years ago
ddlucky 628d9982f4 荣圣达泛微OA接口,增加对附件的发送 2 years ago
ddlucky 5f28226bee 20230129-2 2 years ago
ddlucky acca263354 荣圣达服务微调;诚锐钉钉接口返回值处理微调 2 years ago
hanxuntao e0f1dd75bf 1 2 years ago
ddlucky 38a8dd8717 荣圣达泛微OA对接,增加对oa返回错误的处理;发送时增加取部门id写道sqbm字段 2 years ago
ddlucky 4feeab87fa 诺诺开票逻辑回滚至原逻辑 2 years ago
ddlucky a9d938f7a7 20230110-2 2 years ago
ddlucky 9eb25d6395 诺诺开票接口变更,初步完成待测试;ds7仓储入库费用入账加钉钉审核,未完成; 2 years ago
hanxuntao 8c3b6cf098 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 8998fbc262 1 2 years ago
ddlucky 544e405828 荣圣达泛微OA审批对接完成 2 years ago
hanxuntao bea67ab9f4 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao c82b56cfdd 1 2 years ago
ddlucky 2206329be2 webconfig中FanWeiOAAPI=true时付费申请审核不允许执行撤回操作 2 years ago
ddlucky 1fb765dc50 荣圣达泛微OA对接,DS7部分回写泛微OA的流程ID至ch_fee_payapplication的PAYAPPID 2 years ago
hanxuntao 0e32f06764 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao f11a1b1c32 1 2 years ago
ddlucky 5df720d0f8 荣圣达泛微OA对接,DS7已完成待测试;读取服务未完成 2 years ago
ddlucky 2030df5b52 20230104-2 2 years ago
ddlucky 0c2744c5dc Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky fef96f0f60 海运出口合规校验,未完成(缺少箱信息) 2 years ago
hanxuntao e1ef1d090f 1 2 years ago
ddlucky fcf82c652e 荣盛达泛微系统对接,未完成 2 years ago
hanxuntao 611fdfe0e3 1 2 years ago
ddlucky 2e0b8acaf3 付费申请增加的部分目前不影响正常业务 2 years ago
dengyu 75b60efa46 付费申请编辑页的提交审核后台方法增加对荣圣达的泛微OA系统流程的支持,未完成 2 years ago
ddlucky 65ae6d02ef '20221209-1' 2 years ago
ddlucky 4e3170d980 '20221205佣金导入,对费用锁定的业务产生费用更改单' 2 years ago
hanxuntao 2234cee050 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 6f9099858c 1 2 years ago
ddlucky d47e01f0c8 收费申请的申请人改为仅insert,不可修改(防止丢收费申请申请人) 2 years ago
hanxuntao 77eac79b0d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 8dc10d1311 11 2 years ago
ddlucky 45b729d148 20221130-仓储期间对账,如仓储业务已费用锁定,则将费用产生至费用更改单;取消时如相应更改单费用1或6,则相应删除。注意该费用备注为仓储期间对账的DUINO 2 years ago
ddlucky 22350df0be '20221130-仓储结算清单当中点击【费用入账】向仓储业务中生成费用时,如果仓储业务已费用锁定,则在这些业务中增加费用更改单,并在其下面产生相应的费用,并将这些费用提交审核。如果点击【取消入账】,则判断是否有费用的备注内容是这个仓储结算清单的DUINO,如果有,判断其是否能删除(feestatus=1或6),如可以删除,则删除这些费用和更改单。' 2 years ago
hanxuntao 97b57f33ac 1 2 years ago
hanxuntao 100ce9ef98 1 2 years ago
hanxuntao c6f56f93b2 钉钉接口 2 years ago
hanxuntao a6c5e7ffa2 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao abf1bf7641 1 2 years ago