Commit Graph
105 Commits
Author SHA1 Message Date
ouyangxq 84e768f41a 优化 2026-09-18 09:59:12 +08:00
ouyangxq b78cea3caf 优化 2026-09-16 19:32:58 +08:00
ouyangxq 78a0d7916c 优化 2026-09-16 11:06:36 +08:00
ouyangxq c78ecbef31 优化 2026-09-15 16:11:20 +08:00
ouyangxq 66f49b97e5 优化 2026-09-14 18:34:34 +08:00
ouyangxq 25825685c3 优化 2026-09-14 17:54:21 +08:00
ouyangxq 7e1b9b4cee feat: add desktop dropship pallet printing 2026-09-14 17:52:00 +08:00
ouyangxq b0de9c026f 优化 2026-09-14 15:33:35 +08:00
ouyangxq 89dc3bf671 优化 2026-09-14 10:02:39 +08:00
ouyangxq 6d26634b1b feat: clarify overseas pallet supplementation 2026-09-11 15:39:47 +08:00
ouyangxq 950967f101 feat: align finance account and overseas actions 2026-09-10 22:43:10 +08:00
ouyangxq 5a165add2c Merge branch 'dev' of http://git.buggoglobal.com/html/admin-web into release/test 2026-09-10 20:26:57 +08:00
ouyangxq b57ea2d628 feat(admin): use smart-loading groups for simulations 2026-09-10 19:25:11 +08:00
ouyangxq 5f1a7f04f1 fix: clarify automatic pallet generation 2026-09-10 17:05:48 +08:00
ouyangxq 0ed913a114 fix: expose manual plans awaiting pallets 2026-09-10 16:33:43 +08:00
liuyihe 19fed894d9 Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev 2026-09-10 15:33:55 +08:00
liuyihe aaca62f461 优化 2026-09-10 15:33:54 +08:00
ouyangxq 108ad5c7b5 feat: show FBA internal code on pallet labels 2026-09-09 18:20:05 +08:00
ouyangxq ae01e066ca 优化 2026-09-09 17:58:23 +08:00
ouyangxq 51841fc608 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/container-loading/pages/ContainersView.vue
2026-09-09 15:42:42 +08:00
ouyangxq a2515119b7 优化 2026-09-09 14:32:04 +08:00
ouyangxq fa3a199e78 fix(admin): integrate workbench contracts and dropship review states 2026-09-09 11:50:42 +08:00
ouyangxq 1249263b94 优化 2026-09-09 10:18:12 +08:00
liuyihe d55cfb3737 merge origin/dev and resolve frontend conflicts 2026-09-08 20:33:45 +08:00
liuyihe c3ae936caa 优化 2026-09-08 20:27:47 +08:00
ouyangxq 8910e88563 feat: split domestic and overseas container workbenches 2026-09-08 19:57:42 +08:00
ouyangxq 2dc357e55b Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
2026-09-08 17:03:10 +08:00
ouyangxq fbdb7b6c01 优化 2026-09-08 14:07:39 +08:00
ouyangxq 8ccfb9eea4 优化 2026-09-07 15:34:48 +08:00
ouyangxq d488e9ab40 优化 2026-09-07 15:07:39 +08:00
ouyangxq bc6629d400 fix: align loading and weight acceptance 2026-09-04 16:28:44 +08:00
ouyangxq 871d0a56b9 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
#	src/modules/container-loading/pages/GlobalSmartLoadingView.vue
#	src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
2026-09-04 16:21:32 +08:00
ouyangxq ac96249f7d 优化 2026-09-04 15:19:48 +08:00
ouyangxq 44eb8d17f2 优化 2026-09-04 14:41:29 +08:00
ouyangxq 7d29f3d7ea docs: align application scope and merge contracts 2026-09-04 12:41:58 +08:00
ouyangxq 864a3c3cc7 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/container-loading/pages/GlobalSmartLoadingView.vue
#	src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
#	src/modules/domestic-containers/pages/DomesticContainersView.vue
2026-09-04 12:35:34 +08:00
ouyangxq 7f7c84d404 优化 2026-09-04 10:51:31 +08:00
ouyangxq d90a5db1c4 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
2026-09-03 18:22:05 +08:00
ouyangxq e2b0102fdb 优化 2026-09-03 18:05:38 +08:00
ouyangxq b7985f4a6d Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
2026-09-03 11:02:21 +08:00
ouyangxq 6270573095 优化 2026-09-02 20:49:19 +08:00
ouyangxq f0801c2774 docs: register finance allocation routes 2026-09-02 20:32:42 +08:00
ouyangxq f281268efe 优化 2026-09-02 18:03:45 +08:00
ouyangxq e31ba2c5a5 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/overseas-warehouse/pages/DispatchesView.vue
#	src/modules/overseas-warehouse/pages/OutboundsView.vue
#	src/modules/overseas-warehouse/pages/PalletDetailView.vue
2026-09-02 15:23:05 +08:00
ouyangxq 602674573c 优化 2026-09-02 15:15:47 +08:00
ouyangxq b3e6971ea8 优化 2026-09-02 14:50:52 +08:00
ouyangxq b5b4b41b99 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue
#	src/modules/overseas-warehouse/pages/DispatchesView.vue
#	src/modules/overseas-warehouse/pages/OutboundsView.vue
2026-09-02 14:47:03 +08:00
ouyangxq 637b202559 优化 2026-09-02 14:39:34 +08:00
ouyangxq f75e08c1bb Merge remote-tracking branch 'origin/release/test' into dev 2026-09-02 14:01:30 +08:00
ouyangxq 776c0e2ebb 优化 2026-09-02 11:59:59 +08:00