Commit Graph

199 Commits (31be1d1977cf00ab12b43ea8c1d871472d7eb182)

Author SHA1 Message Date
ddlucky 74441648c0 Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan 2 years ago
ddlucky b8f0925a76 '20221209-1' 2 years ago
hanxuntao 36062732c4 1 2 years ago
hanxuntao 4b67893bff 1 2 years ago
hanxuntao 84cd9d8d94 Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan 2 years ago
hanxuntao 1e729b0527 1 2 years ago
ddlucky 84d4ed7f01 Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan 2 years ago
ddlucky 1f9bab2618 '收费申请的申请人改为仅新建时可写,防止丢申请人' 2 years ago
hanxuntao decdbd6c48 Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan 2 years ago
hanxuntao eb739c9bfd 1 2 years ago
ddlucky 8173de32d3 '20221202工单SR2022111700008经汉舱单业务改多票;舱单和报关增加实际用户;费用中使用BXGID存储分单号' 2 years ago
ddlucky 96069fa15a '20221201舱单业务模块增加舱单业务列表,改为一对多关系' 2 years ago
hanxuntao 71d74c64cf 1 2 years ago
hanxuntao 7d65a8d31d 客户对账 2 years ago
ddlucky 99eec3befd '20221118监管车模块完成' 2 years ago
ddlucky 0b1d51c72f '20221118监管车模块基本完成' 2 years ago
ddlucky 78f759bcf6 '20221117监管车业务、未完成' 2 years ago
ddlucky a5af288048 20221116监管车业务后台完成前台未完成 2 years ago
hanxuntao 5776d1e386 1 2 years ago
hanxuntao bd2ed97ee5 1 2 years ago
hanxuntao cd957506df 12 2 years ago
hanxuntao c2beebdb72 2 2 years ago
hanxuntao 7edb217956 1 2 years ago
ddlucky 4e74e86932 '监管车业务;增加sqlsuger支持。可编译未完成' 2 years ago
ddlucky 1cd010ddfe '快递业务和舱单业务完成20221115' 2 years ago
ddlucky 58ec0e9a90 '舱单业务完成20221114' 2 years ago
ddlucky 47f256323b '恢复错误提交的文件20221114' 2 years ago
ddlucky 3fd7c3ed2f '20221114' 2 years ago
ddlucky 1d5d4c8d49 '增加两个依附于opother的业务【舱单,快递】' 2 years ago
hanxuntao 046318934e 1 2 years ago
hanxuntao 5f41c7e721 1 2 years ago
hanxuntao 4f62cf4e51 1 2 years ago
hanxuntao 2aab8dd81d 1 2 years ago
hanxuntao 138c89a0c9 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
hanxuntao 83a1ac73a9 1 2 years ago
ddlucky 179f2d835f '20220907网上订舱确认增加防止重复' 2 years ago
hanxuntao 7088d6bfd5 1 2 years ago
hanxuntao 5308f38e96 1 2 years ago
hanxuntao bccaf536f3 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 3525e55ec2 1 2 years ago
ddlucky d154d9a4c3 发票申请的申请单号增加可点击的复制单号按钮 2 years ago
hanxuntao 1b94f59ec1 1 2 years ago
hanxuntao ed89d3ace7 1 2 years ago
hanxuntao 9b516f3104 1 2 years ago
hanxuntao d21e63bc97 1 2 years ago
hanxuntao b51dc1d0c5 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao ca5f33e8b5 1 2 years ago
ddlucky 862d39f343 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago