diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java index 6af8721f..6f870c5e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java @@ -214,32 +214,50 @@ public class BarcodePrintingController extends BaseController { List datas = new ArrayList<>(); // Integer i = 1; for (WmsInventoryBarcodePrinting item : codelist) { - DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO(); - dto.setMaterialNo(item.getMaterialNo()); - dto.setMaterialDesc(item.getMaterialDes()); - dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber()); - dto.setExternalOrderNo(""); - dto.setRowNo(""); if (StrUtil.isNotBlank(item.getSerialNumbers())) { List serialNumbers = StrUtil.split(item.getSerialNumbers(), ","); for (String serialNumber : serialNumbers) { + DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO(); + dto.setMaterialNo(item.getMaterialNo()); + dto.setMaterialDesc(item.getMaterialDes()); + dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber()); + dto.setExternalOrderNo(""); + dto.setRowNo(""); + dto = new DeliverNormalOrderItemDTO(); + dto.setMaterialNo(item.getMaterialNo()); + dto.setMaterialDesc(item.getMaterialDes()); + dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber()); + dto.setExternalOrderNo(""); + dto.setRowNo(""); dto.setPrintNo(IdUtil.getSnowflakeNextIdStr()); dto.setPrintNum("1"); - String qCode = QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, serialNumber), 100, 100); + String qCode = QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, serialNumber), 100, 100); dto.setQrCode(qCode); + datas.add(dto); //i += 1; } } else { int codeNum = item.getQty().divide(item.getPackingNum(), 0, RoundingMode.UP).intValue(); for (int j = 0; j < codeNum; j++) { + DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO(); + dto.setMaterialNo(item.getMaterialNo()); + dto.setMaterialDesc(item.getMaterialDes()); + dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber()); + dto.setExternalOrderNo(""); + dto.setRowNo(""); + dto = new DeliverNormalOrderItemDTO(); + dto.setMaterialNo(item.getMaterialNo()); + dto.setMaterialDesc(item.getMaterialDes()); + dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber()); + dto.setExternalOrderNo(""); + dto.setRowNo(""); dto.setPrintNo(IdUtil.getSnowflakeNextIdStr()); dto.setPrintNum(item.getPackingNum().toString()); String qCode = QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, ""), 100, 100); dto.setQrCode(qCode); + datas.add(dto); } - } - datas.add(dto); } Map variables = new HashMap<>(); variables.put("list", datas);