From 97117fd9c18e1f1032e1b8b92ddab55d3e320d3a Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期日, 07 四月 2024 21:30:57 +0800 Subject: [PATCH] update --- wms/product_inventory_protomsg/product_inventory_grpc.pb.go | 2 +- wms/product_inventory_protomsg/product_inventory.pb.go | 35 ++++++++++++++++++----------------- wms/product_inventory_protomsg/product_inventory.proto | 2 +- wms/common_protomsg/common.proto | 2 +- wms/common_protomsg/common.pb.go | 9 +++++---- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/wms/common/common.pb.go b/wms/common_protomsg/common.pb.go similarity index 95% rename from wms/common/common.pb.go rename to wms/common_protomsg/common.pb.go index 31e84e1..d2041dc 100644 --- a/wms/common/common.pb.go +++ b/wms/common_protomsg/common.pb.go @@ -4,7 +4,7 @@ // protoc v3.19.0 // source: wms/common/common.proto -package common +package common_protomsg import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -100,10 +100,11 @@ 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4f, 0x75, 0x74, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x69, 0x6e, 0x67, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0x05, 0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, - 0x61, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x10, 0x06, 0x42, 0x27, 0x5a, - 0x25, 0x62, 0x61, 0x73, 0x69, 0x63, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x73, 0x2f, 0x70, + 0x61, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x10, 0x06, 0x42, 0x30, 0x5a, + 0x2e, 0x62, 0x61, 0x73, 0x69, 0x63, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x6d, 0x73, 0x67, 0x2e, 0x67, 0x69, 0x74, 0x2f, 0x77, 0x6d, 0x73, 0x2f, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x6d, 0x73, 0x67, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/wms/common/common.proto b/wms/common_protomsg/common.proto similarity index 85% rename from wms/common/common.proto rename to wms/common_protomsg/common.proto index 6ef2217..c65d312 100644 --- a/wms/common/common.proto +++ b/wms/common_protomsg/common.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "basic.com/aps/protomsg.git/wms/common"; +option go_package = "basic.com/aps/protomsg.git/wms/common_protomsg"; enum OperationSource { OperationSourceEmpty = 0; //绌� diff --git a/wms/product_inventory/product_inventory.pb.go b/wms/product_inventory_protomsg/product_inventory.pb.go similarity index 96% rename from wms/product_inventory/product_inventory.pb.go rename to wms/product_inventory_protomsg/product_inventory.pb.go index fa62a61..a10000c 100644 --- a/wms/product_inventory/product_inventory.pb.go +++ b/wms/product_inventory_protomsg/product_inventory.pb.go @@ -4,10 +4,10 @@ // protoc v3.19.0 // source: wms/product_inventory/product_inventory.proto -package product_inventory +package product_inventory_protomsg import ( - common "basic.com/aps/protomsg.git/wms/common" + common_protomsg "basic.com/aps/protomsg.git/wms/common_protomsg" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -72,16 +72,16 @@ sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Number string `protobuf:"bytes,1,opt,name=Number,proto3" json:"Number,omitempty"` //鏄庣粏鍗曠紪鐮� - Addressee string `protobuf:"bytes,2,opt,name=Addressee,proto3" json:"Addressee,omitempty"` //鏀惰揣浜� - Address string `protobuf:"bytes,3,opt,name=Address,proto3" json:"Address,omitempty"` //鏀惰揣鍦板潃 - Phone string `protobuf:"bytes,4,opt,name=Phone,proto3" json:"Phone,omitempty"` - DeliverType int32 `protobuf:"varint,5,opt,name=DeliverType,proto3" json:"DeliverType,omitempty"` //浜や粯绫诲瀷 - Source string `protobuf:"bytes,6,opt,name=Source,proto3" json:"Source,omitempty"` - ClientId int64 `protobuf:"varint,7,opt,name=ClientId,proto3" json:"ClientId,omitempty"` - ClientName string `protobuf:"bytes,8,opt,name=ClientName,proto3" json:"ClientName,omitempty"` - ProductList []*InventoryProduct `protobuf:"bytes,9,rep,name=ProductList,proto3" json:"ProductList,omitempty"` - OperationSource common.OperationSource `protobuf:"varint,10,opt,name=OperationSource,proto3,enum=OperationSource" json:"OperationSource,omitempty"` + Number string `protobuf:"bytes,1,opt,name=Number,proto3" json:"Number,omitempty"` //鏄庣粏鍗曠紪鐮� + Addressee string `protobuf:"bytes,2,opt,name=Addressee,proto3" json:"Addressee,omitempty"` //鏀惰揣浜� + Address string `protobuf:"bytes,3,opt,name=Address,proto3" json:"Address,omitempty"` //鏀惰揣鍦板潃 + Phone string `protobuf:"bytes,4,opt,name=Phone,proto3" json:"Phone,omitempty"` + DeliverType int32 `protobuf:"varint,5,opt,name=DeliverType,proto3" json:"DeliverType,omitempty"` //浜や粯绫诲瀷 + Source string `protobuf:"bytes,6,opt,name=Source,proto3" json:"Source,omitempty"` + ClientId int64 `protobuf:"varint,7,opt,name=ClientId,proto3" json:"ClientId,omitempty"` + ClientName string `protobuf:"bytes,8,opt,name=ClientName,proto3" json:"ClientName,omitempty"` + ProductList []*InventoryProduct `protobuf:"bytes,9,rep,name=ProductList,proto3" json:"ProductList,omitempty"` + OperationSource common_protomsg.OperationSource `protobuf:"varint,10,opt,name=OperationSource,proto3,enum=OperationSource" json:"OperationSource,omitempty"` } func (x *CreateOperationRequest) Reset() { @@ -179,11 +179,11 @@ return nil } -func (x *CreateOperationRequest) GetOperationSource() common.OperationSource { +func (x *CreateOperationRequest) GetOperationSource() common_protomsg.OperationSource { if x != nil { return x.OperationSource } - return common.OperationSource(0) + return common_protomsg.OperationSource(0) } type InventoryProduct struct { @@ -1373,10 +1373,11 @@ 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x42, 0x32, 0x5a, 0x30, 0x62, 0x61, 0x73, 0x69, 0x63, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x22, 0x00, 0x42, 0x3b, 0x5a, 0x39, 0x62, 0x61, 0x73, 0x69, 0x63, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x6d, 0x73, 0x67, 0x2e, 0x67, 0x69, 0x74, 0x2f, 0x77, 0x6d, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x5f, 0x69, 0x6e, 0x76, - 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x6d, 0x73, 0x67, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1411,7 +1412,7 @@ (*OrderProductOutputResponse)(nil), // 14: OrderProductOutputResponse (*GetOutputOperationInfoRequest)(nil), // 15: GetOutputOperationInfoRequest (*GetOutputOperationInfoResponse)(nil), // 16: GetOutputOperationInfoResponse - (common.OperationSource)(0), // 17: OperationSource + (common_protomsg.OperationSource)(0), // 17: OperationSource } var file_wms_product_inventory_product_inventory_proto_depIdxs = []int32{ 2, // 0: CreateOperationRequest.ProductList:type_name -> InventoryProduct diff --git a/wms/product_inventory/product_inventory.proto b/wms/product_inventory_protomsg/product_inventory.proto similarity index 99% rename from wms/product_inventory/product_inventory.proto rename to wms/product_inventory_protomsg/product_inventory.proto index a5ffcfe..13de747 100644 --- a/wms/product_inventory/product_inventory.proto +++ b/wms/product_inventory_protomsg/product_inventory.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "wms/common/common.proto"; -option go_package = "basic.com/aps/protomsg.git/wms/product_inventory"; +option go_package = "basic.com/aps/protomsg.git/wms/product_inventory_protomsg"; diff --git a/wms/product_inventory/product_inventory_grpc.pb.go b/wms/product_inventory_protomsg/product_inventory_grpc.pb.go similarity index 99% rename from wms/product_inventory/product_inventory_grpc.pb.go rename to wms/product_inventory_protomsg/product_inventory_grpc.pb.go index 1ad46bb..20693a2 100644 --- a/wms/product_inventory/product_inventory_grpc.pb.go +++ b/wms/product_inventory_protomsg/product_inventory_grpc.pb.go @@ -4,7 +4,7 @@ // - protoc v3.19.0 // source: wms/product_inventory/product_inventory.proto -package product_inventory +package product_inventory_protomsg import ( context "context" -- Gitblit v1.8.0