Commit Graph

752 Commits (e4202f824e47699d77d17b23e5fcf5c8abfebda3)

Author SHA1 Message Date
dengyu f5f9eac7aa 1 1 year ago
dengyu 710344e4dc Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 5044b29f29 1 1 year ago
hanxuntao 6d7fd2c57d Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao 49e485889e 1 1 year ago
dengyu 51a9d4ea77 全电发票,取key的公司,由head.companyid改为salecorpid 1 year ago
dengyu 756c46d57f 付费申请审批,debug 1 year ago
dengyu 6b51dffe96 20230831 1 year ago
dengyu 4ec392f719 1 1 year ago
dengyu c378cfdfe5 工作流当中通过optype对应工作流名字,改为用一个函数管理;诺诺全电发票获取信息,查询之前没有加上公司id,现已增加 1 year ago
dengyu f443d0fc6a 增加供dswms调用的费用提交审核接口 1 year ago
dengyu ae942ec77c Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 853305f4cf 1 1 year ago
dengyu c23d7cf0c5 1 1 year ago
hanxuntao 3c759cba24 1 1 year ago
hanxuntao b0aeaa651e 1 1 year ago
dengyu 329d9a004a Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 14b3da6f3e 1 1 year ago
dengyu 16a3b3932b 荣圣达泛微OA接口,票结业务明细增加启运港、卸货港、目的港 1 year ago
hanxuntao 640a09ecff Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao fd7c9de4bf 1 1 year ago
dengyu 7fa3735ff2 单一窗口货物明细增加显示法定第一数量 1 year ago
dengyu 6b53040d4c Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu b5ec18c95e 20230822 1 year ago
hanxuntao 32564a977d 1 1 year ago
dengyu 95159f9b4e 裕龙仓储小程序,增加上传图片时图片的公司id 1 year ago
dengyu 2eea9593bb 付费发票核销 审核界面 增加双击明细显示业务信息 1 year ago
hanxuntao 9d4e2d739b 1 1 year ago
hanxuntao 1ee64841dd 1 1 year ago
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 1f9f0afa95 1 1 year ago
hanxuntao e63193d9c1 1 1 year ago
hanxuntao 53500c0721 1 1 year ago
dengyu 93cec7cede Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 396435e578 增加定时读取单一窗口信息的服务;ds7相应增加了一个接口 1 year ago
hanxuntao 7e9e2d2336 1 1 year ago
hanxuntao 27a951c708 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao ec69380dad 12 1 year ago
dengyu 7cad378229 删除无用的文档 1 year ago
dengyu 37a4020809 方合派车小程序,和任务生成费用。全部完成 1 year ago
dengyu 6e13621688 方合微信小程序用后台部分完成 1 year ago
dengyu 18e8094472 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 0467fbc717 方合派车20230807 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 0cfdd4f6c4 1 1 year ago
dengyu 53dba8aa9b 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
dengyu 9fb600baab 青岛金港物流,给海运出口增加一些针对新仓储的功能 1 year ago
hanxuntao e91a1e954a 1 1 year ago
hanxuntao 09fba917dc Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao bd3855130d 1 1 year ago
dengyu f4cb3af177 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 28b89b5cb6 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
dengyu 67b92f17f8 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu d1abdb4f49 1 1 year ago
hanxuntao 3ee5414241 1 1 year ago
hanxuntao 1fb55c9be5 1 1 year ago
hanxuntao c88a5f7b21 1 1 year ago
ddlucky 582344d070 1 1 year ago
ddlucky f02e890e0d 1 1 year ago
dengyu 9a10166413 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu d8614e2500 2 1 year ago
hanxuntao 764939dcdb Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao 290bea30dd 1 1 year ago
dengyu 13527af340 海运进口模块,引入报关信息时,将第一条货物信息的规格,写到opseai.remark2里面 1 year ago
hanxuntao c88048487e 1 1 year ago
hanxuntao 6d056f2330 1 1 year ago
hanxuntao 4028f618c5 1 1 year ago
hanxuntao 64d3f83222 1 1 year ago
hanxuntao 9ac51debf2 1 1 year ago
hanxuntao 99e3b357c2 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 55331cc3f0 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
dengyu deafea4cc2 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu f586ff471b 单一窗口,读取信息,商品信息防止重复;增加对dswmsapp的一些支持; 1 year ago
hanxuntao 5b0aefc51b 1 1 year ago
hanxuntao 627a89cb8d 1 1 year ago
hanxuntao 6539c9037b Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
hanxuntao a6abc298f3 1 1 year ago
dengyu 1dd87bbe54 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 397b1cfc55 综合业务的装货港卸货港改为依赖枚举类型83000,保存综合业务时,向这个表中添加数据(如果需要的话) 1 year ago
hanxuntao 3e6b28fa85 1 1 year ago
hanxuntao de44236762 1 1 year ago
hanxuntao 7220d1f2b6 1 1 year ago
hanxuntao aef908a12b 1 1 year ago
hanxuntao 6a39663ff8 1 1 year ago
hanxuntao 21b681e64b 1 1 year ago
hanxuntao 98122f4d3f 12 1 year ago
hanxuntao b8bc3b137d 1 1 year ago
hanxuntao 595d45f230 11 1 year ago
hanxuntao ba452e7d01 1 1 year ago
hanxuntao 642abc6d68 Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev 1 year ago
dengyu 3c2ab7853c 内贸空运防止修改,增加对主单内主单号选择按钮的控制 1 year ago
dengyu 0a69eda5dc feedrcrgrid已消除的错误 1 year ago
ddlucky 4f5e05cb45 20230626 1 year ago
ddlucky 98551247c0 针对dswms的app接口 1 year ago
hanxuntao 6e43b394bd 1 1 year ago
hanxuntao 16ca4c4559 1 1 year ago
hanxuntao 421c544dfe 1 1 year ago
hanxuntao 346eb78aa4 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao 29f4d04616 1 1 year ago
ddlucky 9d237e73aa 1 1 year ago
ddlucky 6c87545aa7 增加对dswms的手机app当中财务审批部分的接口 1 year ago
ddlucky 2492ae13e7 增加应对dswms的app当中财务审批功能的接口;
单一窗口读取后,增加刷新前端的文档
1 year ago
hanxuntao ec091f3048 1 1 year ago
hanxuntao 04a9414f84 1 1 year ago
hanxuntao ab726b343d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao 20f8557de8 1 1 year ago
ddlucky 4f9f0c1b79 调用固定费用时,修改税率后,计算一次发票金额和发票税额 1 year ago
ddlucky 787711b597 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
ddlucky b48e641789 费用选择时,用客户的固定费用填充发票税率 1 year ago
hanxuntao f513acd9ab 1 1 year ago
hanxuntao 0a987e5115 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
ddlucky 2153dcb179 诺诺全电冲红,功能微调 1 year ago
ddlucky f7c6993af2 单一窗口商品明细,增加对“监管要求”的记录和显示;签单条业务明细表增加选择复制 1 year ago
hanxuntao 1e42243021 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao f9df8a838a 1 1 year ago
ddlucky 5120927697 全店冲红修改 1 year ago
hanxuntao 6e712f5f25 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao 16701baf25 1 1 year ago
ddlucky 6eb6f26fac 20230614 1 year ago
ddlucky 8a10c204eb 签单条业务修改;报关业务修改(金港 增加查验通知记录); 1 year ago
hanxuntao 93009361f1 1 1 year ago
hanxuntao 72ccee3461 1 1 year ago
hanxuntao 2c83c244ee 1 1 year ago
hanxuntao 6b9d774da9 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao 79a9b578a2 1 1 year ago
ddlucky 1d8fd1dd37 展鸿船务:签单条业务微调;往来单位固定费用增加发票税率 1 year ago
ddlucky 2f63fa9b35 展鸿船务签单条业务修改 1 year ago
ddlucky c6d712ab4b 1 1 year ago
ddlucky 347b395d78 增加一个可通用的客户欠费查询小窗口;诺诺冲红对蓝票的重复点击冲红增加处理细节 1 year ago
hanxuntao 309fb45515 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao 0185e8ed32 1 1 year ago
ddlucky a02a7db2ef 诺诺全电 1 year ago
ddlucky ebe655e84a 发票接口信息增加分公司选项。 1 year ago
ddlucky bb3f81c7bd 全电发票冲红测完/业务信息发布,逻辑微调 1 year ago
ddlucky 8b118143a8 1 1 year ago
ddlucky 9f2ab594ee 读取单一窗口时,是否对应进口业务并写入,改为通过系统配置进行。 1 year ago
hanxuntao 8afbc696e0 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 1 year ago
hanxuntao 75e42a7945 1 1 year ago
ddlucky 62b65b1fe7 1 2 years ago
ddlucky 82616149d2 1 2 years ago
ddlucky 9c6a5a3bee 1 2 years ago
ddlucky 6445723d7b 诺诺全电冲红测试1 2 years ago
hanxuntao 6dceea1927 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao faeb865ad9 dd 2 years ago
ddlucky f89ff171f6 诺诺开票访问地址改为使用https开头的地址 2 years ago
ddlucky f2f5476c1e 1 2 years ago
ddlucky 1c71220d7e 诺诺全电冲红逻辑修改未测试 2 years ago
ddlucky 891dd94e3d 单一窗口,保存时同步至海运进口业务,条件为:
如果在单一窗口点读取的时候,
存在一个海运进口业务的:
‘提单号不为空且与该单一窗口报关业务一致’
或‘报关单号不为空且与该单一窗口报关业务一致’

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

