diff --git a/src/main/java/com/iemr/admin/controller/item/ItemController.java b/src/main/java/com/iemr/admin/controller/item/ItemController.java index 78c64009..954e7a84 100644 --- a/src/main/java/com/iemr/admin/controller/item/ItemController.java +++ b/src/main/java/com/iemr/admin/controller/item/ItemController.java @@ -234,6 +234,11 @@ public String editItemMaster(@RequestBody ItemMaster item) { saveData.setItemDesc(item.getItemDesc()); saveData.setSctCode(item.getSctCode()); saveData.setSctTerm(item.getSctTerm()); + // Only when sent, so screens that don't show these fields can't wipe them (0 clears the threshold) + if (item.getMinStock() != null) + saveData.setMinStock(item.getMinStock()); + if (item.getMaxStock() != null) + saveData.setMaxStock(item.getMaxStock()); saveData.setModifiedBy(item.getModifiedBy()); saveData = itemService.createItemMaster(saveData); response.setResponse(saveData.toString()); diff --git a/src/main/java/com/iemr/admin/data/items/ItemMaster.java b/src/main/java/com/iemr/admin/data/items/ItemMaster.java index 610e2c39..f5e2d599 100644 --- a/src/main/java/com/iemr/admin/data/items/ItemMaster.java +++ b/src/main/java/com/iemr/admin/data/items/ItemMaster.java @@ -113,7 +113,16 @@ public class ItemMaster { @Expose @Column(name="Strength") private String strength; - + + // Stock threshold: at or below this quantity a store's Low Stock report lists the item + @Expose + @Column(name="Min_Stock") + private Integer minStock; + + @Expose + @Column(name="Max_Stock") + private Integer maxStock; + @Expose @Column(name="UOMID") private Integer uomID;