Commit Graph

2850 Commits

Author SHA1 Message Date
3c4dbf0311 demand: TMS-缅甸虚拟单调整
committer: heyu
2025-06-21 13:23:18 +08:00
c847446e44 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop 2025-06-20 15:32:09 +08:00
linfso
f035059a56 md 2025-06-20 15:01:43 +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
50afa217ec md 2025-06-19 16:17:20 +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
61a9da48fd md 2025-06-18 15:51:26 +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
58e904c23a md 2025-06-18 11:51:16 +08:00
linfso
ebf9bed530 md 2025-06-18 11:50:14 +08:00
linfso
1c6f4ee3ba md 2025-06-18 11:45:43 +08:00
linfso
670af37ed4 md 2025-06-18 11:17:03 +08:00
linfso
a40435969d md 2025-06-18 10:07:59 +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
674ba8f6fd md 2025-06-18 07:18:02 +08:00
linfso
490adc639b md 2025-06-17 18:06:55 +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
209a22439c md 2025-06-17 14:01:26 +08:00
linfso
0d8ae4bb1c md 2025-06-17 14:00:22 +08:00
linfso
0ba3afb5a1 md 2025-06-17 10:57:37 +08:00
linfso
6ea6433f1a md 2025-06-17 09:21:43 +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
c8c4c36cba Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查' (#57) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/57
2025-06-12 16:08:07 +08:00
3ccead415e demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查
committer: heyu
2025-06-12 16:07:21 +08:00
heyu
53b6fd4bed Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查' (#56) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/56
2025-06-12 15:32:30 +08:00