WuYongJie
|
2ba8ab0f05
|
Merge commit '62017377' into codex/wuyongjie-promote-bom-optional-20260813
|
2026-08-13 12:38:47 +08:00 |
|
WuYongJie
|
62017377ad
|
fix(bom): preserve resolved primary material
|
2026-08-13 12:36:47 +08:00 |
|
WuYongJie
|
2905c42455
|
Merge remote-tracking branch 'origin/codex/jingchuan-sample-progress-main' into codex/wuyongjie-promote-bom-optional-20260813
|
2026-08-13 12:15:27 +08:00 |
|
jingchuan
|
ce808f8c07
|
feat(sample-progress): allow no-sample status
|
2026-08-13 12:14:43 +08:00 |
|
WuYongJie
|
915450a748
|
Merge remote-tracking branch 'origin/codex/jingchuan-sample-progress-main' into codex/wuyongjie-promote-bom-optional-20260813
|
2026-08-13 12:11:31 +08:00 |
|
WuYongJie
|
adae1ac0f1
|
Merge remote-tracking branch 'origin/codex/wuyongjie-bom-category-skills-v7' into codex/wuyongjie-promote-bom-optional-20260813
|
2026-08-13 12:11:10 +08:00 |
|
jingchuan
|
db844e6126
|
fix(sample-progress): derive sample status from OA stage
|
2026-08-13 12:09:44 +08:00 |
|
WuYongJie
|
cdb807dcd5
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
|
2026-08-13 12:08:42 +08:00 |
|
WuYongJie
|
97ade48cf8
|
fix(bom): preserve trusted slot geometry
|
2026-08-13 12:08:13 +08:00 |
|
WuYongJie
|
af97ea7074
|
merge: sync product archive operators
|
2026-08-13 12:02:14 +08:00 |
|
WuYongJie
|
138155b04a
|
feat(supply-chain): sync product archive operators
|
2026-08-13 12:01:02 +08:00 |
|
WuYongJie
|
609e675659
|
merge: preserve latest sample progress stage alignment
|
2026-08-13 11:02:08 +08:00 |
|
WuYongJie
|
218a7d91a6
|
merge: preserve deployed sample progress updates
|
2026-08-13 11:00:32 +08:00 |
|
jingchuan
|
5318a30346
|
fix(sample-progress): align board with current OA stage
|
2026-08-13 10:57:13 +08:00 |
|
WuYongJie
|
c21b384050
|
merge: add storage rack and table v2 skills
|
2026-08-13 10:55:04 +08:00 |
|
WuYongJie
|
acd22bbffa
|
feat(bom): add storage rack and table v2 skills
|
2026-08-13 10:54:26 +08:00 |
|
jingchuan
|
1433428cf7
|
fix(sample-progress): show current OA sample stage count
|
2026-08-13 10:38:22 +08:00 |
|
WuYongJie
|
5c05df5855
|
fix(bom): preserve sku material and module geometry
|
2026-08-13 09:56:21 +08:00 |
|
WuYongJie
|
35384031c6
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
|
2026-08-13 09:28:12 +08:00 |
|
WuYongJie
|
fee8bdb0a8
|
fix(bom): harden category skill costing contracts
|
2026-08-13 09:27:59 +08:00 |
|
jingchuan
|
e2d739d1d4
|
fix(sample-progress): count only active managed samples
|
2026-08-13 09:08:33 +08:00 |
|
WuYongJie
|
f12b68ff56
|
Merge remote-tracking branch 'origin/codex/wuyongjie-bom-category-skills-v7' into codex/wuyongjie-promote-bom-optional-20260813
|
2026-08-13 06:32:43 +08:00 |
|
WuYongJie
|
869f0e6922
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
|
2026-08-13 06:30:22 +08:00 |
|
WuYongJie
|
76421163c7
|
fix(bom-costing): enforce exclusive sku structure
|
2026-08-13 06:30:01 +08:00 |
|
WuYongJie
|
439b427259
|
Merge remote-tracking branch 'origin/codex/wuyongjie-bom-category-skills-v7' into codex/wuyongjie-promote-bom-optional-20260813
|
2026-08-13 04:49:02 +08:00 |
|
WuYongJie
|
6f8fc02b2f
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
|
2026-08-13 04:46:13 +08:00 |
|
WuYongJie
|
b12d1eeeb3
|
fix(bom-costing): preserve sku evidence and size scaling
|
2026-08-13 04:45:31 +08:00 |
|
WuYongJie
|
0c9491a370
|
merge: promote BOM optional SKU structure fix
|
2026-08-13 02:52:34 +08:00 |
|
WuYongJie
|
37430946d8
|
fix(bom-costing): isolate optional SKU structures
|
2026-08-13 02:51:12 +08:00 |
|
WuYongJie
|
eb0a6ad499
|
fix(bom-costing): restore layered category estimates
|
2026-08-13 01:18:19 +08:00 |
|
WuYongJie
|
de048075ef
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-bom-category-skills-v7
# Conflicts:
# furniture-3d-system/src/server/services/__tests__/intake-non-integrated-product.service.test.ts
# furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
|
2026-08-12 21:06:18 +08:00 |
|
WuYongJie
|
c87266c2c7
|
fix(intake): bound virtual inventory processing
|
2026-08-12 20:51:03 +08:00 |
|
WuYongJie
|
a51ec8a162
|
fix(bom-costing): guard fact snapshot fingerprints
|
2026-08-12 20:49:07 +08:00 |
|
WuYongJie
|
14915ef1f2
|
fix(supply-chain): resolve new-product images by barcode
|
2026-08-12 18:10:08 +08:00 |
|
jingchuan
|
7a25001d6b
|
fix(sample-progress): retain reached cancelled sample nodes
|
2026-08-12 17:48:52 +08:00 |
|
jingchuan
|
fd0354f1d0
|
fix(sample-progress): sync all OA flow statuses
|
2026-08-12 17:34:26 +08:00 |
|
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 |
|