diff --git a/README.md b/README.md index a3e5772..ad6843f 100644 --- a/README.md +++ b/README.md @@ -133,12 +133,20 @@ GET https://api.sms.spices.blue/api/v1/{lot_number} { "name": "Kurkuma", "percentage": 60.0, - "origin": { - "country": "Indien", - "farmer": "Singh Farm", - "supplier": "Gewürzhandel GmbH", - "notes": null - } + "origins": [ + { + "country": "Indien", + "supplier": "Gewürzhandel GmbH", + "farmer": "Singh Farm", + "notes": null + }, + { + "country": "Sri Lanka", + "supplier": "Ceylon Spices", + "farmer": null, + "notes": "Restmenge aus Vorlieferung" + } + ] } ] } @@ -200,7 +208,7 @@ Table recipes { Table recipes_spices { recipe_id int [ref: > recipes.id] spice_id int [ref: > spices.id] - amount_in_percent decimal(4,2) + amount_in_percent decimal(6,2) } Table packings { @@ -250,11 +258,21 @@ Table batch_origins { id int [pk] batch_id int [ref: > batches.id] spice_id int [ref: > spices.id] +} + +Table batch_origin_entries { + id int [pk] + batch_origin_id int [ref: > batch_origins.id] supplier_id int [ref: > suppliers.id, nullable] origin_country varchar - farmer varchar + farmer_id int [ref: > farmers.id, nullable] notes text } + +Table farmers { + id int [pk] + name varchar(255) +} ``` --- @@ -267,7 +285,7 @@ Table batch_origins { - [x] Rezepte mit Versionierung - [x] Produktgrößen, Preise, SKU, GTIN mit Barcode-Vorschau - [x] Inventar (eindeutige Items mit Ausgangs-Flag) -- [x] Chargen (LOT) mit automatischem Rohstoff-Abzug +- [x] Chargen (LOT) mit automatischem Rohstoff-Abzug und mehreren Lieferanten/Landwirten pro Rohstoff - [x] Warenausgang (Produktverkauf) - [x] Shopify-Import (Produkte, Varianten, Lagerbestand, Bilder, Beschreibung, Preise) - [x] Continuous Deployment via Gitea Actions + Docker