linfso
|
7c0096a2d1
|
md
|
2025-06-25 03:29:07 +08:00 |
|
linfso
|
8323922753
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-25 02:58:12 +08:00 |
|
linfso
|
f3d8f4fa57
|
md
|
2025-06-25 02:57:34 +08:00 |
|
|
|
1fc7fb52c5
|
demand: 扫描组批次规则调整
committer: heyu
|
2025-06-24 17:11:44 +08:00 |
|
|
|
bfd40fc09e
|
demand: 修复虚拟单重复录入问题
committer: heyu
|
2025-06-24 14:57:51 +08:00 |
|
|
|
22f371e439
|
demand: 打印备注修改，始发网点为空时设置默认值
committer: heyu
|
2025-06-24 13:38:00 +08:00 |
|
|
|
c80db35415
|
demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
|
2025-06-24 11:12:49 +08:00 |
|
|
|
25beb21519
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:31:18 +08:00 |
|
|
|
6c0a94acf8
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:13:44 +08:00 |
|
|
|
413aefda36
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 20:04:55 +08:00 |
|
|
|
eeefc44f86
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-23 20:04:02 +08:00 |
|
linfso
|
c5c4e0bb06
|
md
|
2025-06-23 16:54:51 +08:00 |
|
|
|
9a9aa336e6
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 15:20:22 +08:00 |
|
|
|
659179197a
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 14:07:08 +08:00 |
|
|
|
5dd79f74f7
|
demand: 新增字段：始发网点 网点表已启用网点
committer: heyu
|
2025-06-21 15:40:02 +08:00 |
|
|
|
3c4dbf0311
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-21 13:23:18 +08:00 |
|
|
|
a1a2253847
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
# Conflicts:
# emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
# emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
|
2025-06-20 15:00:18 +08:00 |
|
|
|
44cc39999b
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-20 13:56:56 +08:00 |
|
linfso
|
4a1be66503
|
md
|
2025-06-20 03:41:36 +08:00 |
|
linfso
|
ee31ebefec
|
md
|
2025-06-19 18:42:25 +08:00 |
|
linfso
|
6a626af581
|
md
|
2025-06-19 16:39:49 +08:00 |
|
linfso
|
73c49c43e2
|
md
|
2025-06-19 15:49:08 +08:00 |
|
linfso
|
1421701c06
|
md
|
2025-06-19 15:31:41 +08:00 |
|
linfso
|
3fcae709ef
|
md
|
2025-06-19 15:30:14 +08:00 |
|
linfso
|
2afa8a395a
|
md
|
2025-06-19 10:13:44 +08:00 |
|
linfso
|
104fc567ee
|
md
|
2025-06-19 09:59:47 +08:00 |
|
linfso
|
4000ce0489
|
md
|
2025-06-18 16:31:03 +08:00 |
|
linfso
|
a5c02922fc
|
md
|
2025-06-18 16:11:45 +08:00 |
|
linfso
|
ea4850e575
|
md
|
2025-06-18 15:50:05 +08:00 |
|
linfso
|
7e0fa0eb78
|
md
|
2025-06-18 15:48:53 +08:00 |
|
linfso
|
d0d243dda6
|
md
|
2025-06-18 15:46:29 +08:00 |
|
linfso
|
3b35c592bf
|
md
|
2025-06-18 15:04:33 +08:00 |
|
linfso
|
670af37ed4
|
md
|
2025-06-18 11:17:03 +08:00 |
|
|
|
81aa722733
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-18 09:24:05 +08:00 |
|
linfso
|
79ac74843c
|
md
|
2025-06-18 08:14:36 +08:00 |
|
linfso
|
3abf041168
|
md
|
2025-06-18 08:13:02 +08:00 |
|
linfso
|
963af279fe
|
md
|
2025-06-17 17:17:32 +08:00 |
|
linfso
|
732678dd94
|
md
|
2025-06-17 14:10:08 +08:00 |
|
linfso
|
0ba3afb5a1
|
md
|
2025-06-17 10:57:37 +08:00 |
|
linfso
|
e0420de664
|
md
|
2025-06-17 08:39:51 +08:00 |
|
linfso
|
0f05e1d72a
|
供应商费用
|
2025-06-17 08:38:36 +08:00 |
|
|
|
424cc100d1
|
demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
|
2025-06-16 19:04:37 +08:00 |
|
|
|
97ff62ca74
|
demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
|
2025-06-16 16:19:03 +08:00 |
|
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 |
|
smshen
|
daf6940784
|
Merge pull request 'demand: 保留原sql重起一个sql' (#35) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/35
|
2025-05-26 14:43:30 +08:00 |
|
|
|
883099679a
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:41:38 +08:00 |
|
smshen
|
da2b20951c
|
Merge pull request 'demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下…' (#34) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/34
|
2025-05-26 13:40:06 +08:00 |
|
|
|
e544d35378
|
demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-26 13:34:16 +08:00 |
|
smshen
|
f32b16ea02
|
Merge pull request 'develop' (#33) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/33
|
2025-05-26 13:29:11 +08:00 |
|
|
|
b9b65f0838
|
demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-26 13:20:57 +08:00 |
|
smshen
|
ac12147a3a
|
Merge pull request 'demand: 航线开票记录查询、导出、定制导出性能优化' (#32) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/32
|
2025-05-23 16:12:14 +08:00 |
|
|
|
d5404feec8
|
demand: 航线开票记录查询、导出、定制导出性能优化
committer: heyu
|
2025-05-23 14:41:19 +08:00 |
|
linfso
|
6a7b78424f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-23 14:25:32 +08:00 |
|
linfso
|
20b3f1b7bf
|
md
|
2025-05-23 14:25:24 +08:00 |
|
|
|
c9f50691ca
|
demand: 网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-22 14:29:04 +08:00 |
|
|
|
4ae68d2310
|
Merge branch 'develop' of http://git.xdadan.loc/tanex/emis-service into develop
# Conflicts:
# emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
|
2025-05-22 14:02:45 +08:00 |
|
|
|
259de46812
|
demand: 网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-22 14:00:58 +08:00 |
|
smshen
|
711f504386
|
Merge pull request 'master' (#29) from master into develop
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/29
|
2025-05-21 11:36:07 +08:00 |
|
|
|
eada435b31
|
demand: 定制导出按财务要求调整
committer: heyu
|
2025-05-21 11:13:51 +08:00 |
|
smshen
|
ee1f84c5a4
|
Merge pull request 'demand: TMS系统 - 客户账单管理 - 航信开票记录 - 新增加“定制导出” 详细查看附件。' (#28) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/28
|
2025-05-20 17:08:43 +08:00 |
|
linfso
|
2e030c5bd1
|
md
|
2025-05-20 17:07:21 +08:00 |
|
|
|
40a30b5cb8
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 新增加“定制导出” 详细查看附件。
committer: heyu
|
2025-05-20 17:06:28 +08:00 |
|
smshen
|
2351a1985a
|
Merge pull request 'demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复' (#27) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/27
|
2025-05-19 16:37:49 +08:00 |
|
|
|
2a0888cfec
|
demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复
committer: heyu
|
2025-05-19 16:34:39 +08:00 |
|
linfso
|
6c4af74f31
|
md
|
2025-05-18 23:46:43 +08:00 |
|
smshen
|
0ada0ca446
|
Merge pull request 'develop' (#26) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/26
|
2025-05-17 14:17:16 +08:00 |
|
|
|
006d7d4a73
|
demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复
committer: heyu
|
2025-05-17 14:02:44 +08:00 |
|
|
|
acb0494fe7
|
demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复
committer: heyu
|
2025-05-17 13:37:40 +08:00 |
|
linfso
|
6f3931c847
|
md
|
2025-05-17 11:22:41 +08:00 |
|
|
|
318e635cce
|
demand: 定时扫描任务优化
committer: heyu
|
2025-05-16 17:59:43 +08:00 |
|
linfso
|
2c9ef3a359
|
md
|
2025-05-16 17:17:46 +08:00 |
|
linfso
|
33dc7e58d5
|
md
|
2025-05-16 15:15:08 +08:00 |
|
|
|
61bcf29a97
|
demand: 新增定时任务扫描记录表,定时扫描任务优化
committer: heyu
|
2025-05-16 11:08:44 +08:00 |
|
linfso
|
7ffe5d1c1a
|
md
|
2025-05-16 10:31:54 +08:00 |
|
linfso
|
9fe8760a09
|
md
|
2025-05-15 19:52:58 +08:00 |
|
smshen
|
62c2204de3
|
Merge pull request 'demand: 漏组批次、供应商线路规划相关需求代码重构。供应商线路规划新增导入接口' (#25) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/25
|
2025-05-15 18:34:01 +08:00 |
|
|
|
c5dee14a0f
|
demand: 漏组批次、供应商线路规划相关需求代码重构。供应商线路规划新增导入接口
committer: heyu
|
2025-05-15 14:29:01 +08:00 |
|
linfso
|
26906d64c3
|
md
|
2025-05-15 06:33:00 +08:00 |
|
linfso
|
ae783ac894
|
md
|
2025-05-14 13:15:00 +08:00 |
|
linfso
|
264e8e7aa0
|
md
|
2025-05-14 03:51:36 +08:00 |
|
linfso
|
60ebf5215e
|
md
|
2025-05-14 03:47:53 +08:00 |
|
linfso
|
2d31146315
|
md
|
2025-05-13 19:22:25 +08:00 |
|
linfso
|
9981d13642
|
md
|
2025-05-13 19:21:09 +08:00 |
|
smshen
|
58bee0de44
|
Merge pull request 'demand: 现金/月结客户额度临时额度查询/过滤调整' (#24) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/24
|
2025-05-13 18:28:36 +08:00 |
|
|
|
c8e7921fc1
|
demand: 现金/月结客户额度临时额度查询/过滤调整
committer: heyu
|
2025-05-13 18:14:55 +08:00 |
|
linfso
|
fb9ecef397
|
md
|
2025-05-13 17:42:16 +08:00 |
|
linfso
|
6d71078e46
|
md
|
2025-05-13 17:33:36 +08:00 |
|
linfso
|
20fcc7ed60
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-13 14:08:09 +08:00 |
|
linfso
|
45278333b4
|
md
|
2025-05-13 14:08:02 +08:00 |
|
|
|
96b1f12a40
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-12 17:00:15 +08:00 |
|
smshen
|
3dbf682425
|
Merge pull request 'demand: 定时扫描运单组批次,漏组批次管理页面' (#20) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/20
|
2025-05-12 14:25:51 +08:00 |
|
linfso
|
086eacc5e2
|
md
|
2025-05-12 11:56:18 +08:00 |
|
linfso
|
70f4fba5fb
|
md
|
2025-05-12 11:55:32 +08:00 |
|
linfso
|
357c29d7ce
|
md
|
2025-05-11 12:35:16 +08:00 |
|
linfso
|
beb213a53b
|
md
|
2025-05-11 12:34:38 +08:00 |
|
|
|
a50f333e4c
|
demand: 定时扫描运单组批次,漏组批次管理页面
committer: heyu
|
2025-05-09 17:32:01 +08:00 |
|
linfso
|
e92655c7da
|
md
|
2025-05-09 07:01:21 +08:00 |
|
linfso
|
85b62e8a96
|
md
|
2025-05-08 16:30:05 +08:00 |
|
linfso
|
4705cf91bd
|
md
|
2025-05-08 16:16:44 +08:00 |
|
linfso
|
1ce2938ed8
|
md
|
2025-05-08 16:11:17 +08:00 |
|
|
|
381ea61971
|
demand: 计算时间范围内每一天账单总金额修改
committer: heyu
|
2025-05-08 13:21:53 +08:00 |
|
linfso
|
6fef3b8c1f
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java
|
2025-05-08 12:57:21 +08:00 |
|
|
|
ea5367efb9
|
demand: 导出进仓详情bug修改
committer: heyu
|
2025-05-08 10:41:05 +08:00 |
|
|
|
3c636156e0
|
demand: 计算时间范围内每一天账单总金额
committer: heyu
|
2025-05-08 10:26:54 +08:00 |
|
smshen
|
07d5854c8d
|
Merge pull request 'demand: 进仓详情导出增加进仓子单号' (#16) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/16
|
2025-05-07 17:08:05 +08:00 |
|
|
|
d6fa69984a
|
demand: 进仓详情导出增加进仓子单号
committer: heyu
|
2025-05-07 17:06:52 +08:00 |
|
linfso
|
b0d39b8e13
|
md
|
2025-05-07 14:21:17 +08:00 |
|
smshen
|
00d8c4e100
|
Merge pull request 'demand: 海运账单起运港目的港导出名称' (#14) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/14
|
2025-05-07 13:53:50 +08:00 |
|
|
|
7ff25d2de6
|
demand: 海运账单起运港目的港导出名称
committer: heyu
|
2025-05-07 13:25:55 +08:00 |
|
linfso
|
88c33e4e8d
|
md
|
2025-05-07 10:34:18 +08:00 |
|
linfso
|
73e9c67b88
|
md
|
2025-05-07 09:58:30 +08:00 |
|
linfso
|
a0c081118f
|
md
|
2025-05-07 09:34:57 +08:00 |
|
linfso
|
beaa4cbb95
|
md
|
2025-05-07 06:40:40 +08:00 |
|
smshen
|
bcc893ce15
|
Merge pull request 'demand: 修改现金客户额度触发定时任务' (#13) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/13
|
2025-05-06 14:34:44 +08:00 |
|
|
|
4b5aa4b9b3
|
demand: 修改现金客户额度触发定时任务
committer: heyu
|
2025-05-06 14:21:21 +08:00 |
|
smshen
|
d55610ebd0
|
Merge pull request 'demand: 运单批量录入回款/销售联系人校验bug修复' (#12) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/12
|
2025-05-06 13:36:11 +08:00 |
|
linfso
|
513e82c36a
|
md
|
2025-05-06 13:13:11 +08:00 |
|
|
|
f3c29f0c5d
|
demand: 运单批量录入回款/销售联系人校验bug修复
committer: heyu
|
2025-05-06 13:05:45 +08:00 |
|
smshen
|
714300681a
|
Merge pull request 'demand: 运单批量录入不直接回款/销售联系人校验bug修复' (#11) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/11
|
2025-05-06 12:45:57 +08:00 |
|
linfso
|
62795f1c49
|
md
|
2025-05-06 08:20:01 +08:00 |
|
linfso
|
d793366317
|
md
|
2025-05-06 08:00:20 +08:00 |
|
|
|
1079d6a9e1
|
demand: 运单批量录入不直接回款/销售联系人校验bug修复
committer: heyu
|
2025-05-05 18:43:34 +08:00 |
|
linfso
|
0e98328a0b
|
md
|
2025-05-05 18:05:10 +08:00 |
|
linfso
|
f776024f02
|
md
|
2025-05-05 15:48:05 +08:00 |
|
linfso
|
51164a0fb9
|
md
|
2025-05-05 15:07:57 +08:00 |
|
linfso
|
5a0168a9de
|
md
|
2025-05-05 14:30:39 +08:00 |
|
linfso
|
29439280bd
|
md
|
2025-05-05 09:59:37 +08:00 |
|
linfso
|
3472c84596
|
账单合并收款
|
2025-05-05 09:57:06 +08:00 |
|
linfso
|
952b06caf0
|
md
|
2025-05-05 09:22:24 +08:00 |
|
linfso
|
40af6e50fe
|
md
|
2025-05-05 08:34:08 +08:00 |
|
linfso
|
373d8ed225
|
md
|
2025-04-30 16:49:35 +08:00 |
|
linfso
|
690e4c90ba
|
md
|
2025-04-30 16:48:10 +08:00 |
|
linfso
|
89edee10a3
|
md
|
2025-04-30 15:52:03 +08:00 |
|
smshen
|
f1ea61609e
|
Merge pull request 'demand: 1.超期额度计算时间规则只取天数（不精确到时分秒），2.小数点去除问题修复' (#10) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/10
|
2025-04-30 15:05:53 +08:00 |
|
|
|
c93db40daf
|
demand: 1.超期额度计算时间规则只取天数（不精确到时分秒），2.小数点去除问题修复
committer: heyu
|
2025-04-30 14:57:43 +08:00 |
|
linfso
|
655d271dd1
|
md
|
2025-04-30 12:32:31 +08:00 |
|
linfso
|
9310e1f12b
|
md
|
2025-04-30 12:30:42 +08:00 |
|
linfso
|
8bc304ce64
|
md
|
2025-04-30 12:28:39 +08:00 |
|
smshen
|
3c7c818a7c
|
Merge branch 'master' into develop
|
2025-04-28 17:11:02 +08:00 |
|
|
|
7b91aad79c
|
demand: 供应商线路管理页面自测bug修改
committer: heyu
|
2025-04-28 16:15:46 +08:00 |
|
|
|
b8f1d1b01d
|
demand: 1.新增查询海运网点列表接口 2.查询运单列表、查询运单详情返回增加起运港名称、目的港名称
committer: heyu
|
2025-04-28 09:40:50 +08:00 |
|
smshen
|
b74e5e6fcb
|
Merge pull request 'develop' (#5) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/5
|
2025-04-25 16:18:03 +08:00 |
|
|
|
7f2beeeb63
|
update .gitignore
|
2025-04-25 15:55:08 +08:00 |
|
|
|
0dd8f7f99a
|
demand: 海运账单bug修改
committer: heyu
|
2025-04-25 15:49:56 +08:00 |
|
|
|
820b8583de
|
demand: 订单管理-进仓对货界面新增导出进仓详情功能
committer: heyu
|
2025-04-25 14:57:59 +08:00 |
|
smshen
|
d0d9f73e03
|
Merge pull request 'demand: 超期额度、账期内额度代码调整' (#4) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/4
|
2025-04-25 11:24:14 +08:00 |
|
|
|
291dc16c7c
|
demand: 超期额度、账期内额度代码调整
committer: heyu
|
2025-04-25 10:23:24 +08:00 |
|
smshen
|
0775dd13cd
|
Merge pull request 'develop' (#3) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/3
|
2025-04-25 09:12:24 +08:00 |
|
|
|
fbd940c3f4
|
demand: 月结客户/现金客户临时额度增加查询详情接口
committer: heyu
|
2025-04-24 18:54:42 +08:00 |
|
|
|
0648f44ccc
|
demand: 海运账单bug修改
committer: heyu
|
2025-04-24 18:18:36 +08:00 |
|
linfso
|
13ce8f8fc2
|
md
|
2025-04-24 13:03:14 +08:00 |
|
