Commit Graph

473 Commits (6a8d72702dfd38c1e1e9d8249e10ddd014449f64)

Author SHA1 Message Date
dengyu 5044b29f29 1 1 year ago
hanxuntao 49e485889e 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
hanxuntao fd7c9de4bf 1 1 year ago
hanxuntao 32564a977d 1 1 year ago
hanxuntao e63193d9c1 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 37a4020809 方合派车小程序,和任务生成费用。全部完成 1 year ago
hanxuntao 80b5cef19f 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
dengyu 9fb600baab 青岛金港物流,给海运出口增加一些针对新仓储的功能 1 year ago
hanxuntao 79dd52bd5a 1 1 year ago
hanxuntao 3ee5414241 1 1 year ago
hanxuntao c88a5f7b21 1 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 99e3b357c2 1 1 year ago
dengyu 55331cc3f0 1 1 year ago
dengyu c2f8c5b9fb 1 1 year ago
dengyu c636a7e6ac 海运进口的[引入报关信息]功能,改为优先匹配报关单号,如无报关单号则匹配主提单号;付费发票核销查询语句除错;针对dswebapp的接口未完成 1 year ago
hanxuntao 5b0aefc51b 1 1 year ago
hanxuntao 627a89cb8d 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 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
hanxuntao 16ca4c4559 1 1 year ago
hanxuntao 421c544dfe 1 1 year ago
hanxuntao 29f4d04616 1 2 years ago
hanxuntao ec091f3048 1 2 years ago
hanxuntao ab726b343d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 20f8557de8 1 2 years ago
ddlucky 4f9f0c1b79 调用固定费用时,修改税率后,计算一次发票金额和发票税额 2 years ago
ddlucky 787711b597 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky b48e641789 费用选择时,用客户的固定费用填充发票税率 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 f7c6993af2 单一窗口商品明细,增加对“监管要求”的记录和显示;签单条业务明细表增加选择复制 2 years ago
hanxuntao f9df8a838a 1 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 93009361f1 1 2 years ago
hanxuntao 72ccee3461 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 1d8fd1dd37 展鸿船务:签单条业务微调;往来单位固定费用增加发票税率 2 years ago
ddlucky 2f63fa9b35 展鸿船务签单条业务修改 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
ddlucky ebe655e84a 发票接口信息增加分公司选项。 2 years ago
ddlucky 8b118143a8 1 2 years ago
hanxuntao 75e42a7945 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
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 5f0094a36c 签单条业务微调 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 46e3a94360 签单条功能微调 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 8267e11cee 1 2 years ago
hanxuntao 2ff1565421 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 482f15e817 1 2 years ago
hanxuntao 43fb5ea25b 1 2 years ago
hanxuntao 4992b38cdf 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
ddlucky b6d94b3cae 仓储结算清单调整,主要解决如下问题:仓储结算清单的删除为标记删除,但判断现有业务的逻辑没有按标记删除记录。修改后新增仓储结算清单,或删除时,对已有业务的判断应已正常。 2 years ago
hanxuntao e6747f3cdb 1 2 years ago
ddlucky 857325164f 荣圣达泛微接口调用微调;展鸿船务签单条,发出签单信息按钮,改为防止连续点击的形式 2 years ago
ddlucky 7f4c742830 内贸空运生成费用改为调用后台生成费用方法 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 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 b3b3b69d6a 签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次,如查询结果个数为1,自动将其打开。这样可以配合扫码枪工作。 2 years ago
ddlucky ec258d4cb8 签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次。这样可以配合扫码枪工作。 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 755aa9fc09 签单条模块,功能完善 2 years ago
ddlucky eae2a1a31b 签单业务模块完成;目前使用http://39.101.1.89:18886服务器地址,唯一对应一个证书 2 years ago
hanxuntao 059a02e378 1 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 2db9cf2b14 济南虎鲸,旧仓储,出库明细增加显示入库明细中的生产日期 2 years ago
ddlucky 217b1d1672 良通捷运的明细仓储部分,查询修改为通用分页方式; 2 years ago
ddlucky 007910c8af Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky b57b6259d1 20230313-略微改进提单信息页面的新建和复制新建逻辑 2 years ago
hanxuntao 754fa7e7d2 1 2 years ago
ddlucky 56ef6162cb ESL那三个功能完成了
1:通过写在主提单号格里面的SO号,获取ESL号,如能获取到,则将SO号写入申请放箱号,ESL号写入主提单号
2:通过写在主提单号里面的ESL号获取ETA并更新至预抵日期;
3:批量发送格式单到自己的邮箱;通过写在主提单号里面的ESL号获取EP号,并隐蔽记录;再根据此EP号和操作者自己个人信息的邮箱,触发目前已有的发送draft邮件接口,同时在海运出口的单据管理里面增加一条附件draft.pdf
2 years ago
ddlucky f47a7ee9a2 20230310-2 2 years ago
hanxuntao e058d0321a 1 2 years ago
ddlucky af4b56571f 20230307瑞京内贸空运:1主单内的分单号改为不允许修改;2不论主单还是分单,费用锁定时不允许执行保存。 2 years ago
ddlucky 6754eb5d4f ESL相关功能。未完成,先做对瑞京内贸空运的功能修改 2 years ago
ddlucky 751453df1e 海运出口,业务列表,增加【推送费用至港联顺接口】的功能 2 years ago
ddlucky 0e6b952182 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky b9b42028f4 海运出口委托管理,引入场站数据,改为用重量+皮重填充参考重量和称重重量,并将称重方式默认为累加 2 years ago
hanxuntao cc168345d4 1 2 years ago
hanxuntao 20064bb0b7 1 2 years ago
hanxuntao 4ad8780a3a 1 2 years ago
hanxuntao 959fe906de 1 2 years ago
hanxuntao 13fd390fba 1 2 years ago
ddlucky 44170cf9bc 出库费用入账,参数略作修改;出库管理,store载入简化 2 years ago
hanxuntao 9257d51a29 1 2 years ago
hanxuntao 8c2d76c74f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
# Conflicts:
#	BookingJieFeng/BookingJieFeng.csproj.user
#	BookingWeb/BookingWeb.csproj.user
#	DSWeb/DSWeb.csproj.user
#	DispatchWeb/DispatchWeb.csproj.user
2 years ago
hanxuntao 2ab901f249 1 2 years ago
ddlucky b45d05d11c 总账管理-凭证录入,复制时清空凭证号。 2 years ago
ddlucky b100a5d9e4 佣金导入,如提单号未找到对应业务,则告警然后不导入;内贸空运主单的保存增加日志记录; 2 years ago
ddlucky 0264c3a7fb 新仓储去掉复制添加 2 years ago
ddlucky 2fdaf12500 20230207-2 2 years ago
ddlucky 27d0f0b5e9 仓储入库的箱号下拉菜单载入条件稍作调整;去掉钉钉审核后件重尺内的非数字字符 2 years ago
dengyu f343648b0f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
dengyu aa8ffdab92 20230206-1仓储入库增加复制添加 2 years ago
hanxuntao 31da09ec7e 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 ead2707c07 grid单元格可垂直居中 2 years ago
ddlucky ae64419adb 合规校验:每行前方的图片水平居中 2 years ago
ddlucky fe168e3196 DS7合规校验内容的显示样式稍作修改;诚锐出库流程变动 2 years ago
ddlucky be33cabfc1 旧仓储,出库,钉钉审批。如果已提交则在出库业务列表的【钉钉审批】列显示“已提交钉钉” 2 years ago
ddlucky 314f83cf68 旧仓储出库的钉钉审核部分,如果设为钉钉审核,则点击费用入账后提交钉钉,钉钉审核后实际执行费用入账。 2 years ago
ddlucky 4420e0790c 模块允许复制 2 years ago
hanxuntao e0f1dd75bf 1 2 years ago
hanxuntao e930ebe797 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 22c53d569e 12 2 years ago
ddlucky 182c51d1d2 20230113-2 2 years ago
ddlucky 0f77ab7080 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky ae11e28fbf 仓储入库费用入账时触发钉钉审批,未完成 2 years ago
hanxuntao 37fc5dc7ef 1 2 years ago
hanxuntao 6ecb5d860c Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 17456878e3 1 2 years ago
ddlucky b426ab2ca6 防止一沓科技的ocr识别执行无recordId的获取识别结果。 2 years ago
ddlucky 9eb25d6395 诺诺开票接口变更,初步完成待测试;ds7仓储入库费用入账加钉钉审核,未完成; 2 years ago
hanxuntao c82b56cfdd 1 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 abd387c52c 左右版chfee页面的允许编辑逻辑改为和正常上下版的一致 2 years ago
ddlucky 33646893cf 取消原有的合规校验逻辑 2 years ago
ddlucky 3a8642b56d 20230103合规校验完成 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 435a55e8c8 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 5f144a4ae9 vgm接口直发增加对接口支持的船公司范围的支持 2 years ago
hanxuntao e1ef1d090f 1 2 years ago
ddlucky 35d720eef3 对大简云的信息对接:读取状态的消息队列已完成,目前使用测试地址;发送VGM未完成;对接合规接口未完成。20221227 2 years ago
hanxuntao 611fdfe0e3 1 2 years ago
hanxuntao 1c535646a4 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 0125ca9a32 1 2 years ago
ddlucky 1541ed13d0 '20221208壹沓科技ocr识别接口完成' 2 years ago
hanxuntao 6f9099858c 1 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 6ecbc3d456 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 97b57f33ac 1 2 years ago
ddlucky 514a21d1f5 '单一窗口改客户端文件解析模式,未完成' 2 years ago
ddlucky a33ddad90e '内贸空运编辑页面增加显示所属公司下拉框' 2 years ago
ddlucky f9c9f2a73b 'MsOpSeaiComtroller.GetCtnDetailList增加返回值数量,由默认50改为1000' 2 years ago
ddlucky 76ef191632 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 10664575c6 '仓储入库的子列表行数从未指定改为1000条,以应对多于50条的入库明细和导入入库信息' 2 years ago
hanxuntao 100ce9ef98 1 2 years ago
hanxuntao 04404b446e 1 2 years ago
hanxuntao d7ed85e16d json新版本 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
ddlucky f70d4ac736 20221021令P2开票模块显示冲红按钮 2 years ago
ddlucky 5bb1815df0 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 3f0bdf6519 1 2 years ago
hanxuntao 78c14143e8 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 763299a61f '20221019-仓储入库,入库明细分页改为1000行每页,原50行,导致显示不全' 2 years ago
hanxuntao 8b59c5c0f6 pp 2 years ago
ddlucky 8a13562616 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky c704d998b2 '20220930-1' 2 years ago
hanxuntao 99f5c6f503 1 2 years ago
hanxuntao 8186222919 1 2 years ago
hanxuntao 893a44a56f 1 2 years ago
hanxuntao e55fc05c41 1 2 years ago
hanxuntao 583e13394f Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 78f6ad5177 1 2 years ago
ddlucky eb0f0cd2aa Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
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 6cedf7dd31 1 2 years ago
hanxuntao 8c0d5375a5 1 2 years ago
hanxuntao 6626a76cf6 1 2 years ago
hanxuntao b7bbf5d833 1 2 years ago
hanxuntao 28ba1f7056 1 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 3525e55ec2 1 2 years ago
hanxuntao ed89d3ace7 1 2 years ago
hanxuntao d21e63bc97 1 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