From 5bcb2affa6743e7c0a690196eabd18d89c6fd03e Mon Sep 17 00:00:00 2001 From: "usama.jameel" Date: Wed, 18 Jun 2025 11:46:10 +0500 Subject: [PATCH] add size and color in job card item --- .../dao/ctp/JobCardItemDAO.java | 4 +++- .../dao/ctp/JobCardItemRowMapper.java | 2 ++ .../model/ctp/JobCardItem.java | 18 ++++++++++++++++++ src/main/resources/static/js/job-card-form.js | 18 +++++++++++++----- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java index b0b0535..dc28b5d 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java @@ -22,7 +22,7 @@ public class JobCardItemDAO { private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_BY_CARD_ID = String.format( "SELECT * FROM %s WHERE job_card_id = :card_id", TABLE_NAME ); private final String SELECT_BY_CARD_ID_AND_ITEM_ID = String.format( "SELECT * FROM %s WHERE job_card_id = :card_id AND item_id = :item_id ", TABLE_NAME ); - private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, job_card_id, item_id, sku, expected_production, actual_production, total_production, account_id, length, width, gsm, wt_ply, ply, is_complete) VALUES (:id, :job_card_id, :item_id, :sku, :expected_production, :actual_production, :total_production, :account_id, :length, :width, :gsm, :wt_ply, :ply, :is_complete) ON DUPLICATE KEY UPDATE job_card_id = VALUES(job_card_id), item_id = VALUES(item_id), sku = VALUES(sku), expected_production = VALUES(expected_production), actual_production = VALUES(actual_production), total_production = VALUES(total_production), account_id = VALUES(account_id), length = VALUES(length), width = VALUES(width), gsm = VALUES(gsm), wt_ply = VALUES(wt_ply), ply = VALUES(ply), is_complete =VALUES(is_complete) ", TABLE_NAME ); + private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, job_card_id, item_id, sku, expected_production, actual_production, total_production, account_id, length, width, gsm, wt_ply, ply, is_complete, size, color) VALUES (:id, :job_card_id, :item_id, :sku, :expected_production, :actual_production, :total_production, :account_id, :length, :width, :gsm, :wt_ply, :ply, :is_complete, :size, :color) ON DUPLICATE KEY UPDATE job_card_id = VALUES(job_card_id), item_id = VALUES(item_id), sku = VALUES(sku), expected_production = VALUES(expected_production), actual_production = VALUES(actual_production), total_production = VALUES(total_production), account_id = VALUES(account_id), length = VALUES(length), width = VALUES(width), gsm = VALUES(gsm), wt_ply = VALUES(wt_ply), ply = VALUES(ply), is_complete = VALUES(is_complete), size =VALUES(size), color =VALUES(color) ", TABLE_NAME ); private final String SELECT_BY_IDS = String.format( "SELECT * FROM %s WHERE id IN (:ids)", TABLE_NAME ); private final String SELECT_BY_JOB_CARD_AND_ACCOUNT_IDS = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id AND account_id IN (:account_ids) AND is_complete = FALSE ", TABLE_NAME ); private final String SELECT_ALL_ACTIVE_ITEM = String.format("SELECT CASE WHEN MIN(is_complete) = TRUE THEN TRUE ELSE FALSE END FROM %s WHERE job_card_id = :job_card_id AND id IN (:id)", TABLE_NAME); @@ -48,6 +48,8 @@ public class JobCardItemDAO { .addValue("gsm", jobCardItem.getGsm() ) .addValue("wt_ply", jobCardItem.getWtPly() ) .addValue("ply", jobCardItem.getPly() ) + .addValue("size", jobCardItem.getSize() ) + .addValue("color", jobCardItem.getColor() ) .addValue("is_complete", jobCardItem.isComplete() ); return params; diff --git a/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemRowMapper.java b/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemRowMapper.java index a0dccfc..0964c93 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemRowMapper.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemRowMapper.java @@ -22,6 +22,8 @@ public class JobCardItemRowMapper implements RowMapper { jobCardItem.setGsm( rs.getString("gsm" ) ); jobCardItem.setWtPly( rs.getString("wt_ply" ) ); jobCardItem.setPly( rs.getString("ply" ) ); + jobCardItem.setColor( rs.getString("color" ) ); + jobCardItem.setSize( rs.getString("size" ) ); jobCardItem.setComplete( rs.getBoolean("is_complete" ) ); return jobCardItem; } diff --git a/src/main/java/com/utopiaindustries/model/ctp/JobCardItem.java b/src/main/java/com/utopiaindustries/model/ctp/JobCardItem.java index fd0b155..8fdaaf5 100644 --- a/src/main/java/com/utopiaindustries/model/ctp/JobCardItem.java +++ b/src/main/java/com/utopiaindustries/model/ctp/JobCardItem.java @@ -19,6 +19,8 @@ public class JobCardItem { private String gsm; private String wtPly; private String ply; + private String color; + private String size; // wrapper private List cutPieces; private String title; @@ -176,6 +178,22 @@ public class JobCardItem { isComplete = complete; } + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getSize() { + return size; + } + + public void setSize(String size) { + this.size = size; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/resources/static/js/job-card-form.js b/src/main/resources/static/js/job-card-form.js index 95ad9e7..00880c9 100644 --- a/src/main/resources/static/js/job-card-form.js +++ b/src/main/resources/static/js/job-card-form.js @@ -123,28 +123,36 @@
{{item.sku}} +
+
+ + +
+
+ +
-
+
-
+
-
+
-
+
-
+