From f7af353a02f1f90b21601d4eee9540e9289de384 Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Thu, 15 Oct 2026 09:30:06 +0530 Subject: [PATCH 1/2] feat(AMM-2491): Min Stock / Max Stock in item master Map the existing m_item Min_Stock and Max_Stock columns so admin can set the stock threshold when creating or editing an item. Inventory's Low Stock report reads Min_Stock. Co-Authored-By: Claude Opus 5.5 --- .../iemr/admin/controller/item/ItemController.java | 2 ++ .../java/com/iemr/admin/data/items/ItemMaster.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) 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..f07a4f52 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,8 @@ public String editItemMaster(@RequestBody ItemMaster item) { saveData.setItemDesc(item.getItemDesc()); saveData.setSctCode(item.getSctCode()); saveData.setSctTerm(item.getSctTerm()); + saveData.setMinStock(item.getMinStock()); + 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; From b3f25cdb0f14da95f6fbcb376c83b17df8fb4ebf Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Thu, 15 Oct 2026 09:31:02 +0530 Subject: [PATCH 2/2] fix(AMM-2491): edit item keeps Min/Max Stock when not sent Co-Authored-By: Claude Opus 5.5 --- .../com/iemr/admin/controller/item/ItemController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 f07a4f52..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,8 +234,11 @@ public String editItemMaster(@RequestBody ItemMaster item) { saveData.setItemDesc(item.getItemDesc()); saveData.setSctCode(item.getSctCode()); saveData.setSctTerm(item.getSctTerm()); - saveData.setMinStock(item.getMinStock()); - saveData.setMaxStock(item.getMaxStock()); + // 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());