Commit Graph

1652 Commits

Author SHA1 Message Date
heyu
1028f741ee Merge pull request 'demand: TMS系统 - 客户账单管理 - 航信开票记录 - 定制导出 - 字段 快递公司取值=申请人' (#59) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/59
2025-06-16 10:36:20 +08:00
501319d514 demand: TMS系统 - 客户账单管理 - 航信开票记录 - 定制导出 - 字段 快递公司取值=申请人
committer: heyu
2025-06-16 09:21:41 +08:00
heyu
7b0f9689c1 Merge pull request 'demand: 批量修改报价增加校验日期交叉逻辑;新增根据批次号扫描组批次状态' (#58) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/58
2025-06-13 15:18:58 +08:00
8a247ae2a7 demand: 批量修改报价增加校验日期交叉逻辑;新增根据批次号扫描组批次状态
committer: heyu
2025-06-13 15:18:03 +08:00
linfso
a6c8700f9d Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-06-13 09:56:43 +08:00
linfso
253275cbc2 提成按实际重量 2025-06-13 09:55:46 +08:00
heyu
68dbc5f8fb Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查' (#55) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/55
2025-06-12 14:21:13 +08:00
26cb46e443 demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查
committer: heyu
2025-06-12 14:19:58 +08:00
heyu
3ede36e863 Merge pull request 'demand: 批量导入线路规则bug修改' (#53) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/53
2025-06-12 10:57:03 +08:00
4afcfedc14 demand: 批量导入线路规则bug修改
committer: heyu
2025-06-12 10:56:21 +08:00
heyu
4868f7bace Merge pull request 'develop' (#52) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/52
2025-06-12 10:33:58 +08:00
0ece5214b8 demand: 对接外部更新/查询运单接口,对接外部导出进仓单、查询物流轨迹接口
committer: heyu
2025-06-12 10:30:09 +08:00
linfso
ee672af586 md 2025-06-12 05:54:10 +08:00
heyu
0c687733ce Merge pull request 'demand: 定时扫描漏组批次自测bug修改' (#51) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/51
2025-06-11 17:23:25 +08:00
0fab01cd67 demand: 定时扫描漏组批次自测bug修改
committer: heyu
2025-06-11 17:22:52 +08:00
heyu
23e050fd44 Merge pull request 'demand: 线路规则、漏组批次相关逻辑调整' (#50) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/50
2025-06-11 16:09:52 +08:00
b5d9c982e3 demand: 线路规则、漏组批次相关逻辑调整
committer: heyu
2025-06-11 16:09:09 +08:00
heyu
5fb8369e0a Merge pull request 'demand: TMS系统-提成管理-运单提成明细:新增查询条件支持按支付方式查询' (#49) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/49
2025-06-10 14:49:31 +08:00
911bc976ef demand: TMS系统-提成管理-运单提成明细:新增查询条件支持按支付方式查询
committer: heyu
2025-06-10 14:49:03 +08:00
heyu
d99e4d7fce Merge pull request 'develop' (#48) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/48
2025-06-10 14:46:54 +08:00
1f71bc4c21 demand: 对接外部下单接口订单号逻辑修改
committer: heyu
2025-06-10 14:44:54 +08:00
04bd49b254 demand: 对接外部下单接口订单号逻辑修改
committer: heyu
2025-06-10 14:43:42 +08:00
linfso
15aeaa5f51 md 2025-06-09 22:15:12 +08:00
linfso
ede7e53286 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-06-09 22:09:32 +08:00
linfso
da0ddd434c md 2025-06-09 22:09:04 +08:00
3a4e632557 demand: TMS系统-提成管理-运单提成明细:新增查询条件支持按支付方式查询
committer: heyu
2025-06-09 18:43:41 +08:00
heyu
b811153a65 Merge pull request 'develop' (#47) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/47
2025-06-09 18:23:52 +08:00
c26197080f demand:TMS系统-航信开票记录查询/导出/定制导出支持按收款状态、账单月份、月结客户、销售联系人、回款联系人查询、导出
committer: heyu
2025-06-09 18:22:20 +08:00
heyu
e67ffd66d5 Merge pull request 'develop' (#46) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/46
2025-06-07 17:15:26 +08:00
4b9764efa0 demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
2025-06-07 17:03:14 +08:00
heyu
080defd184 Merge pull request 'develop' (#45) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/45
2025-06-05 14:23:45 +08:00
b220c5a40a demand: 1.定时任务批量更新新提成统计某月统计数据为空时不会更新金额bug修复 2.根据单号重新计算提成增加校验问题件及支付方式相关场景
committer: heyu
2025-06-05 14:17:16 +08:00
6d06ca6fcc demand: 问题件登记、运单修改、运单录入、网点费用申请等相关场景下触发提成重算
committer: heyu
2025-06-04 09:57:56 +08:00
linfso
fa78be9f46 md 2025-05-30 19:53:43 +08:00
linfso
034ad477ce md 2025-05-30 07:09:38 +08:00
heyu
5e7aca0701 Merge pull request 'demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项,但是此界面显示的缴款客户为空呢' (#43) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/43
2025-05-29 14:23:29 +08:00
1e2f0fea17 demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项,但是此界面显示的缴款客户为空呢
committer: heyu
2025-05-29 14:22:33 +08:00
heyu
d25cfd7144 Merge pull request 'demand:检查月结客户首次签约日期bug修改' (#42) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/42
2025-05-28 13:27:02 +08:00
90357b26ee demand:检查月结客户首次签约日期bug修改
committer: heyu
2025-05-28 13:26:19 +08:00
heyu
780868584e Merge pull request 'develop' (#41) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/41
2025-05-28 10:54:06 +08:00
31259ec806 demand:TMS系统-运单录入限制:寄件国家和目的国家需要和所选线路一致
committer: heyu
2025-05-28 10:52:56 +08:00
db4e658ec1 demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易/退款时间不能早于当天
committer: heyu
2025-05-27 18:58:44 +08:00
ace2a5034d demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易时间不能早于当天
committer: heyu
2025-05-27 18:49:21 +08:00
ec274798ed demand:报价管理页面新增批量修改报价接口
committer: heyu
2025-05-27 16:55:59 +08:00
smshen
f46fa4eec8 Merge pull request 'demand:定制导出性能优化' (#40) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/40
2025-05-27 15:46:34 +08:00
9d911d5db5 demand:定制导出性能优化
committer: heyu
2025-05-27 14:21:58 +08:00
smshen
46407a5996 Merge pull request 'demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值' (#39) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/39
2025-05-27 09:07:56 +08:00
5c2bad4ef5 demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值
committer: heyu
2025-05-26 18:57:40 +08:00
smshen
9f23967fb8 Merge pull request 'demand: 保留原sql重起一个sql' (#38) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/38
2025-05-26 15:39:15 +08:00
c36991ea41 demand: 保留原sql重起一个sql
committer: heyu
2025-05-26 15:34:00 +08:00