才做同步处理
2 years ago
ddlucky 56f4017b6d 单一窗口读取后回写海运进口业务,原逻辑为报关单或提单号有一个一致即回写,实际当提单号同为空时产生了错误的回写
目前改为【只有海运进口业务的提单号和报关单号都不为空且都与报关业务相同时,才进行回写】
2 years ago
hanxuntao 9e80a4cfde Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 1ed33e906e 1 2 years ago
ddlucky 561f8a94db Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 16fb1ff074 签单条业务查询允许二次签出;海运进口获取报关业务信息,如对应多个报关业务的话改为报错 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 927c343e7f 报关业务单一窗口,字段对应微调 2 years ago
ddlucky 65a0ace4aa 虎鲸场站管理小程序 功能微调 2 years ago
ddlucky 5f0094a36c 签单条业务微调 2 years ago
ddlucky 796611678c 荣圣达泛微OA审批,审批时如审批人没有业务权限范围,则增加报错 2 years ago
ddlucky 4af4db6131 签单条业务,执行多条签出问题修改。 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 d7fc2aae6c 单一窗口读取修改;和川大简云订舱数据对接服务修改;扫描上传提单的程序加入解决方案 2 years ago
ddlucky 46e3a94360 签单条功能微调 2 years ago
ddlucky 92bcb997a3 仍禁用:读取单一窗口后向报关业务写入集装箱信息 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 a0418bc33a 1 2 years ago
hanxuntao ff09c32dc4 1 2 years ago
hanxuntao 8267e11cee 1 2 years ago
hanxuntao 2ff1565421 1 2 years ago
ddlucky bf577bd8dc 语句处理错误 2 years ago
ddlucky 734c1ac7f0 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 4ce8aaf21a 内贸空运 ,增加逻辑:分单保存时更新主单字段,增加一个“揽货人”字段 2 years ago
hanxuntao 5eada04e87 1 2 years ago
hanxuntao 8fba7ce094 1 2 years ago
hanxuntao b4d420d7c2 1 2 years ago
hanxuntao a36dee13f3 1 2 years ago
hanxuntao a26fcd9ebf 1 2 years ago
hanxuntao bd27bbba1b 1 2 years ago
hanxuntao c0683d16e8 1 2 years ago
hanxuntao dbb912234a Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 79461ea289 1 2 years ago
ddlucky ccedf9d70f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 54a36e4323 签单条功能中,获取条码号方法改为通过stream的方式传递条码图片。 2 years ago
hanxuntao 482f15e817 1 2 years ago
hanxuntao 43fb5ea25b 1 2 years ago
hanxuntao 4992b38cdf 1 2 years ago
hanxuntao 5ced9bfecb 1 2 years ago
hanxuntao f99ed39a1f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao a8cf2cc266 1 2 years ago
ddlucky 5eb3ea3bdb Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 9a5eaec679 报关业务相关 微调 2 years ago
hanxuntao 16674a31f8 1 2 years ago
hanxuntao 5e96c606cd 1 2 years ago
hanxuntao f915161c50 1 2 years ago
ddlucky b6d94b3cae 仓储结算清单调整,主要解决如下问题:仓储结算清单的删除为标记删除,但判断现有业务的逻辑没有按标记删除记录。修改后新增仓储结算清单,或删除时,对已有业务的判断应已正常。 2 years ago
hanxuntao e6747f3cdb 1 2 years ago
ddlucky 857325164f 荣圣达泛微接口调用微调;展鸿船务签单条,发出签单信息按钮,改为防止连续点击的形式 2 years ago
ddlucky 0f7dd8d75f 荣圣达泛微对接,增加月结功能,调试完成;鼎世旧仓储,仓储结算清单,对明细出库业务的支持,修改查询逻辑 2 years ago
ddlucky 7f4c742830 内贸空运生成费用改为调用后台生成费用方法 2 years ago
ddlucky cee9330eb7 消除两处多余的引用 2 years ago
ddlucky 8e30d14f20 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky a0800b629e newtonsoft.dll统一升级至13.0.3; 2 years ago
hanxuntao 39eabb093f 1 2 years ago
hanxuntao 6d8d23a9d6 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao dd76fb4716 1 2 years ago
ddlucky e4c2a7c569 展鸿船务用,签单条模块的邮件发送改为使用传统的smtpclient方式 2 years ago
ddlucky f1bb5de47a 明港东港,海运出口点场站查询页面,增加处理,去掉页面上最后一个多余的</div> 2 years ago
ddlucky b3b3b69d6a 签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次,如查询结果个数为1,自动将其打开。这样可以配合扫码枪工作。 2 years ago
ddlucky ec258d4cb8 签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次。这样可以配合扫码枪工作。 2 years ago
ddlucky 3d83e7bec5 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 5bdf9fed2b 增加公开接口模块。暂时无用 2 years ago
hanxuntao 141d069377 1 2 years ago
ddlucky 22562ef40f 展鸿船务用手写签字板修改完成 2 years ago
hanxuntao 23f0f7bd56 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao a8b78968df 1 2 years ago
ddlucky d46b179a4e 签单条功能完善 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 755aa9fc09 签单条模块,功能完善 2 years ago
ddlucky eae2a1a31b 签单业务模块完成;目前使用http://39.101.1.89:18886服务器地址,唯一对应一个证书 2 years ago
hanxuntao 059a02e378 1 2 years ago
hanxuntao 125b849a0b Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky fc022a9f33 瑞京,内贸空运防止修改下方费用的部分,改为【如果业务的应收应付费用存在(录入状态 驳回提交)两状态之外的费用】则不允许修改。原逻辑是业务存在应收应付费用即不允许修改,这样当驳回费用之后修改运费后保存,下方费用保存后仍恢复成原来的。 2 years ago
hanxuntao 546ff9bd2e Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao fdaf6cc78f 1 2 years ago
ddlucky a3fbbf133b 展鸿需求,发draft时邮件标题改为提单号esl号;而esl号和ep号的关系在接口那边并未维护,因此改为【发draft接口】增加参数esl_code,如不传则一切照旧,如传此参数则使用此内容作为邮件标题号 2 years ago
ddlucky d1a42c8ca4 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 2db9cf2b14 济南虎鲸,旧仓储,出库明细增加显示入库明细中的生产日期 2 years ago
hanxuntao 16d39a3814 1 2 years ago
ddlucky 217b1d1672 良通捷运的明细仓储部分,查询修改为通用分页方式; 2 years ago