diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0e2049e9..8fd97968 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "false",
+        "AYANOVA_SERVER_TEST_MODE": "true",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/devdocs/specs/joyce-planning-docs-used/2014-06-24--partsinventoryoverviewDONE.odt b/devdocs/specs/joyce-planning-docs-used/2014-06-24--partsinventoryoverviewDONE.odt
index ef72b79a..b1422850 100644
Binary files a/devdocs/specs/joyce-planning-docs-used/2014-06-24--partsinventoryoverviewDONE.odt and b/devdocs/specs/joyce-planning-docs-used/2014-06-24--partsinventoryoverviewDONE.odt differ
diff --git a/server/AyaNova/biz/PartAssemblyBiz.cs b/server/AyaNova/biz/PartAssemblyBiz.cs
index 0adba8bd..9307fb07 100644
--- a/server/AyaNova/biz/PartAssemblyBiz.cs
+++ b/server/AyaNova/biz/PartAssemblyBiz.cs
@@ -109,7 +109,7 @@ namespace AyaNova.Biz
             if (logTheGetEvent && ret != null)
                 await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
 
-            if (populatePartNames && ret.Items!=null && ret.Items.Count > 0)
+            if (populatePartNames && ret.Items != null && ret.Items.Count > 0)
             {
                 var partIdList = ret.Items.Select(z => z.PartId).ToArray();
                 var PickList = PickListFactory.GetAyaPickList(AyaType.Part);
@@ -265,6 +265,15 @@ namespace AyaNova.Biz
             if (proposedObj.Items.GroupBy(z => z.PartId).Any(g => g.Count() > 1))
             {
                 AddError(ApiErrorCode.VALIDATION_FAILED, "Items", "Duplicate parts are not allowed in the items collection");
+                return;
+            }
+
+            //Make sure there are no < 1 quantities and if there are make them 1 rather than reporting a broken rule
+            //(decided this based on UI and likelyhood etc it woudl be hard to show this as a biz rule with the simple UI for it)
+            foreach (var pai in proposedObj.Items)
+            {
+                if (pai.Quantity < 1)
+                    pai.Quantity = 1;
             }
 
             //Any form customizations to validate?
diff --git a/server/AyaNova/models/PartAssemblyItem.cs b/server/AyaNova/models/PartAssemblyItem.cs
index 65194880..ab566c39 100644
--- a/server/AyaNova/models/PartAssemblyItem.cs
+++ b/server/AyaNova/models/PartAssemblyItem.cs
@@ -12,12 +12,16 @@ namespace AyaNova.Models
 
         [Required]
         public long PartAssemblyId { get; set; }
+        [Required]
         public long PartId { get; set; }
+        [Required]
+        public decimal Quantity { get; set; }
+
         [JsonIgnore]
         public PartAssembly PartAssembly { get; set; }
 
         [NotMapped]
-        public string PartDisplay {get;set;}
+        public string PartDisplay { get; set; }
 
     }//eoc
 
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 67817460..09d6c1b5 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -671,7 +671,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
 
                 //PARTASSEMBLYITEM
                 await ExecQueryAsync("CREATE TABLE apartassemblyitem (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, partassemblyid bigint not null REFERENCES apartassembly on delete cascade, " +
-                "partid bigint not null REFERENCES apart, " +
+                "partid bigint not null REFERENCES apart, quantity decimal(19,4) not null default 1, " +
                 "CONSTRAINT UNQ_PartAssemblyPart UNIQUE (partid, partassemblyid) " +//ensure no duplicate parts in the same assembly
                 ")");
                 // await ExecQueryAsync("CREATE INDEX idx_apartassemblyitem_partid ON apartassemblyitem(partid)");