From 1415c3f2fb0549cb1c6b750b48df6bb54eaccc87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Mon, 25 Nov 2024 14:56:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/print/controller/PrintController.java | 54 +++++++++---------- .../ktg/print/domain/PrintBarcodeModel.java | 6 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ktg-print/src/main/java/com/ktg/print/controller/PrintController.java b/ktg-print/src/main/java/com/ktg/print/controller/PrintController.java index 15e27a9..6ac38e1 100644 --- a/ktg-print/src/main/java/com/ktg/print/controller/PrintController.java +++ b/ktg-print/src/main/java/com/ktg/print/controller/PrintController.java @@ -68,18 +68,18 @@ public class PrintController { */ @PostMapping("/printing") public AjaxResult printBarcodeLabel(@RequestBody PrintBarcodeModel printBarcodeModel) { - String printCode = printBarcodeModel.getPrintCode(); + String printerCode = printBarcodeModel.getPrinterCode(); String printTemplate = printBarcodeModel.getPrintTemplate(); Map params = printBarcodeModel.getParams(); - Long bussinessId = printBarcodeModel.getBussinessId(); - String bussinessCode = printBarcodeModel.getBussinessCode(); - PrintPrinterConfig printPrinterConfig = printPrinterConfigService.selectPrintPrinterConfigByPrinterCode(printCode); + Long businessId = printBarcodeModel.getBusinessId(); + String businessCode = printBarcodeModel.getBusinessCode(); + PrintPrinterConfig printPrinterConfig = printPrinterConfigService.selectPrintPrinterConfigByPrinterCode(printerCode); String ip = printPrinterConfig.getPrinterIp(); String printPort = printPrinterConfig.getPrinterPort().toString(); String printName = printPrinterConfig.getPrinterName(); PrintMessageProto.Printer.DataType dataType = PrintMessageProto.Printer.DataType.IQC_PrintMessage; if (printPrinterConfig == null) { - return AjaxResult.error("打印机：" + printCode + "不存在"); + return AjaxResult.error("打印机：" + printerCode + "不存在"); } //根据打印机编码id获取打印机你信息 String clientIp = printPrinterConfig.getClientIp(); @@ -87,23 +87,23 @@ public class PrintController { return AjaxResult.error("请检查打印机客户端信息配置！"); } PrintMessageProto.Printer msg = null; - PrintMessageProto.Printer.PrintInfo printInfo = PrintMessageProto.Printer.PrintInfo.newBuilder().setIp(ip).setCode(printCode).setName(printName).setPort(printPort).build(); + PrintMessageProto.Printer.PrintInfo printInfo = PrintMessageProto.Printer.PrintInfo.newBuilder().setIp(ip).setCode(printerCode).setName(printName).setPort(printPort).build(); switch (printTemplate) { case UserConstants.BARCODE_TYPE_ITEM: //物料标签打印 //封装模板数据 MdItem item = null; - if (Optional.ofNullable(bussinessId).isPresent()) { - item = iMdItemService.selectMdItemById(bussinessId); + if (Optional.ofNullable(businessId).isPresent()) { + item = iMdItemService.selectMdItemById(businessId); if (item == null) { - return AjaxResult.error("条码内容数据为空！" + "(" + bussinessId + ")"); + return AjaxResult.error("条码内容数据为空！" + "(" + businessId + ")"); } - } else if (StringUtils.isNotEmpty(bussinessCode)) { + } else if (StringUtils.isNotEmpty(businessCode)) { MdItem itemParam = new MdItem(); - itemParam.setItemCode(bussinessCode); + itemParam.setItemCode(businessCode); List itemList = iMdItemService.selectMdItemList(itemParam); if (CollectionUtils.isEmpty(itemList)) { - return AjaxResult.error("条码内容数据为空！" + "(" + bussinessCode + ")"); + return AjaxResult.error("条码内容数据为空！" + "(" + businessCode + ")"); } item = itemList.get(0); } else { @@ -116,7 +116,7 @@ public class PrintController { bacode.setBarcodeType(UserConstants.BARCODE_TYPE_ITEM); List wmBarcodes = wmBarcodeService.selectWmBarcodeList(bacode); if (CollectionUtils.isEmpty(wmBarcodes)) { - return AjaxResult.error("未查询到二维码信息！" + "(" + bussinessCode + ")"); + return AjaxResult.error("未查询到二维码信息！" + "(" + businessCode + ")"); } WmBarcode wmBarcode = wmBarcodes.get(0); String materialCode = item.getItemCode();//物料编码 @@ -154,17 +154,17 @@ public class PrintController { //设备标签打印 //封装模板数据 DvMachinery dvMachinery = null; - if (Optional.ofNullable(bussinessId).isPresent()) { - dvMachinery = iDvMachineryService.selectDvMachineryByMachineryId(bussinessId); + if (Optional.ofNullable(businessId).isPresent()) { + dvMachinery = iDvMachineryService.selectDvMachineryByMachineryId(businessId); if (dvMachinery == null) { - return AjaxResult.error("条码内容数据为空！" + "(" + bussinessId + ")"); + return AjaxResult.error("条码内容数据为空！" + "(" + businessId + ")"); } - } else if (StringUtils.isNotEmpty(bussinessCode)) { + } else if (StringUtils.isNotEmpty(businessCode)) { DvMachinery mParam = new DvMachinery(); - mParam.setMachineryCode(bussinessCode); + mParam.setMachineryCode(businessCode); List mList = iDvMachineryService.selectDvMachineryList(mParam); if (CollectionUtils.isEmpty(mList)) { - return AjaxResult.error("条码内容数据为空！" + "(" + bussinessCode + ")"); + return AjaxResult.error("条码内容数据为空！" + "(" + businessCode + ")"); } dvMachinery = mList.get(0); } else { @@ -177,7 +177,7 @@ public class PrintController { mcode.setBarcodeType(UserConstants.BARCODE_TYPE_MACHINERY); List mBarcodes = wmBarcodeService.selectWmBarcodeList(mcode); if (CollectionUtils.isEmpty(mBarcodes)) { - return AjaxResult.error("未查询到二维码信息！" + "(" + bussinessCode + ")"); + return AjaxResult.error("未查询到二维码信息！" + "(" + businessCode + ")"); } dataType = PrintMessageProto.Printer.DataType.Equipment_; PrintMessageProto.Printer.Equipment equipment = PrintMessageProto.Printer.Equipment.newBuilder(). @@ -204,17 +204,17 @@ public class PrintController { //流转卡标签打印 //封装模板数据 ProCard proCard = null; - if (Optional.ofNullable(bussinessId).isPresent()) { - proCard = iProCardService.selectProCardByCardId(bussinessId); + if (Optional.ofNullable(businessId).isPresent()) { + proCard = iProCardService.selectProCardByCardId(businessId); if (proCard == null) { - return AjaxResult.error("条码内容数据为空！" + "(" + bussinessId + ")"); + return AjaxResult.error("条码内容数据为空！" + "(" + businessId + ")"); } - } else if (StringUtils.isNotEmpty(bussinessCode)) { + } else if (StringUtils.isNotEmpty(businessCode)) { ProCard pcParam = new ProCard(); - pcParam.setCardCode(bussinessCode); + pcParam.setCardCode(businessCode); List mList = iProCardService.selectProCardList(pcParam); if (CollectionUtils.isEmpty(mList)) { - return AjaxResult.error("条码内容数据为空！" + "(" + bussinessCode + ")"); + return AjaxResult.error("条码内容数据为空！" + "(" + businessCode + ")"); } proCard = mList.get(0); } else { @@ -227,7 +227,7 @@ public class PrintController { pcBarcode.setBarcodeType(UserConstants.BARCODE_TYPE_PROCARD); List pcBarcodes = wmBarcodeService.selectWmBarcodeList(pcBarcode); if (CollectionUtils.isEmpty(pcBarcodes)) { - return AjaxResult.error("未查询到二维码信息！" + "(" + bussinessCode + ")"); + return AjaxResult.error("未查询到二维码信息！" + "(" + businessCode + ")"); } //TODO Long routeId =-1L,processId = -1L; diff --git a/ktg-print/src/main/java/com/ktg/print/domain/PrintBarcodeModel.java b/ktg-print/src/main/java/com/ktg/print/domain/PrintBarcodeModel.java index cf7a365..c9f083d 100644 --- a/ktg-print/src/main/java/com/ktg/print/domain/PrintBarcodeModel.java +++ b/ktg-print/src/main/java/com/ktg/print/domain/PrintBarcodeModel.java @@ -10,8 +10,8 @@ import java.util.Map; @Data public class PrintBarcodeModel { private Map params; - private String printCode; + private String printerCode; private String printTemplate; - private Long bussinessId; - private String bussinessCode; + private Long businessId; + private String businessCode; }