WuYongJie
|
ae9ae0fcae
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wu-product-development-barcode-print-20260812
|
2026-08-12 17:32:37 +08:00 |
|
WuYongJie
|
a36b5ede46
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wu-product-development-barcode-print-20260812
|
2026-08-12 17:29:44 +08:00 |
|
WuYongJie
|
e2a725ed58
|
feat(barcode-print): add barcode QR to Sofia carton label
|
2026-08-12 17:29:12 +08:00 |
|
WuYongJie
|
0b4f903325
|
fix(intake): require directory selections for suppliers and warehouses
|
2026-08-12 17:22:41 +08:00 |
|
jingchuan
|
8d7ab94cac
|
fix(sample-progress): sync cancelled and terminated flows
|
2026-08-12 16:54:33 +08:00 |
|
jingchuan
|
27b16a9ce6
|
fix(sample-progress): refine board fields and unique codes
|
2026-08-12 16:20:53 +08:00 |
|
jingchuan
|
09dd4a1730
|
fix(sample-progress): normalize compact delivery dates
|
2026-08-12 16:04:59 +08:00 |
|
jingchuan
|
fc4763a8c9
|
fix(sample-progress): use configured prisma client for import
|
2026-08-12 16:03:17 +08:00 |
|
jingchuan
|
0b2bc3ce5a
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/jingchuan-sample-progress-main
|
2026-08-12 15:46:52 +08:00 |
|
jingchuan
|
73005fdd9b
|
feat(sample-progress): import sampling data and completion time
|
2026-08-12 15:43:53 +08:00 |
|
jingchuan
|
c2e75dda3e
|
fix(sample-progress): sort by OA arrival time
|
2026-08-12 14:54:15 +08:00 |
|
jingchuan
|
ac146f8879
|
Merge remote-tracking branch 'origin/main' into codex/jingchuan-sample-progress-main
|
2026-08-12 14:43:59 +08:00 |
|
jingchuan
|
4f1372668f
|
fix(sample-progress): simplify summary and expand designer
|
2026-08-12 14:43:29 +08:00 |
|
WuYongJie
|
344e1b108a
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-installation-demo-integration-20260812
|
2026-08-12 14:25:56 +08:00 |
|
WuYongJie
|
a17844604c
|
Merge commit '082d5cfc' into codex/xuxiake-installation-demo-integration-20260812
|
2026-08-12 14:24:23 +08:00 |
|
WuYongJie
|
082d5cfcee
|
feat(installation-demo): complete sharing catalog and tool motion
|
2026-08-12 14:17:40 +08:00 |
|
WuYongJie
|
bdc8f393a8
|
fix(bom-costing): extend structure progress transaction
|
2026-08-12 14:16:31 +08:00 |
|
WuYongJie
|
76230f9f34
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
|
2026-08-12 13:09:36 +08:00 |
|
WuYongJie
|
17dd830976
|
fix(bom-costing): harden category skill costing closure
|
2026-08-12 13:09:26 +08:00 |
|
WuYongJie
|
70d0e4e5d9
|
fix(supply-chain): move price type to data group
|
2026-08-12 11:24:06 +08:00 |
|
jingchuan
|
432cd9fc4f
|
feat(sample-progress): enrich OA tracking board
|
2026-08-12 11:07:49 +08:00 |
|
WuYongJie
|
944b5b0a58
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
|
2026-08-11 18:33:33 +08:00 |
|
WuYongJie
|
7040fd2d03
|
feat(bom-costing): add category skill engine v7
|
2026-08-11 18:33:04 +08:00 |
|
jingchuan
|
a040b015b5
|
fix(oa-board): align export default statuses
|
2026-08-11 18:08:32 +08:00 |
|
jingchuan
|
ad9afabc49
|
fix(sample-progress): exclude OA drafts from overdue metrics
|
2026-08-11 17:45:23 +08:00 |
|
jingchuan
|
2c201674a4
|
Merge remote-tracking branch 'origin/main' into codex/jingchuan-sample-progress-main
|
2026-08-11 17:36:57 +08:00 |
|
jingchuan
|
ba9adb0db4
|
fix(sample-progress): sync OA data and embed board tab
|
2026-08-11 17:36:57 +08:00 |
|
WuYongJie
|
7558939482
|
feat(supply-chain): sync supplier regions
|
2026-08-11 17:19:29 +08:00 |
|
WuYongJie
|
31ef235c80
|
fix(intake): keep opening name out of SKU specs
|
2026-08-11 17:02:31 +08:00 |
|
jingchuan
|
37851f0f04
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/jingchuan-sample-progress-main
|
2026-08-11 16:32:03 +08:00 |
|
jingchuan
|
20a450c4bd
|
feat(intake): reorder OA tabs and add sample flow links
|
2026-08-11 16:30:00 +08:00 |
|
WuYongJie
|
0ece1c38dc
|
fix(supply-chain): populate warehouse config and pin archive actions
|
2026-08-11 16:14:36 +08:00 |
|
WuYongJie
|
179040b1ab
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-package-set-count-fix-20260811-1548
|
2026-08-11 16:12:21 +08:00 |
|
WuYongJie
|
6388b8f37a
|
fix(intake): keep package set counts consistent
|
2026-08-11 16:05:00 +08:00 |
|
jingchuan
|
ac9deefe85
|
merge: release sample progress board
|
2026-08-11 16:02:00 +08:00 |
|
jingchuan
|
1fa15cef79
|
merge: add sample progress board
|
2026-08-11 16:00:59 +08:00 |
|
jingchuan
|
23c20714dd
|
feat(sample-progress): integrate board into OA workspace
|
2026-08-11 16:00:17 +08:00 |
|
jingchuan
|
c031c36f8f
|
feat(sample-progress): add sampling progress board module
|
2026-08-11 15:49:58 +08:00 |
|
WuYongJie
|
aa646a795a
|
fix(supply-chain): isolate product archive column settings
|
2026-08-11 14:59:06 +08:00 |
|
jingchuan
|
6a19e30527
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/jingchuan-brand-shipment-main-merge
|
2026-08-11 14:56:35 +08:00 |
|
jingchuan
|
43d8d43e16
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/jingchuan-brand-shipment-main-merge
|
2026-08-11 14:56:23 +08:00 |
|
jingchuan
|
b2fb4165b5
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/jingchuan-brand-shipment-todo
|
2026-08-11 14:54:22 +08:00 |
|
jingchuan
|
bdf20c2064
|
feat(oa-board): remind brand planning before shipment
|
2026-08-11 14:49:28 +08:00 |
|
WuYongJie
|
c86367c6b0
|
fix(intake): keep product type filters readable
|
2026-08-11 14:33:00 +08:00 |
|
jingchuan
|
4dcbed4c10
|
feat(oa-board): track unconfirmed completion followups
|
2026-08-11 13:46:32 +08:00 |
|
WuYongJie
|
199228241a
|
fix(intake): save product tags and support all product types
|
2026-08-11 13:42:33 +08:00 |
|
WuYongJie
|
63ca46c030
|
fix(intake): save product tags and support all product types
|
2026-08-11 13:38:28 +08:00 |
|
WuYongJie
|
10ce1696dc
|
fix(supply-chain): sync product development tags
|
2026-08-11 13:01:54 +08:00 |
|
WuYongJie
|
728495143e
|
fix(supply-chain): sync product development tags
|
2026-08-11 12:52:30 +08:00 |
|
WuYongJie
|
20fee3b7ba
|
merge: fix barcode certificate QR codes
|
2026-08-11 12:31:55 +08:00 |
|