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 42e31f3..b8dbb8e 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 @@ -60,8 +60,9 @@ public class PrintController { String materialCode = params.get("materialCode"); String materialName = params.get("materialName"); String specificationAndModel = params.get("specificationAndModel"); + String param = params.get("param"); dataType = PrintMessageProto.Printer.DataType.Material_Products; - PrintMessageProto.Printer.MaterialProducts materialProducts = PrintMessageProto.Printer.MaterialProducts.newBuilder().setMaterialCode(materialCode).setMaterialName(materialName).setSpecificationAndModel(specificationAndModel).build(); + PrintMessageProto.Printer.MaterialProducts materialProducts = PrintMessageProto.Printer.MaterialProducts.newBuilder().setMaterialCode(materialCode).setMaterialName(materialName).setSpecificationAndModel(specificationAndModel).setParam(param).build(); // 构造对应的消息对象 msg = PrintMessageProto.Printer.newBuilder().setMaterialProducts(materialProducts).setDataType(dataType).setPrintInfo(printInfo).build(); break; @@ -92,8 +93,9 @@ public class PrintController { String equipmentCode = params.get("equipmentCode"); String equipmentName = params.get("equipmentName"); String specificationAndModel_1 = params.get("specificationAndModel"); + String param1 = params.get("param"); dataType = PrintMessageProto.Printer.DataType.Equipment_; - PrintMessageProto.Printer.Equipment equipment = PrintMessageProto.Printer.Equipment.newBuilder().setEquipmentCode(equipmentCode).setEquipmentName(equipmentName).setSpecificationAndModel(specificationAndModel_1).build(); + PrintMessageProto.Printer.Equipment equipment = PrintMessageProto.Printer.Equipment.newBuilder().setEquipmentCode(equipmentCode).setEquipmentName(equipmentName).setSpecificationAndModel(specificationAndModel_1).setParam(param1).build(); // 构造对应的消息对象 msg = PrintMessageProto.Printer.newBuilder().setEquipment(equipment).setDataType(dataType).setPrintInfo(printInfo).build(); break; @@ -103,8 +105,9 @@ public class PrintController { String workstationCode = params.get("workstationCode"); String workstationName = params.get("workstationName"); String belongingProcess = params.get("belongingProcess"); + String param2 = params.get("param"); dataType = PrintMessageProto.Printer.DataType.Workstation_; - PrintMessageProto.Printer.Workstation workstation = PrintMessageProto.Printer.Workstation.newBuilder().setWorkstationCode(workstationCode).setWorkstationName(workstationName).setBelongingProcess(belongingProcess).build(); + PrintMessageProto.Printer.Workstation workstation = PrintMessageProto.Printer.Workstation.newBuilder().setWorkstationCode(workstationCode).setWorkstationName(workstationName).setBelongingProcess(belongingProcess).setParam(param2).build(); // 构造对应的消息对象 msg = PrintMessageProto.Printer.newBuilder().setWorkstation(workstation).setDataType(dataType).setPrintInfo(printInfo).build(); break; @@ -114,8 +117,9 @@ public class PrintController { String warehouseCode = params.get("warehouseCode"); String warehouseName = params.get("warehouseName"); String personInCharge = params.get("personInCharge"); + String param3 = params.get("param"); dataType = PrintMessageProto.Printer.DataType.Warehouse_; - PrintMessageProto.Printer.Warehouse warehouse = PrintMessageProto.Printer.Warehouse.newBuilder().setWarehouseCode(warehouseCode).setWarehouseName(warehouseName).setPersonInCharge(personInCharge).build(); + PrintMessageProto.Printer.Warehouse warehouse = PrintMessageProto.Printer.Warehouse.newBuilder().setWarehouseCode(warehouseCode).setWarehouseName(warehouseName).setPersonInCharge(personInCharge).setParam(param3).build(); // 构造对应的消息对象 msg = PrintMessageProto.Printer.newBuilder().setWarehouse(warehouse).setDataType(dataType).setPrintInfo(printInfo).build(); break; @@ -125,8 +129,9 @@ public class PrintController { String warehouseLocationCode = params.get("warehouseLocationCode"); String warehouseLocationName = params.get("warehouseLocationName"); String position = params.get("position"); + String param4 = params.get("param"); dataType = PrintMessageProto.Printer.DataType.Warehouse_Location; - PrintMessageProto.Printer.WarehouseLocation location = PrintMessageProto.Printer.WarehouseLocation.newBuilder().setWarehouseLocationCode(warehouseLocationCode).setWarehouseLocationName(warehouseLocationName).setPosition(position).build(); + PrintMessageProto.Printer.WarehouseLocation location = PrintMessageProto.Printer.WarehouseLocation.newBuilder().setWarehouseLocationCode(warehouseLocationCode).setWarehouseLocationName(warehouseLocationName).setPosition(position).setParam(param4).build(); // 构造对应的消息对象 msg = PrintMessageProto.Printer.newBuilder().setWarehouseLocation(location).setDataType(dataType).setPrintInfo(printInfo).build(); break; @@ -136,7 +141,8 @@ public class PrintController { String warehouseAreaCode = params.get("warehouseAreaCode"); String warehouseAreaName = params.get("warehouseAreaName"); dataType = PrintMessageProto.Printer.DataType.Warehouse_Area; - PrintMessageProto.Printer.WarehouseArea warehouseArea = PrintMessageProto.Printer.WarehouseArea.newBuilder().setWarehouseAreaCode(warehouseAreaCode).setWarehouseAreaName(warehouseAreaName).build(); + String param5 = params.get("param"); + PrintMessageProto.Printer.WarehouseArea warehouseArea = PrintMessageProto.Printer.WarehouseArea.newBuilder().setWarehouseAreaCode(warehouseAreaCode).setWarehouseAreaName(warehouseAreaName).setParam(param5).build(); // 构造对应的消息对象 msg = PrintMessageProto.Printer.newBuilder().setWarehouseArea(warehouseArea).setDataType(dataType).setPrintInfo(printInfo).build(); break;