mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mama:0198b7de90812bfa0b416014d271bd4fa22887aa
Branches Tags
mama:main mama:demo mama:dev mama:feature/modular-monolith-arch
...
compare: mama:main
Branches Tags
mama:demo mama:dev mama:main mama:feature/modular-monolith-arch

6 Commits
0198b7de90 ... main

Author SHA1 Message Date
sky121113
dfd0a047f2 Merge branch 'dev' into demo
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 59s
Details
ERP-Deploy-Production / deploy-production (push) Successful in 1m15s
Details
2026-03-13 16:23:37 +08:00
sky121113
e3ceedc579 [STYLE] 移除冗餘的簡報生成腳本，改由全域技能處理 2026-03-13 16:23:02 +08:00
sky121113
f2e5ef121e Merge branch 'dev' into demo
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 1m9s
Details
2026-03-13 16:19:57 +08:00
sky121113
7a1fc02dfc [REFACTOR] 移除 package.json 中不使用的 pptxgenjs 套件 2026-03-13 16:19:56 +08:00
sky121113
5f34855233 Merge branch 'dev' into demo
Some checks failed
ERP-Deploy-Demo / deploy-demo (push) Has been cancelled
Details
2026-03-13 16:19:00 +08:00
sky121113
bee8ecb55b [FIX] 修正盤調單明細插入時的欄位名稱錯誤並更新簡報/圖片處理套件 2026-03-13 16:18:13 +08:00
3 changed files with 7289 additions and 6606 deletions
Expand all files Collapse all files

4
app/Modules/Inventory/Services/AdjustService.php
View File

@@ -49,7 +49,7 @@ class AdjustService
if (abs($item->diff_qty) < 0.0001) continue; if (abs($item->diff_qty) < 0.0001) continue;
$itemsToInsert[] = [ $itemsToInsert[] = [
'inventory_adjust_doc_id' => $adjDoc->id, 'adjust_doc_id' => $adjDoc->id,
'product_id' => $item->product_id, 'product_id' => $item->product_id,
'batch_number' => $item->batch_number, 'batch_number' => $item->batch_number,
'qty_before' => $item->system_qty, 'qty_before' => $item->system_qty,
@@ -108,7 +108,7 @@ class AdjustService
$qtyBefore = $inventory ? $inventory->quantity : 0; $qtyBefore = $inventory ? $inventory->quantity : 0;
$itemsToInsert[] = [ $itemsToInsert[] = [
'inventory_adjust_doc_id' => $doc->id, 'adjust_doc_id' => $doc->id,
'product_id' => $data['product_id'], 'product_id' => $data['product_id'],
'batch_number' => $data['batch_number'] ?? null, 'batch_number' => $data['batch_number'] ?? null,
'qty_before' => $qtyBefore, 'qty_before' => $qtyBefore,

13888
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@@ -54,7 +54,8 @@
"react-markdown": "^10.1.0", "react-markdown": "^10.1.0",
"recharts": "^3.7.0", "recharts": "^3.7.0",
"remark-gfm": "^4.0.1", "remark-gfm": "^4.0.1",
"sharp": "^0.34.5",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"tailwind-merge": "^3.4.0" "tailwind-merge": "^3.4.0"
} }
} }