Merge pull request #6 from Bahmni-HWC/GOK-366

Add. e-Aushada Institute ID and Inward Number

api/src/main/java/org/openmrs/module/openhmis/inventory/api/model/ItemStock.java

@@ -32,6 +32,15 @@ public class ItemStock extends BaseOpenmrsObject implements Comparable<ItemStock
 	private int quantity;
 	private Set<ItemStockDetail> details;
 	private String batchNumber;
+	private String inwardNumber;
+
+	public String getInwardNumber() {
+		return inwardNumber;
+	}
+
+	public void setInwardNumber(String inwardNumber) {
+		this.inwardNumber = inwardNumber;
+	}
 
 	public String getBatchNumber() {
 		return batchNumber;

api/src/main/java/org/openmrs/module/openhmis/inventory/api/model/ItemStockDetail.java

@@ -54,6 +54,7 @@ public ItemStockDetail(ItemStock stock, StockOperationTransaction tx) {
 		this.setCalculatedExpiration(tx.isCalculatedExpiration());
 		this.setCalculatedBatch(tx.isCalculatedBatch());
 		this.setQuantity(tx.getQuantity());
+		this.setInwardNumber(tx.getInwardNumber());
 	}
 
 	/**
@@ -76,6 +77,7 @@ public ItemStockDetail(ItemStockDetail base) {
 		setCalculatedBatch(base.isCalculatedBatch());
 		setCalculatedExpiration(base.isCalculatedExpiration());
 		setQuantity(base.getQuantity());
+		setInwardNumber(base.getInwardNumber());
 	}
 
 	/**

api/src/main/java/org/openmrs/module/openhmis/inventory/api/model/ItemStockDetailBase.java

@@ -33,6 +33,24 @@ public class ItemStockDetailBase extends BaseOpenmrsObject {
 	private Boolean calculatedBatch;
 
 	private String batchNumber;
+	private String inwardNumber;
+	private Date inwardDate;
+
+	public Date getInwardDate() {
+		return inwardDate;
+	}
+
+	public void setInwardDate(Date inwardDate) {
+		this.inwardDate = inwardDate;
+	}
+
+	public String getInwardNumber() {
+		return inwardNumber;
+	}
+
+	public void setInwardNumber(String inwardNumber) {
+		this.inwardNumber = inwardNumber;
+	}
 
 	public String getBatchNumber() {
 		return batchNumber;

api/src/main/java/org/openmrs/module/openhmis/inventory/api/model/StockOperation.java

@@ -54,6 +54,8 @@ public class StockOperation extends BaseInstanceCustomizableMetadata<IStockOpera
 	protected Department department;
 	private String cancelReason;
 	private String outwardId;
+	private String instituteId;
+	private Date inwardDate;
 
 	@Override
 	public Integer getId() {
@@ -175,6 +177,22 @@ public String getOutwardId() {
 		return outwardId;
 	}
 
+	public String getInstituteId() {
+		return instituteId;
+	}
+
+	public void setInstituteId(String instituteId) {
+		this.instituteId = instituteId;
+	}
+
+	public Date getInwardDate() {
+		return inwardDate;
+	}
+
+	public void setInwardDate(Date inwardDate) {
+		this.inwardDate = inwardDate;
+	}
+
 	public void setOutwardId(String outwardId) {
 		this.outwardId = outwardId;
 	}

api/src/main/java/org/openmrs/module/openhmis/inventory/api/model/TransactionBase.java

@@ -37,6 +37,9 @@ public abstract class TransactionBase extends BaseOpenmrsObject implements Compa
 	private Boolean sourceCalculatedBatch;
 	private String batchNumber;
 	private String outwardId;
+	private String instituteId;
+	private String inwardNumber;
+	private Date inwardDate;
 
 	private User creator;
 	private Date dateCreated = new Date();
@@ -55,6 +58,9 @@ protected TransactionBase(TransactionBase tx) {
 		calculatedBatch = tx.calculatedBatch;
 		batchNumber = tx.batchNumber;
 		outwardId = tx.outwardId;
+		instituteId = tx.instituteId;
+		inwardNumber = tx.inwardNumber;
+		inwardDate = tx.inwardDate;
 	}
 
 	protected TransactionBase(StockOperationItem item) {
@@ -65,6 +71,7 @@ protected TransactionBase(StockOperationItem item) {
 		this.calculatedBatch = item.isCalculatedBatch();
 		this.calculatedExpiration = item.isCalculatedExpiration();
 		this.batchNumber = item.getBatchNumber();
+		this.inwardNumber = item.getInwardNumber();
 	}
 
 	public Integer getId() {
@@ -171,6 +178,14 @@ public void setBatchNumber(String batchNumber) {
 		this.batchNumber = batchNumber;
 	}
 
+	public String getInwardNumber() {
+		return inwardNumber;
+	}
+
+	public void setInwardNumber(String inwardNumber) {
+		this.inwardNumber = inwardNumber;
+	}
+
 	@Override
 	public int compareTo(TransactionBase o) {
 		if (o == null) {

api/src/main/resources/InvStockroom.hbm.xml

@@ -75,7 +75,7 @@
 		<property name="calculatedExpiration" type="boolean" column="calculated_expiration" not-null="false" />
 		<property name="calculatedBatch" type="boolean" column="calculated_batch" not-null="false" />
 		<property name="batchNumber" type="java.lang.String" column="batch_number" />
-
+		<property name="inwardNumber" type="java.lang.String" column="inward_number" />
 
 		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
 	</class>
@@ -180,9 +180,10 @@
 		<property name="description" type="java.lang.String" column="description" />
 		<property name="operationNumber" type="java.lang.String" column="operation_number" not-null="true"/>
 		<property name="operationDate" type="java.util.Date" column="operation_date" not-null="true" />
+		<property name="inwardDate" type="java.util.Date" column="inward_date" />
 		<property name="operationOrder" type="int" column="operation_order" />
 		<property name="outwardId" type="java.lang.String" column="outward_id" />
-
+		<property name="instituteId" type="java.lang.String" column="institute_id" />
 		<many-to-one name="instanceType" class="IStockOperationType" not-null="true" lazy="false" column="operation_type_id" />
 
 		<!-- Access properties via the field so setter code is not run -->

omod/src/main/resources/liquibase.xml

@@ -1120,6 +1120,15 @@
 			ALTER TABLE inv_item_stock_detail ADD COLUMN batch_number VARCHAR(15) AFTER batch_operation_id;
 		</sql>
 	</changeSet>
+	<changeSet id="Adding-InwardNumber-GOK-366"  author="Inventory">
+		<preConditions onFail="MARK_RAN">
+			<sqlCheck expectedResult="0">SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'inv_item_stock_detail' AND column_name = 'inward_number'</sqlCheck>
+		</preConditions>
+		<comment>Adding Inward Number column in inv_item_stock_detail table</comment>
+		<sql>
+			ALTER TABLE inv_item_stock_detail ADD COLUMN inward_number VARCHAR(15);
+		</sql>
+	</changeSet>
 	<changeSet id="Adding-OutwardId-colmnGOK-210"  author="Inventory">
 		<preConditions onFail="MARK_RAN">
 			<sqlCheck expectedResult="0">SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'inv_stock_operation' AND column_name = 'outward_id'</sqlCheck>
@@ -1129,6 +1138,24 @@
 			ALTER TABLE inv_stock_operation ADD COLUMN outward_id VARCHAR(30);
 		</sql>
 	</changeSet>
+	<changeSet id="Adding-instituteId-colmnGOK-366"  author="Inventory">
+		<preConditions onFail="MARK_RAN">
+			<sqlCheck expectedResult="0">SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'inv_stock_operation' AND column_name = 'institute_id'</sqlCheck>
+		</preConditions>
+		<comment>Adding InstituteId column in inv_stock_operation table</comment>
+		<sql>
+			ALTER TABLE inv_stock_operation ADD COLUMN institute_id VARCHAR(30);
+		</sql>
+	</changeSet>
+	<changeSet id="Adding-inward_date-colmn-GOK-366"  author="Inventory">
+		<preConditions onFail="MARK_RAN">
+			<sqlCheck expectedResult="0">SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'inv_stock_operation' AND column_name = 'inward_date'</sqlCheck>
+		</preConditions>
+		<comment>Adding inward_date column in inv_stock_operation table</comment>
+		<sql>
+			ALTER TABLE inv_stock_operation ADD COLUMN inward_date DATETIME;
+		</sql>
+	</changeSet>
 	<changeSet id="GOK-131-add-eaushadha-item-attribute" author="Mohan">
 		<preConditions onFail="MARK_RAN">
 		<sqlCheck expectedResult="0">select count(*) from inv_item_attribute_type where name = 'eAushadhaID'</sqlCheck>

omod_1.x/src/main/java/org/openmrs/module/webservices/rest/resource/ItemStockDetailBaseResource.java

@@ -56,4 +56,12 @@ public void setBatchNumber(ItemStockDetailBase instance, String batchNumber) {
 		}
 		instance.setBatchNumber(batchNumber);
 	}
+
+	@PropertySetter("inwardNumber")
+	public void setInwardNumber(ItemStockDetailBase instance, String inwardNumber) {
+		if (inwardNumber == null || inwardNumber.trim().isEmpty()) {
+			throw new IllegalArgumentException("Could not parse '" + inwardNumber);
+		}
+		instance.setInwardNumber(inwardNumber);
+	}
 }

omod_1.x/src/main/java/org/openmrs/module/webservices/rest/resource/StockOperationResource.java

@@ -71,6 +71,8 @@ public class StockOperationResource
 	private boolean submitRequired = false;
 	private boolean rollbackRequired = false;
 	private String outwardId;
+	private String instituteId;
+	private Date inwardDate;
 
 	public StockOperationResource() {
 		this.operationService = Context.getService(IStockOperationService.class);
@@ -100,6 +102,8 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		description.addProperty("operationOrder", Representation.DEFAULT);
 		description.addProperty("cancelReason", Representation.DEFAULT);
 		description.addProperty("outwardId", Representation.DEFAULT);
+		description.addProperty("instituteId", Representation.DEFAULT);
+		description.addProperty("inwardDate", Representation.DEFAULT);
 
 		if (!(rep instanceof RefRepresentation)) {
 			description.addProperty("source", Representation.REF);