 ouyangxq
|
071f807b87
|
fix: aggregate mixed cartons by fulfillment type
|
2026-09-11 15:45:05 +08:00 |
|
|
ouyangxq
|
cc7c2f0954
|
feat: support mixed-SKU dropship cartons
|
2026-09-11 15:38:19 +08:00 |
|
|
ouyangxq
|
56635ad4e4
|
feat: complete finance and overseas receiving workflow
|
2026-09-10 22:43:11 +08:00 |
|
|
ouyangxq
|
2fc2fca9fd
|
Merge test fixes into dev dropship flow
|
2026-09-10 18:18:41 +08:00 |
|
|
ouyangxq
|
e9aa2ac047
|
优化
|
2026-09-10 11:18:31 +08:00 |
|
|
ouyangxq
|
c8ab4d3de5
|
merge: sync test and stabilize full acceptance
|
2026-09-09 21:14:25 +08:00 |
|
|
ouyangxq
|
6737c4c327
|
优化
|
2026-09-09 20:53:24 +08:00 |
|
|
ouyangxq
|
5fb147f7aa
|
fix(dropship): generate pallet numbers atomically and extend full regressions
|
2026-09-09 12:19:16 +08:00 |
|
|
ouyangxq
|
4379b721bc
|
优化
|
2026-09-09 09:52:46 +08:00 |
|
|
ouyangxq
|
13d8640b4c
|
Merge remote-tracking branch 'origin/test' into dev
|
2026-09-08 17:59:53 +08:00 |
|
|
ouyangxq
|
0a9c798580
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java
# order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java
# order/src/test/java/com/baiyue/order/controller/InternalOrderCargoControllerTest.java
|
2026-09-08 17:34:12 +08:00 |
|
|
ouyangxq
|
60a41ec3ea
|
fix: reserve stable inbound code for draft label printing
|
2026-09-08 17:33:44 +08:00 |
|
|
ouyangxq
|
eead11e99d
|
feat(order): add batch review preview
|
2026-09-08 17:32:56 +08:00 |
|
|
ouyangxq
|
6c2d169798
|
feat: complete dropship palletization workflow
|
2026-09-08 17:24:48 +08:00 |
|
|
ouyangxq
|
e597bebafd
|
feat(order): expose cargo shipment binding
|
2026-09-08 17:17:57 +08:00 |
|
|
ouyangxq
|
41582fe17b
|
fix: close inbound hold bypass paths
|
2026-09-07 12:10:11 +08:00 |
|
|
ouyangxq
|
0c8f6fe2b3
|
feat: add inbound hold lifecycle
|
2026-09-07 11:20:10 +08:00 |
|
 liuyihe
|
9d213b3843
|
修改提交
|
2026-09-06 16:02:11 +08:00 |
|
|
liuyihe
|
3ae8964fe5
|
修改提交
|
2026-09-06 15:02:33 +08:00 |
|
|
ouyangxq
|
77817b4c94
|
优化
|
2026-09-04 18:47:57 +08:00 |
|
|
ouyangxq
|
e477f73983
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# AGENTS.md
# scripts/AGENTS.md
# scripts/admin-test-env-modules/README.md
# scripts/agents-index-contract.ps1
|
2026-09-04 16:03:09 +08:00 |
|
|
ouyangxq
|
dc6a0debca
|
fix: deduplicate unified order locations
|
2026-09-04 15:54:53 +08:00 |
|
|
ouyangxq
|
54cb9ceade
|
feat: complete overseas customer and PDA workflows
|
2026-09-04 12:59:37 +08:00 |
|
|
ouyangxq
|
9bf0b4d331
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# order/AGENTS.md
|
2026-09-04 12:29:57 +08:00 |
|
|
ouyangxq
|
f23f3ea26d
|
优化
|
2026-09-04 11:35:19 +08:00 |
|
|
ouyangxq
|
7a0e158b51
|
优化
|
2026-09-04 10:51:25 +08:00 |
|
|
ouyangxq
|
effab80db9
|
Merge branch 'test' into dev
|
2026-09-03 21:30:08 +08:00 |
|
|
ouyangxq
|
2baf1b1460
|
Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test
|
2026-09-03 21:25:54 +08:00 |
|
|
ouyangxq
|
dd1682a83b
|
优化
|
2026-09-03 21:25:53 +08:00 |
|
|
ouyangxq
|
1a3f94dfcb
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# firstleg/src/test/java/com/baiyue/firstleg/service/CartonMeasurementServiceTest.java
|
2026-09-03 21:23:35 +08:00 |
|
|
liuyihe
|
baabfdabba
|
修改提交
|
2026-09-03 21:09:22 +08:00 |
|
|
ouyangxq
|
47a043324f
|
Merge remote-tracking branch 'origin/test' into dev
|
2026-09-03 20:59:58 +08:00 |
|
|
ouyangxq
|
a24d55f526
|
优化
|
2026-09-03 20:24:52 +08:00 |
|
|
ouyangxq
|
4df0ae4811
|
Merge remote-tracking branch 'origin/test' into dev
|
2026-09-03 19:09:04 +08:00 |
|
|
ouyangxq
|
acdc0943c0
|
feat(order): derive batch customer context
|
2026-09-03 18:22:44 +08:00 |
|
|
ouyangxq
|
514a585de2
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# AGENTS.md
# firstleg/AGENTS.md
# scripts/agents-index-contract.ps1
|
2026-09-03 18:22:05 +08:00 |
|
|
ouyangxq
|
66ad9f5c85
|
优化
|
2026-09-03 18:05:34 +08:00 |
|
|
ouyangxq
|
61adfc7818
|
feat(order): refine batch import workbook
|
2026-09-03 18:03:42 +08:00 |
|
|
ouyangxq
|
997419ea6b
|
Merge remote-tracking branch 'origin/test' into dev
|
2026-09-03 17:14:16 +08:00 |
|
|
ouyangxq
|
253ca82b99
|
fix(order): load all warehouse template options
|
2026-09-03 17:04:57 +08:00 |
|
|
ouyangxq
|
3664f036cc
|
feat(order): localize batch import workbook
|
2026-09-03 16:33:33 +08:00 |
|
|
ouyangxq
|
904b495613
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# deploy/maven/settings-cn.xml
|
2026-09-03 15:23:55 +08:00 |
|
|
ouyangxq
|
a927903a66
|
优化
|
2026-09-03 13:49:38 +08:00 |
|
|
ouyangxq
|
0d52ee5948
|
修复订单申报更新测试依赖装配
|
2026-09-03 11:59:25 +08:00 |
|
|
ouyangxq
|
8de52f65bd
|
Merge remote-tracking branch 'origin/test' into dev
|
2026-09-03 11:55:55 +08:00 |
|
|
ouyangxq
|
bdcc32a095
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# deploy/sql/头程数据库统一增量-MySQL8.sql
|
2026-09-03 11:55:46 +08:00 |
|
|
ouyangxq
|
59b42c7579
|
优化
|
2026-09-03 11:54:17 +08:00 |
|
|
ouyangxq
|
fd3dbb2fc6
|
优化
|
2026-09-03 11:47:28 +08:00 |
|
|
ouyangxq
|
d56af7e036
|
Merge remote-tracking branch 'origin/test' into dev
# Conflicts:
# firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java
# lastleg-service/src/main/resources/db/lastleg.sql
|
2026-09-03 11:03:25 +08:00 |
|
|
ouyangxq
|
12b749d7d8
|
fix(iam): grant domestic order export permission
|
2026-09-03 10:12:08 +08:00 |
|