UIND
/
cut-to-pack-service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'change PO's field type int to varchar according requirements' (#7) from properties-config into main 

Reviewed-on: http://git.utopiadeals.com:8080/UIND/cut-to-pack-service/pulls/7
fixed-serach-item
saif.haq 2025-02-03 07:41:07 +00:00
parent 1aeda60a66 0627de2a98
commit 0b3d79f3e8
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/utopiaindustries/dao/ctp/JobCardRowMapper.java
View File

@ -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;

2
src/main/java/com/utopiaindustries/dao/uind/PurchaseOrderDAO.java
View File

@ -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());

6
src/main/java/com/utopiaindustries/model/ctp/JobCard.java
View File

@ -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;
}

8
src/main/resources/templates/_job-card-fragment.html
View File

@ -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}"