From 0627de2a980abf52f64c4075b3e034684bd1a554 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Mon, 3 Feb 2025 10:27:54 +0500
Subject: [PATCH] change PO's field type int to varchar according requirements

---
 .../com/utopiaindustries/dao/ctp/JobCardRowMapper.java    | 2 +-
 .../com/utopiaindustries/dao/uind/PurchaseOrderDAO.java   | 2 +-
 src/main/java/com/utopiaindustries/model/ctp/JobCard.java | 6 +++---
 src/main/resources/templates/_job-card-fragment.html      | 8 +++-----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/dao/ctp/JobCardRowMapper.java b/src/main/java/com/utopiaindustries/dao/ctp/JobCardRowMapper.java
index 4e87069..2f792c1 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/JobCardRowMapper.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/JobCardRowMapper.java
@@ -20,7 +20,7 @@ public class JobCardRowMapper implements RowMapper<JobCard> {
 		jobCard.setInventoryStatus( rs.getString("inventory_status"));
 		jobCard.setCustomer( rs.getString("customer") );
 		jobCard.setLotNumber( rs.getString("lot_number") );
-		jobCard.setPurchaseOrderId( rs.getLong("purchase_order_id") );
+		jobCard.setPurchaseOrderId( rs.getString("purchase_order_id") );
 		jobCard.setLocationSiteId( rs.getLong("location_site_id" ) );
 		jobCard.setDescription( rs.getString("description" ) );
 		return jobCard;
diff --git a/src/main/java/com/utopiaindustries/dao/uind/PurchaseOrderDAO.java b/src/main/java/com/utopiaindustries/dao/uind/PurchaseOrderDAO.java
index 9f1bcbf..98f5d8e 100644
--- a/src/main/java/com/utopiaindustries/dao/uind/PurchaseOrderDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/uind/PurchaseOrderDAO.java
@@ -117,7 +117,7 @@ public class PurchaseOrderDAO {
     }
 
     // find
-    public PurchaseOrder find(long id) {
+    public PurchaseOrder find(String id) {
         MapSqlParameterSource params = new MapSqlParameterSource();
         params.addValue("id", id);
         List<PurchaseOrder> purchaseOrders = namedParameterJdbcTemplate.query(SELECT_QUERY, params, new PurchaseOrderRowMapper());
diff --git a/src/main/java/com/utopiaindustries/model/ctp/JobCard.java b/src/main/java/com/utopiaindustries/model/ctp/JobCard.java
index c824295..d8a1e74 100644
--- a/src/main/java/com/utopiaindustries/model/ctp/JobCard.java
+++ b/src/main/java/com/utopiaindustries/model/ctp/JobCard.java
@@ -24,7 +24,7 @@ public class JobCard {
     private String inventoryStatus;
     private String customer;
     private String lotNumber;
-    private long purchaseOrderId;
+    private String purchaseOrderId;
     private long locationSiteId;
     private String description;
     // wrapper
@@ -106,11 +106,11 @@ public class JobCard {
         this.lotNumber = lotNumber;
     }
 
-    public long getPurchaseOrderId() {
+    public String getPurchaseOrderId() {
         return purchaseOrderId;
     }
 
-    public void setPurchaseOrderId(long purchaseOrderId) {
+    public void setPurchaseOrderId(String purchaseOrderId) {
         this.purchaseOrderId = purchaseOrderId;
     }
 
diff --git a/src/main/resources/templates/_job-card-fragment.html b/src/main/resources/templates/_job-card-fragment.html
index a0246e1..b7c204b 100644
--- a/src/main/resources/templates/_job-card-fragment.html
+++ b/src/main/resources/templates/_job-card-fragment.html
@@ -34,11 +34,9 @@
                                 </div>
                             </div>
                             <div class="form-row">
-                                <div class="col-sm-3 form-group" th:with="title=*{purchaseOrderTitle},id=*{purchaseOrderId}">
-                                    <purchase-order-search th:attr="id=${id},title=${title}"
-                                        v-bind:id-field-name="'purchaseOrderId'"
-                                    >
-                                    </purchase-order-search>
+                                <div class="col-sm-3 form-group">
+                                    <label>Purchase Order</label>
+                                    <input type="text" class="form-control" th:field="*{purchaseOrderId}" required>
                                 </div>
                                 <div class="col-sm-3 form-group" th:with="title=*{locationTitle},id=*{locationSiteId}">
                                     <location-site-search th:attr="id=${id},title=${title}"