Commit Graph

213 Commits (9bfb872062628d4ce1f1b02e761f0579ddc4a21c)

Author SHA1 Message Date
ddlucky 727bc98357 20221228-4 2 years ago
ddlucky 5f144a4ae9 vgm接口直发增加对接口支持的船公司范围的支持 2 years ago
ddlucky bd1d0b5e92 20221228-2 2 years ago
ddlucky 8e5e7ae17f vgm新直发与读取状态服务完成 2 years ago
hanxuntao e1ef1d090f 1 2 years ago
ddlucky 3919ae37e2 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 35d720eef3 对大简云的信息对接:读取状态的消息队列已完成,目前使用测试地址;发送VGM未完成;对接合规接口未完成。20221227 2 years ago
hanxuntao e3b2d4b0d9 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 16f65ee53b 1 2 years ago
ddlucky 45749a8471 20221224 2 years ago
dengyu deffcebe81 20221222-1 2 years ago
ddlucky 1961ef2ad7 '20221221-1' 2 years ago
ddlucky fcf82c652e 荣盛达泛微系统对接,未完成 2 years ago
ddlucky b30e0cd01e Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 5bff1b6297 解决一个壹沓科技OCR时ETD为空引发的问题;解决MsCodeOpStatusDetail查询条件为空时的报错 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
hanxuntao 1c535646a4 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao d4b8a339b7 1 2 years ago
hanxuntao 0125ca9a32 1 2 years ago
ddlucky 1541ed13d0 '20221208壹沓科技ocr识别接口完成' 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
ddlucky 27a7425c12 20221201 2 years ago
ddlucky 04119ba67d 倍通公众号司机费用界面苹果手机样式; 2 years ago
hanxuntao 1e08d7311b 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 79f6038e72 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
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 d14172c98c 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 8186222919 1 2 years ago
ddlucky 24298f30ef 青银红柿子,向wms发送的报文增加委托编号 2 years ago
ddlucky 5955d77398 直发舱单分单生成费用时,费用的数量改为此次发送的分单的数量。 2 years ago
ddlucky df384f57df '忽略不需要提交的文件' 2 years ago
ddlucky bc227d5e4d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky d3aba0f1a8 网上订舱序号确保从0001开始;泰邦提成按工单SR2022092300004的要求修改; 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
hanxuntao b1e83ca4c4 1 2 years ago
hanxuntao 63d1748792 1 2 years ago
hanxuntao 893a44a56f 1 2 years ago
ddlucky 4408e980b3 '20220923网上订舱,流程略变动,已审核通过产生了海运出口业务的网上订舱改为不允许驳回' 2 years ago
ddlucky fd33e107ab '20220923网上订舱,流程略变动,已审核通过产生了海运出口业务的网上订舱改为不允许驳回' 2 years ago
hanxuntao e55fc05c41 1 2 years ago
hanxuntao 476697ed8b 1 2 years ago
hanxuntao c0fe1b059b 1 2 years ago
hanxuntao 743486a902 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 4e6f6e7496 1 2 years ago
ddlucky 0ab58842b4 '20220922发送VGM费用数量改为业务的箱数量' 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 a345036932 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 6cedf7dd31 1 2 years ago
ddlucky 553284d17f 泰邦 提成计算模块 增加乘以天数 2 years ago
hanxuntao 8c0d5375a5 1 2 years ago
hanxuntao 6626a76cf6 1 2 years ago
hanxuntao 107b06b73c Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao b7bbf5d833 1 2 years ago
ddlucky 23563040fc 内贸空运分单变更主单燃油费时 同时变更主单的杂费(otfee1-8之和)和总金额(杂费运费声明价值费和地面运费) 2 years ago
hanxuntao 28ba1f7056 1 2 years ago
hanxuntao 9b9690d872 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 7315ad6b7d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 778509809e '20220909网上订舱业务生成时BOOKING.OP_SEAE_ORDER.ORDERNO防止重复' 2 years ago
ddlucky 2999d1828a 增加对东胜接口发VGM的客户的【生成对大简云】的应付的业务逻辑。需要配合数据库版本7220906 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