From 96cbb788ddcf9cceaccfd00a85f6eaf9fa08dc97 Mon Sep 17 00:00:00 2001
From: guojiaao <793336021@qq.com>
Date: Wed, 27 Nov 2024 16:54:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ktg/common/constant/UserConstants.java | 1 +
.../ktg/print/protocol/PrintMessageProto.java | 1055 ++++++++++++++++-
.../protocol/proto/PrintMessageProto.proto | 6 +
.../print/service/impl/PrintServiceImpl.java | 9 +
4 files changed, 1030 insertions(+), 41 deletions(-)
diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
index d3f13e8..ce45ec0 100644
--- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
+++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
@@ -234,6 +234,7 @@ public class UserConstants
public static final String BARCODE_TYPE_TOOL = "TOOL";
public static final String BARCODE_TYPE_SN = "SN";
public static final String BARCODE_TYPE_PROCARD ="PROCARD";
+ public static final String TEST_TYPE_PRINTER = "TEST";
/**
diff --git a/ktg-print/src/main/java/com/ktg/print/protocol/PrintMessageProto.java b/ktg-print/src/main/java/com/ktg/print/protocol/PrintMessageProto.java
index 3e11ac0..d5a2685 100644
--- a/ktg-print/src/main/java/com/ktg/print/protocol/PrintMessageProto.java
+++ b/ktg-print/src/main/java/com/ktg/print/protocol/PrintMessageProto.java
@@ -1,6 +1,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: PrintMessageProto.proto
package com.ktg.print.protocol;
+
public final class PrintMessageProto {
private PrintMessageProto() {}
public static void registerAllExtensions(
@@ -215,6 +216,21 @@ public final class PrintMessageProto {
*/
PrintMessageProto.Printer.WorkstationOrBuilder getWorkstationOrBuilder();
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ * @return Whether the testPrinter field is set.
+ */
+ boolean hasTestPrinter();
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ * @return The testPrinter.
+ */
+ PrintMessageProto.Printer.TestPrinter getTestPrinter();
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ PrintMessageProto.Printer.TestPrinterOrBuilder getTestPrinterOrBuilder();
+
public PrintMessageProto.Printer.DataBodyCase getDataBodyCase();
}
/**
@@ -423,6 +439,20 @@ public final class PrintMessageProto {
dataBodyCase_ = 12;
break;
}
+ case 106: {
+ PrintMessageProto.Printer.TestPrinter.Builder subBuilder = null;
+ if (dataBodyCase_ == 13) {
+ subBuilder = ((PrintMessageProto.Printer.TestPrinter) dataBody_).toBuilder();
+ }
+ dataBody_ =
+ input.readMessage(PrintMessageProto.Printer.TestPrinter.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom((PrintMessageProto.Printer.TestPrinter) dataBody_);
+ dataBody_ = subBuilder.buildPartial();
+ }
+ dataBodyCase_ = 13;
+ break;
+ }
case 114: {
PrintMessageProto.Printer.PrintInfo.Builder subBuilder = null;
if (printInfo_ != null) {
@@ -523,6 +553,10 @@ public final class PrintMessageProto {
* Workstation_ = 10;
*/
Workstation_(10),
+ /**
+ * TestPrinter_ = 11;
+ */
+ TestPrinter_(11),
UNRECOGNIZED(-1),
;
@@ -574,6 +608,10 @@ public final class PrintMessageProto {
* Workstation_ = 10;
*/
public static final int Workstation__VALUE = 10;
+ /**
+ * TestPrinter_ = 11;
+ */
+ public static final int TestPrinter__VALUE = 11;
public final int getNumber() {
@@ -611,6 +649,7 @@ public final class PrintMessageProto {
case 8: return Warehouse_Area;
case 9: return Equipment_;
case 10: return Workstation_;
+ case 11: return TestPrinter_;
default: return null;
}
}
@@ -12045,6 +12084,726 @@ public final class PrintMessageProto {
}
+ public interface TestPrinterOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:Printer.TestPrinter)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string title = 1;
+ * @return The title.
+ */
+ java.lang.String getTitle();
+ /**
+ * string title = 1;
+ * @return The bytes for title.
+ */
+ com.google.protobuf.ByteString
+ getTitleBytes();
+
+ /**
+ * string text = 2;
+ * @return The text.
+ */
+ java.lang.String getText();
+ /**
+ * string text = 2;
+ * @return The bytes for text.
+ */
+ com.google.protobuf.ByteString
+ getTextBytes();
+ }
+ /**
+ * Protobuf type {@code Printer.TestPrinter}
+ */
+ public static final class TestPrinter extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:Printer.TestPrinter)
+ TestPrinterOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use TestPrinter.newBuilder() to construct.
+ private TestPrinter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private TestPrinter() {
+ title_ = "";
+ text_ = "";
+ }
+
+ @java.lang.Override
+ @SuppressWarnings({"unused"})
+ protected java.lang.Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new TestPrinter();
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private TestPrinter(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ title_ = s;
+ break;
+ }
+ case 18: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ text_ = s;
+ break;
+ }
+ default: {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return PrintMessageProto.internal_static_Printer_TestPrinter_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return PrintMessageProto.internal_static_Printer_TestPrinter_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ PrintMessageProto.Printer.TestPrinter.class, PrintMessageProto.Printer.TestPrinter.Builder.class);
+ }
+
+ public static final int TITLE_FIELD_NUMBER = 1;
+ private volatile java.lang.Object title_;
+ /**
+ * string title = 1;
+ * @return The title.
+ */
+ @java.lang.Override
+ public java.lang.String getTitle() {
+ java.lang.Object ref = title_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ title_ = s;
+ return s;
+ }
+ }
+ /**
+ * string title = 1;
+ * @return The bytes for title.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString
+ getTitleBytes() {
+ java.lang.Object ref = title_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ title_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int TEXT_FIELD_NUMBER = 2;
+ private volatile java.lang.Object text_;
+ /**
+ * string text = 2;
+ * @return The text.
+ */
+ @java.lang.Override
+ public java.lang.String getText() {
+ java.lang.Object ref = text_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ text_ = s;
+ return s;
+ }
+ }
+ /**
+ * string text = 2;
+ * @return The bytes for text.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString
+ getTextBytes() {
+ java.lang.Object ref = text_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ text_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, title_);
+ }
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 2, text_);
+ }
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, title_);
+ }
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, text_);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof PrintMessageProto.Printer.TestPrinter)) {
+ return super.equals(obj);
+ }
+ PrintMessageProto.Printer.TestPrinter other = (PrintMessageProto.Printer.TestPrinter) obj;
+
+ if (!getTitle()
+ .equals(other.getTitle())) return false;
+ if (!getText()
+ .equals(other.getText())) return false;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + TITLE_FIELD_NUMBER;
+ hash = (53 * hash) + getTitle().hashCode();
+ hash = (37 * hash) + TEXT_FIELD_NUMBER;
+ hash = (53 * hash) + getText().hashCode();
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static PrintMessageProto.Printer.TestPrinter parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(PrintMessageProto.Printer.TestPrinter prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code Printer.TestPrinter}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:Printer.TestPrinter)
+ PrintMessageProto.Printer.TestPrinterOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return PrintMessageProto.internal_static_Printer_TestPrinter_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return PrintMessageProto.internal_static_Printer_TestPrinter_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ PrintMessageProto.Printer.TestPrinter.class, PrintMessageProto.Printer.TestPrinter.Builder.class);
+ }
+
+ // Construct using PrintMessageProto.Printer.TestPrinter.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ title_ = "";
+
+ text_ = "";
+
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return PrintMessageProto.internal_static_Printer_TestPrinter_descriptor;
+ }
+
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinter getDefaultInstanceForType() {
+ return PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinter build() {
+ PrintMessageProto.Printer.TestPrinter result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinter buildPartial() {
+ PrintMessageProto.Printer.TestPrinter result = new PrintMessageProto.Printer.TestPrinter(this);
+ result.title_ = title_;
+ result.text_ = text_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof PrintMessageProto.Printer.TestPrinter) {
+ return mergeFrom((PrintMessageProto.Printer.TestPrinter)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(PrintMessageProto.Printer.TestPrinter other) {
+ if (other == PrintMessageProto.Printer.TestPrinter.getDefaultInstance()) return this;
+ if (!other.getTitle().isEmpty()) {
+ title_ = other.title_;
+ onChanged();
+ }
+ if (!other.getText().isEmpty()) {
+ text_ = other.text_;
+ onChanged();
+ }
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ PrintMessageProto.Printer.TestPrinter parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (PrintMessageProto.Printer.TestPrinter) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+
+ private java.lang.Object title_ = "";
+ /**
+ * string title = 1;
+ * @return The title.
+ */
+ public java.lang.String getTitle() {
+ java.lang.Object ref = title_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ title_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string title = 1;
+ * @return The bytes for title.
+ */
+ public com.google.protobuf.ByteString
+ getTitleBytes() {
+ java.lang.Object ref = title_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ title_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string title = 1;
+ * @param value The title to set.
+ * @return This builder for chaining.
+ */
+ public Builder setTitle(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ title_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string title = 1;
+ * @return This builder for chaining.
+ */
+ public Builder clearTitle() {
+
+ title_ = getDefaultInstance().getTitle();
+ onChanged();
+ return this;
+ }
+ /**
+ * string title = 1;
+ * @param value The bytes for title to set.
+ * @return This builder for chaining.
+ */
+ public Builder setTitleBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ title_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object text_ = "";
+ /**
+ * string text = 2;
+ * @return The text.
+ */
+ public java.lang.String getText() {
+ java.lang.Object ref = text_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ text_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string text = 2;
+ * @return The bytes for text.
+ */
+ public com.google.protobuf.ByteString
+ getTextBytes() {
+ java.lang.Object ref = text_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ text_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string text = 2;
+ * @param value The text to set.
+ * @return This builder for chaining.
+ */
+ public Builder setText(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ text_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string text = 2;
+ * @return This builder for chaining.
+ */
+ public Builder clearText() {
+
+ text_ = getDefaultInstance().getText();
+ onChanged();
+ return this;
+ }
+ /**
+ * string text = 2;
+ * @param value The bytes for text to set.
+ * @return This builder for chaining.
+ */
+ public Builder setTextBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ text_ = value;
+ onChanged();
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:Printer.TestPrinter)
+ }
+
+ // @@protoc_insertion_point(class_scope:Printer.TestPrinter)
+ private static final PrintMessageProto.Printer.TestPrinter DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new PrintMessageProto.Printer.TestPrinter();
+ }
+
+ public static PrintMessageProto.Printer.TestPrinter getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public TestPrinter parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new TestPrinter(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinter getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
public interface PrintInfoOrBuilder extends
// @@protoc_insertion_point(interface_extends:Printer.PrintInfo)
com.google.protobuf.MessageOrBuilder {
@@ -13089,6 +13848,7 @@ public final class PrintMessageProto {
WAREHOUSEAREA(10),
EQUIPMENT(11),
WORKSTATION(12),
+ TESTPRINTER(13),
DATABODY_NOT_SET(0);
private final int value;
private DataBodyCase(int value) {
@@ -13117,6 +13877,7 @@ public final class PrintMessageProto {
case 10: return WAREHOUSEAREA;
case 11: return EQUIPMENT;
case 12: return WORKSTATION;
+ case 13: return TESTPRINTER;
case 0: return DATABODY_NOT_SET;
default: return null;
}
@@ -13526,6 +14287,37 @@ public final class PrintMessageProto {
return PrintMessageProto.Printer.Workstation.getDefaultInstance();
}
+ public static final int TESTPRINTER_FIELD_NUMBER = 13;
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ * @return Whether the testPrinter field is set.
+ */
+ @java.lang.Override
+ public boolean hasTestPrinter() {
+ return dataBodyCase_ == 13;
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ * @return The testPrinter.
+ */
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinter getTestPrinter() {
+ if (dataBodyCase_ == 13) {
+ return (PrintMessageProto.Printer.TestPrinter) dataBody_;
+ }
+ return PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinterOrBuilder getTestPrinterOrBuilder() {
+ if (dataBodyCase_ == 13) {
+ return (PrintMessageProto.Printer.TestPrinter) dataBody_;
+ }
+ return PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -13576,6 +14368,9 @@ public final class PrintMessageProto {
if (dataBodyCase_ == 12) {
output.writeMessage(12, (PrintMessageProto.Printer.Workstation) dataBody_);
}
+ if (dataBodyCase_ == 13) {
+ output.writeMessage(13, (PrintMessageProto.Printer.TestPrinter) dataBody_);
+ }
if (printInfo_ != null) {
output.writeMessage(14, getPrintInfo());
}
@@ -13636,6 +14431,10 @@ public final class PrintMessageProto {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, (PrintMessageProto.Printer.Workstation) dataBody_);
}
+ if (dataBodyCase_ == 13) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(13, (PrintMessageProto.Printer.TestPrinter) dataBody_);
+ }
if (printInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, getPrintInfo());
@@ -13707,6 +14506,10 @@ public final class PrintMessageProto {
if (!getWorkstation()
.equals(other.getWorkstation())) return false;
break;
+ case 13:
+ if (!getTestPrinter()
+ .equals(other.getTestPrinter())) return false;
+ break;
case 0:
default:
}
@@ -13772,6 +14575,10 @@ public final class PrintMessageProto {
hash = (37 * hash) + WORKSTATION_FIELD_NUMBER;
hash = (53 * hash) + getWorkstation().hashCode();
break;
+ case 13:
+ hash = (37 * hash) + TESTPRINTER_FIELD_NUMBER;
+ hash = (53 * hash) + getTestPrinter().hashCode();
+ break;
case 0:
default:
}
@@ -14027,6 +14834,13 @@ public final class PrintMessageProto {
result.dataBody_ = workstationBuilder_.build();
}
}
+ if (dataBodyCase_ == 13) {
+ if (testPrinterBuilder_ == null) {
+ result.dataBody_ = dataBody_;
+ } else {
+ result.dataBody_ = testPrinterBuilder_.build();
+ }
+ }
result.dataBodyCase_ = dataBodyCase_;
onBuilt();
return result;
@@ -14127,6 +14941,10 @@ public final class PrintMessageProto {
mergeWorkstation(other.getWorkstation());
break;
}
+ case TESTPRINTER: {
+ mergeTestPrinter(other.getTestPrinter());
+ break;
+ }
case DATABODY_NOT_SET: {
break;
}
@@ -15929,6 +16747,148 @@ public final class PrintMessageProto {
onChanged();;
return workstationBuilder_;
}
+
+ private com.google.protobuf.SingleFieldBuilderV3<
+ PrintMessageProto.Printer.TestPrinter, PrintMessageProto.Printer.TestPrinter.Builder, PrintMessageProto.Printer.TestPrinterOrBuilder> testPrinterBuilder_;
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ * @return Whether the testPrinter field is set.
+ */
+ @java.lang.Override
+ public boolean hasTestPrinter() {
+ return dataBodyCase_ == 13;
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ * @return The testPrinter.
+ */
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinter getTestPrinter() {
+ if (testPrinterBuilder_ == null) {
+ if (dataBodyCase_ == 13) {
+ return (PrintMessageProto.Printer.TestPrinter) dataBody_;
+ }
+ return PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ } else {
+ if (dataBodyCase_ == 13) {
+ return testPrinterBuilder_.getMessage();
+ }
+ return PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ }
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ public Builder setTestPrinter(PrintMessageProto.Printer.TestPrinter value) {
+ if (testPrinterBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ dataBody_ = value;
+ onChanged();
+ } else {
+ testPrinterBuilder_.setMessage(value);
+ }
+ dataBodyCase_ = 13;
+ return this;
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ public Builder setTestPrinter(
+ PrintMessageProto.Printer.TestPrinter.Builder builderForValue) {
+ if (testPrinterBuilder_ == null) {
+ dataBody_ = builderForValue.build();
+ onChanged();
+ } else {
+ testPrinterBuilder_.setMessage(builderForValue.build());
+ }
+ dataBodyCase_ = 13;
+ return this;
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ public Builder mergeTestPrinter(PrintMessageProto.Printer.TestPrinter value) {
+ if (testPrinterBuilder_ == null) {
+ if (dataBodyCase_ == 13 &&
+ dataBody_ != PrintMessageProto.Printer.TestPrinter.getDefaultInstance()) {
+ dataBody_ = PrintMessageProto.Printer.TestPrinter.newBuilder((PrintMessageProto.Printer.TestPrinter) dataBody_)
+ .mergeFrom(value).buildPartial();
+ } else {
+ dataBody_ = value;
+ }
+ onChanged();
+ } else {
+ if (dataBodyCase_ == 13) {
+ testPrinterBuilder_.mergeFrom(value);
+ } else {
+ testPrinterBuilder_.setMessage(value);
+ }
+ }
+ dataBodyCase_ = 13;
+ return this;
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ public Builder clearTestPrinter() {
+ if (testPrinterBuilder_ == null) {
+ if (dataBodyCase_ == 13) {
+ dataBodyCase_ = 0;
+ dataBody_ = null;
+ onChanged();
+ }
+ } else {
+ if (dataBodyCase_ == 13) {
+ dataBodyCase_ = 0;
+ dataBody_ = null;
+ }
+ testPrinterBuilder_.clear();
+ }
+ return this;
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ public PrintMessageProto.Printer.TestPrinter.Builder getTestPrinterBuilder() {
+ return getTestPrinterFieldBuilder().getBuilder();
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ @java.lang.Override
+ public PrintMessageProto.Printer.TestPrinterOrBuilder getTestPrinterOrBuilder() {
+ if ((dataBodyCase_ == 13) && (testPrinterBuilder_ != null)) {
+ return testPrinterBuilder_.getMessageOrBuilder();
+ } else {
+ if (dataBodyCase_ == 13) {
+ return (PrintMessageProto.Printer.TestPrinter) dataBody_;
+ }
+ return PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ }
+ }
+ /**
+ * .Printer.TestPrinter testPrinter = 13;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ PrintMessageProto.Printer.TestPrinter, PrintMessageProto.Printer.TestPrinter.Builder, PrintMessageProto.Printer.TestPrinterOrBuilder>
+ getTestPrinterFieldBuilder() {
+ if (testPrinterBuilder_ == null) {
+ if (!(dataBodyCase_ == 13)) {
+ dataBody_ = PrintMessageProto.Printer.TestPrinter.getDefaultInstance();
+ }
+ testPrinterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ PrintMessageProto.Printer.TestPrinter, PrintMessageProto.Printer.TestPrinter.Builder, PrintMessageProto.Printer.TestPrinterOrBuilder>(
+ (PrintMessageProto.Printer.TestPrinter) dataBody_,
+ getParentForChildren(),
+ isClean());
+ dataBody_ = null;
+ }
+ dataBodyCase_ = 13;
+ onChanged();;
+ return testPrinterBuilder_;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -16042,6 +17002,11 @@ public final class PrintMessageProto {
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_Printer_Workstation_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_Printer_TestPrinter_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_Printer_TestPrinter_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_Printer_PrintInfo_descriptor;
private static final
@@ -16056,7 +17021,7 @@ public final class PrintMessageProto {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\027PrintMessageProto.proto\"\372\020\n\007Printer\022$\n" +
+ "\n\027PrintMessageProto.proto\"\345\021\n\007Printer\022$\n" +
"\tdata_type\030\001 \001(\0162\021.Printer.DataType\022%\n\tp" +
"rintInfo\030\016 \001(\0132\022.Printer.PrintInfo\0223\n\017iq" +
"cPrintMessage\030\002 \001(\0132\030.Printer.IQCPrintMe" +
@@ -16073,45 +17038,47 @@ public final class PrintMessageProto {
"\rwarehouseArea\030\n \001(\0132\026.Printer.Warehouse" +
"AreaH\000\022\'\n\tequipment\030\013 \001(\0132\022.Printer.Equi" +
"pmentH\000\022+\n\013workstation\030\014 \001(\0132\024.Printer.W" +
- "orkstationH\000\032^\n\017IQCPrintMessage\022\022\n\nsampl" +
- "eCode\030\001 \001(\t\022\020\n\010qcObject\030\002 \001(\t\022\022\n\nsampleT" +
- "ime\030\003 \001(\t\022\021\n\tbatchCode\030\004 \001(\t\032c\n\017PQCPrint" +
- "Message\022\022\n\nsampleCode\030\001 \001(\t\022\020\n\010qcObject\030" +
- "\002 \001(\t\022\022\n\nsampleTime\030\003 \001(\t\022\026\n\016sampleLocat" +
- "ion\030\004 \001(\t\032s\n\017OQCPrintMessage\022\022\n\nsampleCo" +
- "de\030\001 \001(\t\022\020\n\010qcObject\030\002 \001(\t\022\022\n\nsampleTime" +
- "\030\003 \001(\t\022\021\n\tbatchCode\030\004 \001(\t\022\023\n\013packageType" +
- "\030\005 \001(\t\032C\n\026PrintClientInfoMessage\022\n\n\002ip\030\001" +
- " \001(\t\022\020\n\010location\030\002 \001(\t\022\013\n\003sid\030\003 \001(\t\032\247\001\n\025" +
- "PrintingOfCirculation\022\027\n\017workOrderNumber" +
- "\030\001 \001(\t\022\024\n\014materialCode\030\002 \001(\t\022\024\n\014material" +
- "Name\030\003 \001(\t\022\035\n\025specificationAndModel\030\004 \001(" +
- "\t\022\033\n\023processingProcedure\030\005 \001(\t\022\r\n\005param\030" +
- "\006 \001(\t\032l\n\020MaterialProducts\022\024\n\014materialCod" +
- "e\030\001 \001(\t\022\024\n\014materialName\030\002 \001(\t\022\035\n\025specifi" +
- "cationAndModel\030\003 \001(\t\022\r\n\005param\030\004 \001(\t\032`\n\tW" +
- "arehouse\022\025\n\rwarehouseCode\030\001 \001(\t\022\025\n\rwareh" +
- "ouseName\030\002 \001(\t\022\026\n\016personInCharge\030\003 \001(\t\022\r" +
- "\n\005param\030\004 \001(\t\032r\n\021WarehouseLocation\022\035\n\025wa" +
- "rehouseLocationCode\030\001 \001(\t\022\035\n\025warehouseLo" +
- "cationName\030\002 \001(\t\022\020\n\010position\030\003 \001(\t\022\r\n\005pa" +
- "ram\030\004 \001(\t\032T\n\rWarehouseArea\022\031\n\021warehouseA" +
- "reaCode\030\001 \001(\t\022\031\n\021warehouseAreaName\030\002 \001(\t" +
- "\022\r\n\005param\030\003 \001(\t\032g\n\tEquipment\022\025\n\requipmen" +
- "tCode\030\001 \001(\t\022\025\n\requipmentName\030\002 \001(\t\022\035\n\025sp" +
+ "orkstationH\000\022+\n\013testPrinter\030\r \001(\0132\024.Prin" +
+ "ter.TestPrinterH\000\032^\n\017IQCPrintMessage\022\022\n\n" +
+ "sampleCode\030\001 \001(\t\022\020\n\010qcObject\030\002 \001(\t\022\022\n\nsa" +
+ "mpleTime\030\003 \001(\t\022\021\n\tbatchCode\030\004 \001(\t\032c\n\017PQC" +
+ "PrintMessage\022\022\n\nsampleCode\030\001 \001(\t\022\020\n\010qcOb" +
+ "ject\030\002 \001(\t\022\022\n\nsampleTime\030\003 \001(\t\022\026\n\016sample" +
+ "Location\030\004 \001(\t\032s\n\017OQCPrintMessage\022\022\n\nsam" +
+ "pleCode\030\001 \001(\t\022\020\n\010qcObject\030\002 \001(\t\022\022\n\nsampl" +
+ "eTime\030\003 \001(\t\022\021\n\tbatchCode\030\004 \001(\t\022\023\n\013packag" +
+ "eType\030\005 \001(\t\032C\n\026PrintClientInfoMessage\022\n\n" +
+ "\002ip\030\001 \001(\t\022\020\n\010location\030\002 \001(\t\022\013\n\003sid\030\003 \001(\t" +
+ "\032\247\001\n\025PrintingOfCirculation\022\027\n\017workOrderN" +
+ "umber\030\001 \001(\t\022\024\n\014materialCode\030\002 \001(\t\022\024\n\014mat" +
+ "erialName\030\003 \001(\t\022\035\n\025specificationAndModel" +
+ "\030\004 \001(\t\022\033\n\023processingProcedure\030\005 \001(\t\022\r\n\005p" +
+ "aram\030\006 \001(\t\032l\n\020MaterialProducts\022\024\n\014materi" +
+ "alCode\030\001 \001(\t\022\024\n\014materialName\030\002 \001(\t\022\035\n\025sp" +
"ecificationAndModel\030\003 \001(\t\022\r\n\005param\030\004 \001(\t" +
- "\032h\n\013Workstation\022\027\n\017workstationCode\030\001 \001(\t" +
- "\022\027\n\017workstationName\030\002 \001(\t\022\030\n\020belongingPr" +
- "ocess\030\003 \001(\t\022\r\n\005param\030\004 \001(\t\032A\n\tPrintInfo\022" +
- "\n\n\002ip\030\001 \001(\t\022\014\n\004code\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022" +
- "\014\n\004port\030\004 \001(\t\"\372\001\n\010DataType\022\024\n\020IQC_PrintM" +
- "essage\020\000\022\024\n\020PQC_PrintMessage\020\001\022\024\n\020OQC_Pr" +
- "intMessage\020\002\022\033\n\027Print_ClientInfoMessage\020" +
- "\003\022\032\n\026Printing_OfCirculation\020\004\022\025\n\021Materia" +
- "l_Products\020\005\022\016\n\nWarehouse_\020\006\022\026\n\022Warehous" +
- "e_Location\020\007\022\022\n\016Warehouse_Area\020\010\022\016\n\nEqui" +
- "pment_\020\t\022\020\n\014Workstation_\020\nB\n\n\010dataBodyb\006" +
- "proto3"
+ "\032`\n\tWarehouse\022\025\n\rwarehouseCode\030\001 \001(\t\022\025\n\r" +
+ "warehouseName\030\002 \001(\t\022\026\n\016personInCharge\030\003 " +
+ "\001(\t\022\r\n\005param\030\004 \001(\t\032r\n\021WarehouseLocation\022" +
+ "\035\n\025warehouseLocationCode\030\001 \001(\t\022\035\n\025wareho" +
+ "useLocationName\030\002 \001(\t\022\020\n\010position\030\003 \001(\t\022" +
+ "\r\n\005param\030\004 \001(\t\032T\n\rWarehouseArea\022\031\n\021wareh" +
+ "ouseAreaCode\030\001 \001(\t\022\031\n\021warehouseAreaName\030" +
+ "\002 \001(\t\022\r\n\005param\030\003 \001(\t\032g\n\tEquipment\022\025\n\requ" +
+ "ipmentCode\030\001 \001(\t\022\025\n\requipmentName\030\002 \001(\t\022" +
+ "\035\n\025specificationAndModel\030\003 \001(\t\022\r\n\005param\030" +
+ "\004 \001(\t\032h\n\013Workstation\022\027\n\017workstationCode\030" +
+ "\001 \001(\t\022\027\n\017workstationName\030\002 \001(\t\022\030\n\020belong" +
+ "ingProcess\030\003 \001(\t\022\r\n\005param\030\004 \001(\t\032*\n\013TestP" +
+ "rinter\022\r\n\005title\030\001 \001(\t\022\014\n\004text\030\002 \001(\t\032A\n\tP" +
+ "rintInfo\022\n\n\002ip\030\001 \001(\t\022\014\n\004code\030\002 \001(\t\022\014\n\004na" +
+ "me\030\003 \001(\t\022\014\n\004port\030\004 \001(\t\"\214\002\n\010DataType\022\024\n\020I" +
+ "QC_PrintMessage\020\000\022\024\n\020PQC_PrintMessage\020\001\022" +
+ "\024\n\020OQC_PrintMessage\020\002\022\033\n\027Print_ClientInf" +
+ "oMessage\020\003\022\032\n\026Printing_OfCirculation\020\004\022\025" +
+ "\n\021Material_Products\020\005\022\016\n\nWarehouse_\020\006\022\026\n" +
+ "\022Warehouse_Location\020\007\022\022\n\016Warehouse_Area\020" +
+ "\010\022\016\n\nEquipment_\020\t\022\020\n\014Workstation_\020\n\022\020\n\014T" +
+ "estPrinter_\020\013B\n\n\010dataBodyb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -16122,7 +17089,7 @@ public final class PrintMessageProto {
internal_static_Printer_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_Printer_descriptor,
- new java.lang.String[] { "DataType", "PrintInfo", "IqcPrintMessage", "PqcPrintMessage", "OqPrintMessage", "PrintClientInfoMessage", "PrintingOfCirculation", "MaterialProducts", "Warehouse", "WarehouseLocation", "WarehouseArea", "Equipment", "Workstation", "DataBody", });
+ new java.lang.String[] { "DataType", "PrintInfo", "IqcPrintMessage", "PqcPrintMessage", "OqPrintMessage", "PrintClientInfoMessage", "PrintingOfCirculation", "MaterialProducts", "Warehouse", "WarehouseLocation", "WarehouseArea", "Equipment", "Workstation", "TestPrinter", "DataBody", });
internal_static_Printer_IQCPrintMessage_descriptor =
internal_static_Printer_descriptor.getNestedTypes().get(0);
internal_static_Printer_IQCPrintMessage_fieldAccessorTable = new
@@ -16189,8 +17156,14 @@ public final class PrintMessageProto {
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_Printer_Workstation_descriptor,
new java.lang.String[] { "WorkstationCode", "WorkstationName", "BelongingProcess", "Param", });
- internal_static_Printer_PrintInfo_descriptor =
+ internal_static_Printer_TestPrinter_descriptor =
internal_static_Printer_descriptor.getNestedTypes().get(11);
+ internal_static_Printer_TestPrinter_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_Printer_TestPrinter_descriptor,
+ new java.lang.String[] { "Title", "Text", });
+ internal_static_Printer_PrintInfo_descriptor =
+ internal_static_Printer_descriptor.getNestedTypes().get(12);
internal_static_Printer_PrintInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_Printer_PrintInfo_descriptor,
diff --git a/ktg-print/src/main/java/com/ktg/print/protocol/proto/PrintMessageProto.proto b/ktg-print/src/main/java/com/ktg/print/protocol/proto/PrintMessageProto.proto
index 3d194d4..ad20f65 100644
--- a/ktg-print/src/main/java/com/ktg/print/protocol/proto/PrintMessageProto.proto
+++ b/ktg-print/src/main/java/com/ktg/print/protocol/proto/PrintMessageProto.proto
@@ -20,6 +20,7 @@ message Printer{
Warehouse_Area=8;
Equipment_=9;
Workstation_=10;
+ TestPrinter_=11;
}
//用data_type来识别哪个枚举类型(DataType是People的第一个属性，属性名是data_type)
@@ -38,6 +39,7 @@ message Printer{
WarehouseArea warehouseArea = 10;
Equipment equipment = 11;
Workstation workstation = 12;
+ TestPrinter testPrinter = 13;
}
message IQCPrintMessage {
@@ -113,6 +115,10 @@ message Printer{
string belongingProcess = 3;
string param = 4;
}
+ message TestPrinter{
+ string title = 1;
+ string text = 2;
+ }
//打印机信息
message PrintInfo {
diff --git a/ktg-print/src/main/java/com/ktg/print/service/impl/PrintServiceImpl.java b/ktg-print/src/main/java/com/ktg/print/service/impl/PrintServiceImpl.java
index 7fd87db..506e837 100644
--- a/ktg-print/src/main/java/com/ktg/print/service/impl/PrintServiceImpl.java
+++ b/ktg-print/src/main/java/com/ktg/print/service/impl/PrintServiceImpl.java
@@ -387,6 +387,15 @@ public class PrintServiceImpl implements IPrintService {
// 构造对应的消息对象
// msg = PrintMessageProto.Printer.newBuilder().setIqcPrintMessage(iQCPrintMessage).setDataType(dataType).setPrintInfo(printClientInfoMessage).build();
break;
+ case UserConstants.TEST_TYPE_PRINTER:
+ // 测试模板
+ //封装模板数据
+ String title =params.get("title");
+ String text =params.get("text");
+ PrintMessageProto.Printer.TestPrinter testPrinter = PrintMessageProto.Printer.TestPrinter.newBuilder().setTitle(title).setText(text).build();
+ // 构造对应的消息对象
+ msg = PrintMessageProto.Printer.newBuilder().setTestPrinter(testPrinter).setDataType(dataType).setPrintInfo(printInfo).build();
+ break;
default:
result.put("data","打印机不支持当前模板：" + "(" + businessType + ")");
return result;