mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数名称修改

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2024-11-25 14:56:34 +08:00
parent 7f830deebf
commit 1415c3f2fb
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ktg-print/src/main/java/com/ktg/print/controller/PrintController.java
View File

@ -68,18 +68,18 @@ public class PrintController {
*/ */
@PostMapping("/printing") @PostMapping("/printing")
public AjaxResult printBarcodeLabel(@RequestBody PrintBarcodeModel printBarcodeModel) { public AjaxResult printBarcodeLabel(@RequestBody PrintBarcodeModel printBarcodeModel) {
String printCode = printBarcodeModel.getPrintCode(); String printerCode = printBarcodeModel.getPrinterCode();
String printTemplate = printBarcodeModel.getPrintTemplate(); String printTemplate = printBarcodeModel.getPrintTemplate();
Map<String, String> params = printBarcodeModel.getParams(); Map<String, String> params = printBarcodeModel.getParams();
Long bussinessId = printBarcodeModel.getBussinessId(); Long businessId = printBarcodeModel.getBusinessId();
String bussinessCode = printBarcodeModel.getBussinessCode(); String businessCode = printBarcodeModel.getBusinessCode();
PrintPrinterConfig printPrinterConfig = printPrinterConfigService.selectPrintPrinterConfigByPrinterCode(printCode); PrintPrinterConfig printPrinterConfig = printPrinterConfigService.selectPrintPrinterConfigByPrinterCode(printerCode);
String ip = printPrinterConfig.getPrinterIp(); String ip = printPrinterConfig.getPrinterIp();
String printPort = printPrinterConfig.getPrinterPort().toString(); String printPort = printPrinterConfig.getPrinterPort().toString();
String printName = printPrinterConfig.getPrinterName(); String printName = printPrinterConfig.getPrinterName();
PrintMessageProto.Printer.DataType dataType = PrintMessageProto.Printer.DataType.IQC_PrintMessage; PrintMessageProto.Printer.DataType dataType = PrintMessageProto.Printer.DataType.IQC_PrintMessage;
if (printPrinterConfig == null) { if (printPrinterConfig == null) {
return AjaxResult.error("打印机：" + printCode + "不存在"); return AjaxResult.error("打印机：" + printerCode + "不存在");
} }
//根据打印机编码id获取打印机你信息 //根据打印机编码id获取打印机你信息
String clientIp = printPrinterConfig.getClientIp(); String clientIp = printPrinterConfig.getClientIp();
@ -87,23 +87,23 @@ public class PrintController {
return AjaxResult.error("请检查打印机客户端信息配置！"); return AjaxResult.error("请检查打印机客户端信息配置！");
} }
PrintMessageProto.Printer msg = null; 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) { switch (printTemplate) {
case UserConstants.BARCODE_TYPE_ITEM: case UserConstants.BARCODE_TYPE_ITEM:
//物料标签打印 //物料标签打印
//封装模板数据 //封装模板数据
MdItem item = null; MdItem item = null;
if (Optional.ofNullable(bussinessId).isPresent()) { if (Optional.ofNullable(businessId).isPresent()) {
item = iMdItemService.selectMdItemById(bussinessId); item = iMdItemService.selectMdItemById(businessId);
if (item == null) { 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(); MdItem itemParam = new MdItem();
itemParam.setItemCode(bussinessCode); itemParam.setItemCode(businessCode);
List<MdItem> itemList = iMdItemService.selectMdItemList(itemParam); List<MdItem> itemList = iMdItemService.selectMdItemList(itemParam);
if (CollectionUtils.isEmpty(itemList)) { if (CollectionUtils.isEmpty(itemList)) {
return AjaxResult.error("条码内容数据为空！" + "(" + bussinessCode + ")"); return AjaxResult.error("条码内容数据为空！" + "(" + businessCode + ")");
} }
item = itemList.get(0); item = itemList.get(0);
} else { } else {
@ -116,7 +116,7 @@ public class PrintController {
bacode.setBarcodeType(UserConstants.BARCODE_TYPE_ITEM); bacode.setBarcodeType(UserConstants.BARCODE_TYPE_ITEM);
List<WmBarcode> wmBarcodes = wmBarcodeService.selectWmBarcodeList(bacode); List<WmBarcode> wmBarcodes = wmBarcodeService.selectWmBarcodeList(bacode);
if (CollectionUtils.isEmpty(wmBarcodes)) { if (CollectionUtils.isEmpty(wmBarcodes)) {
return AjaxResult.error("未查询到二维码信息！" + "(" + bussinessCode + ")"); return AjaxResult.error("未查询到二维码信息！" + "(" + businessCode + ")");
} }
WmBarcode wmBarcode = wmBarcodes.get(0); WmBarcode wmBarcode = wmBarcodes.get(0);
String materialCode = item.getItemCode();//物料编码 String materialCode = item.getItemCode();//物料编码
@ -154,17 +154,17 @@ public class PrintController {
//设备标签打印 //设备标签打印
//封装模板数据 //封装模板数据
DvMachinery dvMachinery = null; DvMachinery dvMachinery = null;
if (Optional.ofNullable(bussinessId).isPresent()) { if (Optional.ofNullable(businessId).isPresent()) {
dvMachinery = iDvMachineryService.selectDvMachineryByMachineryId(bussinessId); dvMachinery = iDvMachineryService.selectDvMachineryByMachineryId(businessId);
if (dvMachinery == null) { 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(); DvMachinery mParam = new DvMachinery();
mParam.setMachineryCode(bussinessCode); mParam.setMachineryCode(businessCode);
List<DvMachinery> mList = iDvMachineryService.selectDvMachineryList(mParam); List<DvMachinery> mList = iDvMachineryService.selectDvMachineryList(mParam);
if (CollectionUtils.isEmpty(mList)) { if (CollectionUtils.isEmpty(mList)) {
return AjaxResult.error("条码内容数据为空！" + "(" + bussinessCode + ")"); return AjaxResult.error("条码内容数据为空！" + "(" + businessCode + ")");
} }
dvMachinery = mList.get(0); dvMachinery = mList.get(0);
} else { } else {
@ -177,7 +177,7 @@ public class PrintController {
mcode.setBarcodeType(UserConstants.BARCODE_TYPE_MACHINERY); mcode.setBarcodeType(UserConstants.BARCODE_TYPE_MACHINERY);
List<WmBarcode> mBarcodes = wmBarcodeService.selectWmBarcodeList(mcode); List<WmBarcode> mBarcodes = wmBarcodeService.selectWmBarcodeList(mcode);
if (CollectionUtils.isEmpty(mBarcodes)) { if (CollectionUtils.isEmpty(mBarcodes)) {
return AjaxResult.error("未查询到二维码信息！" + "(" + bussinessCode + ")"); return AjaxResult.error("未查询到二维码信息！" + "(" + businessCode + ")");
} }
dataType = PrintMessageProto.Printer.DataType.Equipment_; dataType = PrintMessageProto.Printer.DataType.Equipment_;
PrintMessageProto.Printer.Equipment equipment = PrintMessageProto.Printer.Equipment.newBuilder(). PrintMessageProto.Printer.Equipment equipment = PrintMessageProto.Printer.Equipment.newBuilder().
@ -204,17 +204,17 @@ public class PrintController {
//流转卡标签打印 //流转卡标签打印
//封装模板数据 //封装模板数据
ProCard proCard = null; ProCard proCard = null;
if (Optional.ofNullable(bussinessId).isPresent()) { if (Optional.ofNullable(businessId).isPresent()) {
proCard = iProCardService.selectProCardByCardId(bussinessId); proCard = iProCardService.selectProCardByCardId(businessId);
if (proCard == null) { 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(); ProCard pcParam = new ProCard();
pcParam.setCardCode(bussinessCode); pcParam.setCardCode(businessCode);
List<ProCard> mList = iProCardService.selectProCardList(pcParam); List<ProCard> mList = iProCardService.selectProCardList(pcParam);
if (CollectionUtils.isEmpty(mList)) { if (CollectionUtils.isEmpty(mList)) {
return AjaxResult.error("条码内容数据为空！" + "(" + bussinessCode + ")"); return AjaxResult.error("条码内容数据为空！" + "(" + businessCode + ")");
} }
proCard = mList.get(0); proCard = mList.get(0);
} else { } else {
@ -227,7 +227,7 @@ public class PrintController {
pcBarcode.setBarcodeType(UserConstants.BARCODE_TYPE_PROCARD); pcBarcode.setBarcodeType(UserConstants.BARCODE_TYPE_PROCARD);
List<WmBarcode> pcBarcodes = wmBarcodeService.selectWmBarcodeList(pcBarcode); List<WmBarcode> pcBarcodes = wmBarcodeService.selectWmBarcodeList(pcBarcode);
if (CollectionUtils.isEmpty(pcBarcodes)) { if (CollectionUtils.isEmpty(pcBarcodes)) {
return AjaxResult.error("未查询到二维码信息！" + "(" + bussinessCode + ")"); return AjaxResult.error("未查询到二维码信息！" + "(" + businessCode + ")");
} }
//TODO //TODO
Long routeId =-1L,processId = -1L; Long routeId =-1L,processId = -1L;

6
ktg-print/src/main/java/com/ktg/print/domain/PrintBarcodeModel.java
View File

@ -10,8 +10,8 @@ import java.util.Map;
@Data @Data
public class PrintBarcodeModel { public class PrintBarcodeModel {
private Map<String, String> params; private Map<String, String> params;
private String printCode; private String printerCode;
private String printTemplate; private String printTemplate;
private Long bussinessId; private Long businessId;
private String bussinessCode; private String businessCode;
} }