Merge pull request 'barcode-print' (#3) from barcode-print into main
Reviewed-on: http://git.utopiadeals.com:8080/UIND/cut-to-pack-service/pulls/3pull/4/head
commit
dd5b3724b1
1
pom.xml
1
pom.xml
|
|
@ -361,6 +361,7 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>ctp-service</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.utopiaindustries.dao.ctp.BundleWrapper;
|
|||
import com.utopiaindustries.model.ctp.JobCardWrapper;
|
||||
import com.utopiaindustries.service.*;
|
||||
import com.utopiaindustries.util.StringUtils;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -155,7 +156,14 @@ public class CuttingController {
|
|||
redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
|
||||
return "redirect:/cutting/bundles";
|
||||
}
|
||||
return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
|
||||
try {
|
||||
barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
|
||||
redirectAttributes.addFlashAttribute( "success", "Barcode generated successfully" );
|
||||
return "redirect:/cutting/bundles";
|
||||
}catch (Exception e){
|
||||
redirectAttributes.addFlashAttribute( "error", e );
|
||||
return "redirect:/cutting/bundles";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping( "/generate-master-barcodes" )
|
||||
|
|
@ -165,6 +173,13 @@ public class CuttingController {
|
|||
redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
|
||||
return "redirect:/cutting/master-bundles";
|
||||
}
|
||||
return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
|
||||
try {
|
||||
barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
|
||||
redirectAttributes.addFlashAttribute( "success", "Master barcode generated successfully" );
|
||||
return "redirect:/cutting/master-bundles";
|
||||
}catch (Exception e){
|
||||
redirectAttributes.addFlashAttribute( "error", e );
|
||||
return "redirect:/cutting/master-bundles";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.utopiaindustries.model.ctp.JobCard;
|
|||
import com.utopiaindustries.model.ctp.StitchingOfflineItem;
|
||||
import com.utopiaindustries.service.*;
|
||||
import com.utopiaindustries.util.StringUtils;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -130,11 +131,18 @@ public class StitchingController {
|
|||
|
||||
@PostMapping( "/generate-barcodes" )
|
||||
public Object generateBarcode(@RequestParam( name = "ids" ,required = false) Long[] ids,
|
||||
@RequestParam( name = "artifactType" ) String artifactType, RedirectAttributes redirectAttributes ) throws Exception {
|
||||
@RequestParam( name = "artifactType" ) String artifactType, RedirectAttributes redirectAttributes ) throws Exception {
|
||||
if (ids == null){
|
||||
redirectAttributes.addFlashAttribute( "error", "Select At least One CheckBox" );
|
||||
return "redirect:/stitching/stitching-offline-items";
|
||||
}
|
||||
return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
|
||||
try {
|
||||
barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
|
||||
redirectAttributes.addFlashAttribute( "success", "Barcode generated successfully" );
|
||||
return "redirect:/stitching/stitching-offline-items";
|
||||
}catch (Exception e){
|
||||
redirectAttributes.addFlashAttribute( "error", e );
|
||||
return "redirect:/stitching/stitching-offline-items";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@ public enum BarcodeStickerSize {
|
|||
SIZE_1_5_X_3( 3 * 72, 1.5f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7),
|
||||
SIZE_2_X_3( 3 * 72, 2 * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7),
|
||||
SIZE_4_X_4( 4 * 72, 4 * 72, 8, 8, 8, 8, 200, 100, 250, 250, 14, 9, 7),
|
||||
SIZE_1_75_X_3_5( 3.5f * 72, 1.75f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7);
|
||||
SIZE_1_75_X_3_5( 3.5f * 72, 1.75f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7),
|
||||
SIZE_4_X_7( 7f * 72, 4f * 72, 10, 10, 6, 6, 50, 50, 125, 125, 14, 9, 7);
|
||||
|
||||
|
||||
private final float width;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
package com.utopiaindustries.service;
|
||||
|
||||
import com.google.zxing.BarcodeFormat;
|
||||
import com.itextpdf.html2pdf.ConverterProperties;
|
||||
import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
|
||||
import com.itextpdf.text.*;
|
||||
import com.itextpdf.text.pdf.*;
|
||||
import com.utopiaindustries.dao.ctp.BundleDAO;
|
||||
import com.utopiaindustries.dao.ctp.FinishedItemDAO;
|
||||
import com.utopiaindustries.dao.ctp.MasterBundleDAO;
|
||||
|
|
@ -12,16 +8,18 @@ import com.utopiaindustries.dao.ctp.StitchingOfflineItemDAO;
|
|||
import com.utopiaindustries.model.ctp.*;
|
||||
import com.utopiaindustries.util.BarcodeUtils;
|
||||
import com.utopiaindustries.util.StringUtils;
|
||||
import org.springframework.core.io.DefaultResourceLoader;
|
||||
import org.springframework.core.io.InputStreamResource;
|
||||
import org.springframework.core.io.ResourceLoader;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import com.zebra.sdk.comm.Connection;
|
||||
import com.zebra.sdk.comm.TcpConnection;
|
||||
import com.zebra.sdk.graphics.internal.ZebraImage;
|
||||
import com.zebra.sdk.printer.ZebraPrinter;
|
||||
import com.zebra.sdk.printer.ZebraPrinterFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.*;
|
||||
import java.awt.Font;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
@ -44,8 +42,8 @@ public class BarcodeService {
|
|||
/*
|
||||
* generate barcodes here
|
||||
* */
|
||||
public ResponseEntity<InputStreamResource> generateBarcodes(List<Long> ids, String artifactType) throws Exception {
|
||||
String size = BarcodeStickerSize.SIZE_1_75_X_3_5.name();
|
||||
public void generateBarcodes(List<Long> ids, String artifactType) throws Exception {
|
||||
String size = BarcodeStickerSize.SIZE_4_X_7.name();
|
||||
BarcodeStickerSize stickerSize = BarcodeStickerSize.getSize(size);
|
||||
|
||||
List<? extends InventoryArtifact> list = new ArrayList<>();
|
||||
|
|
@ -57,89 +55,81 @@ public class BarcodeService {
|
|||
list = stitchingOfflineItemDAO.findByIds(ids);
|
||||
}
|
||||
|
||||
// get input stream
|
||||
ByteArrayInputStream inputStream = null;
|
||||
// get input stream
|
||||
inputStream = getInputStream(list, stickerSize, artifactType);
|
||||
|
||||
String headerContentDispositionStr = String.format("%s; filename=%s.pdf", "attachment", artifactType);
|
||||
// return response
|
||||
return ResponseEntity
|
||||
.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, headerContentDispositionStr)
|
||||
.contentType(MediaType.APPLICATION_PDF)
|
||||
.body(new InputStreamResource(inputStream));
|
||||
getBarcodeImages(list, stickerSize, artifactType);
|
||||
|
||||
}
|
||||
|
||||
private ByteArrayInputStream getInputStream(List<? extends InventoryArtifact> artifacts,
|
||||
BarcodeStickerSize stickerSize,
|
||||
String artifactType) throws Exception {
|
||||
// resource loader
|
||||
ResourceLoader resourceLoader = new DefaultResourceLoader();
|
||||
// output stream
|
||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||
// converter properties
|
||||
ConverterProperties properties = new ConverterProperties();
|
||||
properties.setFontProvider(new DefaultFontProvider(false, false, true));
|
||||
// generate pdf
|
||||
Document document = new Document(new Rectangle(stickerSize.getWidth(), stickerSize.getHeight()), stickerSize.getMarginLeft(), stickerSize.getMarginRight(), stickerSize.getMarginTop(), stickerSize.getMarginBottom());
|
||||
PdfWriter.getInstance(document, outputStream);
|
||||
document.open();
|
||||
public void getBarcodeImages(List<? extends InventoryArtifact> artifacts,
|
||||
BarcodeStickerSize stickerSize,
|
||||
String artifactType) throws Exception {
|
||||
|
||||
for (InventoryArtifact artifact : artifacts) {
|
||||
document.newPage();
|
||||
// add sku
|
||||
Paragraph skuPara = new Paragraph(artifact.getSku(), new Font(Font.FontFamily.HELVETICA, stickerSize.getTextSizeSmall(), Font.BOLD));
|
||||
skuPara.setAlignment(Element.ALIGN_CENTER);
|
||||
document.add(skuPara);
|
||||
// Create a blank BufferedImage (an image with the size of the sticker)
|
||||
BufferedImage stickerImage = new BufferedImage((int) stickerSize.getWidth()*2, (int) stickerSize.getHeight()*2, BufferedImage.TYPE_INT_ARGB);
|
||||
Graphics2D g2d = stickerImage.createGraphics();
|
||||
g2d.scale(2,2);
|
||||
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||
|
||||
// add barcode image
|
||||
byte[] imgBytes = BarcodeUtils.getBarcodeImageByteArray(artifact.getBarcode(), BarcodeFormat.CODE_128, stickerSize.getImageWidthBarcode(), stickerSize.getImageHeightBarcode());
|
||||
Image image = Image.getInstance(imgBytes);
|
||||
image.setAlignment(Element.ALIGN_CENTER);
|
||||
document.add(image);
|
||||
// Set background color (white for the sticker)
|
||||
g2d.setColor(Color.WHITE);
|
||||
g2d.fillRect(0, 0, (int) stickerSize.getWidth(), (int) stickerSize.getHeight());
|
||||
|
||||
Paragraph barcodePara = new Paragraph(artifact.getBarcode(), new Font(Font.FontFamily.HELVETICA, stickerSize.getTextSizeSmall(), Font.BOLD));
|
||||
barcodePara.setAlignment(Element.ALIGN_CENTER);
|
||||
document.add(barcodePara);
|
||||
// add Artifact mark B / M / F
|
||||
if ( artifactType.equalsIgnoreCase( Bundle.class.getSimpleName()) ) {
|
||||
Paragraph artifactPara = new Paragraph(String.format("%s : %d", artifact.getType(), artifact.getId() ), new Font(Font.FontFamily.HELVETICA, stickerSize.getTextSizeExtraSmall(), Font.NORMAL));
|
||||
artifactPara.setAlignment(Element.ALIGN_CENTER);
|
||||
// Set font for SKU and barcode
|
||||
Font font = new Font("Helvetica", Font.BOLD, stickerSize.getTextSize()+10);
|
||||
g2d.setFont(font);
|
||||
|
||||
Paragraph type = new Paragraph(String.valueOf(artifactType.toCharArray()[0]), new Font(Font.FontFamily.HELVETICA, stickerSize.getTextSize(), Font.BOLD));
|
||||
type.setAlignment(Element.ALIGN_CENTER);
|
||||
// Add SKU to the image
|
||||
String sku = artifact.getSku();
|
||||
FontMetrics fontMetrics = g2d.getFontMetrics();
|
||||
int textWidth = fontMetrics.stringWidth(sku);
|
||||
int x = (int) ((stickerSize.getWidth() - textWidth) / 2);
|
||||
g2d.setColor(Color.BLACK);
|
||||
g2d.drawString(sku, x, stickerSize.getMarginTop() + fontMetrics.getAscent()+20);
|
||||
|
||||
// Create a table with 2 columns
|
||||
PdfPTable table = new PdfPTable(2);
|
||||
table.setWidthPercentage(100);
|
||||
table.setWidths(new int[]{55, 45}); // Adjust column widths as needed
|
||||
// Create the barcode image
|
||||
byte[] imgBytes = BarcodeUtils.getBarcodeImageByteArray(artifact.getBarcode(), BarcodeFormat.CODE_128, stickerSize.getImageWidthBarcode()+500, stickerSize.getImageHeightBarcode()+30);
|
||||
BufferedImage barcodeImage = ImageIO.read(new ByteArrayInputStream(imgBytes));
|
||||
|
||||
// Add cells to the table
|
||||
PdfPCell artifactCell = new PdfPCell(artifactPara);
|
||||
artifactCell.setBorder(Rectangle.NO_BORDER);
|
||||
artifactCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
|
||||
artifactCell.setPaddingTop(5);
|
||||
// Draw the barcode image on the sticker
|
||||
int barcodeX =(int) (stickerSize.getWidth() - barcodeImage.getWidth()) / 2;
|
||||
int barcodeY = stickerSize.getMarginTop() + fontMetrics.getAscent() + 30; // Add some margin
|
||||
g2d.drawImage(barcodeImage, barcodeX, barcodeY, null);
|
||||
|
||||
PdfPCell typeCell = new PdfPCell(type);
|
||||
typeCell.setBorder(Rectangle.NO_BORDER);
|
||||
typeCell.setHorizontalAlignment(Element.ALIGN_LEFT);
|
||||
// Add the barcode value below the barcode image
|
||||
g2d.drawString(artifact.getBarcode(), (stickerSize.getWidth() - fontMetrics.stringWidth(artifact.getBarcode())) / 2,
|
||||
barcodeY + barcodeImage.getHeight() + fontMetrics.getAscent());
|
||||
|
||||
table.addCell(artifactCell);
|
||||
table.addCell(typeCell);
|
||||
// Add the table to the document
|
||||
document.add(table);
|
||||
// If artifactType is Bundle, add additional info
|
||||
if (artifactType.equalsIgnoreCase(Bundle.class.getSimpleName())) {
|
||||
String typeText = String.format("%s : %d", artifact.getType(), artifact.getId());
|
||||
g2d.drawString(typeText, (stickerSize.getWidth() - fontMetrics.stringWidth(typeText)) / 2,
|
||||
barcodeY + barcodeImage.getHeight() + fontMetrics.getAscent() + 45);
|
||||
|
||||
g2d.setFont(new Font("Helvetica", Font.BOLD, stickerSize.getTextSize()+20));
|
||||
g2d.drawString(String.valueOf(artifactType.toCharArray()[0]), (stickerSize.getWidth() - fontMetrics.stringWidth(String.valueOf(artifactType.toCharArray()[0]))) / 2,
|
||||
barcodeY + barcodeImage.getHeight() + fontMetrics.getAscent() + 77);
|
||||
} else {
|
||||
Paragraph type = new Paragraph(String.valueOf(artifactType.toCharArray()[0]), new Font(Font.FontFamily.HELVETICA, stickerSize.getTextSize(), Font.BOLD));
|
||||
type.setAlignment(Element.ALIGN_CENTER);
|
||||
document.add(type);
|
||||
// Add first character of artifact type
|
||||
String type = String.valueOf(artifactType.charAt(0));
|
||||
g2d.setFont(new Font("Helvetica", Font.BOLD, stickerSize.getTextSize()+10));
|
||||
g2d.drawString(type, (stickerSize.getWidth() - fontMetrics.stringWidth(type)) / 2,
|
||||
barcodeY + barcodeImage.getHeight() + fontMetrics.getAscent() + 45);
|
||||
}
|
||||
|
||||
// Finalize drawing
|
||||
g2d.dispose();
|
||||
printLabel(stickerImage);
|
||||
}
|
||||
document.close();
|
||||
// input stream
|
||||
return new ByteArrayInputStream(outputStream.toByteArray());
|
||||
}
|
||||
|
||||
|
||||
public void printLabel( BufferedImage bufferedImage ) throws Exception {
|
||||
String ipAddr = "192.168.90.160";
|
||||
int port = 9100;
|
||||
Connection connection = new TcpConnection( ipAddr, port );
|
||||
connection.open();
|
||||
ZebraPrinter printer = ZebraPrinterFactory.getInstance( connection );
|
||||
ZebraImage zebraImage = new ZebraImage( bufferedImage );
|
||||
printer.printImage( zebraImage, 0, 0, 0, 0, false );
|
||||
connection.close();
|
||||
}
|
||||
}
|
||||
|
|
@ -14,11 +14,11 @@ spring:
|
|||
enabled: true
|
||||
cache:
|
||||
period: 0
|
||||
static-locations: file:./src/main/resources/static/
|
||||
static-locations: classpath:/static/
|
||||
thymeleaf:
|
||||
check-template-location: true
|
||||
cache: false
|
||||
prefix: file:./src/main/resources/templates/
|
||||
prefix: classpath:/templates/
|
||||
uinddatasource:
|
||||
jdbcUrl: jdbc:mysql://192.168.90.108:3306/uind_vms
|
||||
username: utopia
|
||||
|
|
|
|||
|
|
@ -6,14 +6,29 @@
|
|||
<body>
|
||||
<!-- flash messages -->
|
||||
<div th:fragment="page-notices">
|
||||
<div class="alert alert-danger" th:if="${error}" th:text="${error}"></div>
|
||||
<div id="error" class="collapse show alert alert-danger" th:if="${error}" >
|
||||
<div class="d-flex justify-content-between align-items-center" style="position: relative;">
|
||||
<span th:text="${error}"></span>
|
||||
<span class="btn font-lg" data-toggle="collapse" data-target="#error">×</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert alert-danger" th:if="${errors != null && #lists.size(errors) > 0}">
|
||||
<ul class="mb-0">
|
||||
<li th:each="error: ${errors}" th:text="${error}"></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="alert alert-success" th:if="${success}" th:text="${success}"></div>
|
||||
<div class="alert alert-warning" th:if="${warning}" th:text="${warning}"></div>
|
||||
<div id="success" class="collapse show alert alert-success" th:if="${success}" >
|
||||
<div class="d-flex justify-content-between align-items-center" style="position: relative;">
|
||||
<span th:text="${success}"></span>
|
||||
<span class="btn font-lg" data-toggle="collapse" data-target="#success">×</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="warning" class="collapse show alert alert-warning" th:if="${warning}" th:text="${warning}">
|
||||
<div class="d-flex justify-content-between align-items-center" style="position: relative;">
|
||||
<span th:text="${warning}"></span>
|
||||
<span class="btn font-lg" data-toggle="collapse" data-target="#warning">×</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue