From d384930963f9b960a06864223aff779edc4cf54c Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期日, 07 四月 2024 19:26:25 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm --- proto/crm_aps/server.go | 1 proto/product_inventory/product_inventory.pb.go | 277 +++++++++++++++++++++++++++++---------- proto/product_inventory/product_inventory_grpc.pb.go | 68 ++++++--- api/v1/product.go | 21 +++ model/response/salesDetails.go | 2 proto/product_inventory.proto | 11 + 6 files changed, 287 insertions(+), 93 deletions(-) diff --git a/api/v1/product.go b/api/v1/product.go index a61ea18..c3aeedd 100644 --- a/api/v1/product.go +++ b/api/v1/product.go @@ -9,9 +9,11 @@ "aps_crm/pkg/ecode" "aps_crm/pkg/logx" "aps_crm/proto/product" + "aps_crm/proto/product_inventory" "github.com/gin-gonic/gin" "github.com/shopspring/decimal" "github.com/spf13/cast" + "strconv" ) type ProductApi struct{} @@ -164,6 +166,7 @@ productInfo := make([]response.SalesDetailsProductInfo, 0) amountMap := make(map[string]int64) overMap := make(map[string]int64) + outputMap := make(map[string]int) for _, p := range first.Products { amountMap[p.Number] = 0 overMap[p.Number] = 0 @@ -187,6 +190,18 @@ logx.Errorf("grpc GetProductOrder err: %v", err.Error()) ctx.FailWithMsg(ecode.UnknownErr, "鍐呴儴閿欒") return + } + //鏌ヨ鍙戣揣淇℃伅 + cl := product_inventory.NewProductInventoryServiceClient(grpc_init.ProductInventoryServiceConn) + operationInfo, err := cl.GetOutputOperationInfo(ctx.GetCtx(), &product_inventory.GetOutputOperationInfoRequest{Number: number}) + if err != nil { + logx.Errorf("grpc GetOutputOperationInfo err: %v", err.Error()) + ctx.FailWithMsg(ecode.UnknownErr, "鍐呴儴閿欒") + return + } + for _, outputProduct := range operationInfo.Products { + amount, _ := strconv.Atoi(outputProduct.Amount) + outputMap[outputProduct.Number] = amount } var result response.Info //鍒堕�犱俊鎭� @@ -278,6 +293,12 @@ productInfo[i].FinishAmount = productInfo[i].FinishAmount + overMap[productInfo[i].ProductId] overMap[productInfo[i].ProductId] = 0 } + + //鍙戣揣淇℃伅 + for i := 0; i < len(productInfo); i++ { + productInfo[i].DeliveryAmount = productInfo[i].DeliveryAmount + outputMap[productInfo[i].ProductId] + } + result.OutsourcingInfo = outsourcingList result.ProductInfo = productInfo ctx.OkWithDetailed(result) diff --git a/model/response/salesDetails.go b/model/response/salesDetails.go index 98e4d06..f30470c 100644 --- a/model/response/salesDetails.go +++ b/model/response/salesDetails.go @@ -120,7 +120,7 @@ Unit string `json:"unit"` //鍗曚綅 Amount decimal.Decimal `json:"amount"` //璁㈠崟鏁伴噺 FinishAmount int64 `json:"finishAmount"` //瀹屾垚鏁伴噺 - DeliveryAmount int64 `json:"deliveryAmount"` //鍙戣揣鏁伴噺 + DeliveryAmount int `json:"deliveryAmount"` //鍙戣揣鏁伴噺 PurchaseAmount int64 `json:"purchaseAmount"` //閲囪喘鏁伴噺 PurchaseFinishAmount int64 `json:"purchaseFinishAmount"` //閲囪喘瀹屾垚鏁伴噺 MakeAmount int64 `json:"makeAmount"` //鍒堕�犳暟閲� diff --git a/proto/crm_aps/server.go b/proto/crm_aps/server.go index c88b98e..4105d00 100644 --- a/proto/crm_aps/server.go +++ b/proto/crm_aps/server.go @@ -131,6 +131,7 @@ ProductTotal: total.IntPart(), ProjectId: req.ProjectId, Products: products, + DeliverType: int64(detail.DeliverType), }) if err != nil { //鐘舵�佽繕鍘� diff --git a/proto/product_inventory.proto b/proto/product_inventory.proto index 3a7ea9a..e16130f 100644 --- a/proto/product_inventory.proto +++ b/proto/product_inventory.proto @@ -8,6 +8,7 @@ rpc UpdateSalesDetailStatus(UpdateSalesDetailStatusRequest) returns (UpdateSalesDetailStatusResponse) {} rpc GetOrderInputAndOutputInfo(GetOrderInputAndOutputInfoRequest) returns (GetOrderInputAndOutputInfoResponse) {} rpc OrderProductOutput(OrderProductOutputRequest) returns (OrderProductOutputResponse) {} + rpc GetOutputOperationInfo(GetOutputOperationInfoRequest) returns (GetOutputOperationInfoResponse) {} } message CreateOperationRequest{ @@ -132,4 +133,14 @@ message OrderProductOutputResponse { int32 Code = 1; string Msg = 2; +} + +//------------------------------------------------------------------------------------------------ + +message GetOutputOperationInfoRequest{ + string Number = 1;//鏄庣粏鍗曠紪鐮� +} + +message GetOutputOperationInfoResponse{ + repeated OutputProduct Products= 1;//鍙戣揣鏄庣粏 } \ No newline at end of file diff --git a/proto/product_inventory/product_inventory.pb.go b/proto/product_inventory/product_inventory.pb.go index d43fa65..55999a8 100644 --- a/proto/product_inventory/product_inventory.pb.go +++ b/proto/product_inventory/product_inventory.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.19.0 +// protoc-gen-go v1.26.0 +// protoc v4.24.0 // source: product_inventory.proto package product_inventory @@ -1153,6 +1153,100 @@ return "" } +type GetOutputOperationInfoRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Number string `protobuf:"bytes,1,opt,name=Number,proto3" json:"Number,omitempty"` //鏄庣粏鍗曠紪鐮� +} + +func (x *GetOutputOperationInfoRequest) Reset() { + *x = GetOutputOperationInfoRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_product_inventory_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetOutputOperationInfoRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetOutputOperationInfoRequest) ProtoMessage() {} + +func (x *GetOutputOperationInfoRequest) ProtoReflect() protoreflect.Message { + mi := &file_product_inventory_proto_msgTypes[14] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetOutputOperationInfoRequest.ProtoReflect.Descriptor instead. +func (*GetOutputOperationInfoRequest) Descriptor() ([]byte, []int) { + return file_product_inventory_proto_rawDescGZIP(), []int{14} +} + +func (x *GetOutputOperationInfoRequest) GetNumber() string { + if x != nil { + return x.Number + } + return "" +} + +type GetOutputOperationInfoResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Products []*OutputProduct `protobuf:"bytes,1,rep,name=Products,proto3" json:"Products,omitempty"` //鍙戣揣鏄庣粏 +} + +func (x *GetOutputOperationInfoResponse) Reset() { + *x = GetOutputOperationInfoResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_product_inventory_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetOutputOperationInfoResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetOutputOperationInfoResponse) ProtoMessage() {} + +func (x *GetOutputOperationInfoResponse) ProtoReflect() protoreflect.Message { + mi := &file_product_inventory_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetOutputOperationInfoResponse.ProtoReflect.Descriptor instead. +func (*GetOutputOperationInfoResponse) Descriptor() ([]byte, []int) { + return file_product_inventory_proto_rawDescGZIP(), []int{15} +} + +func (x *GetOutputOperationInfoResponse) GetProducts() []*OutputProduct { + if x != nil { + return x.Products + } + return nil +} + var File_product_inventory_proto protoreflect.FileDescriptor var file_product_inventory_proto_rawDesc = []byte{ @@ -1289,57 +1383,71 @@ 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x2a, 0xf1, 0x01, 0x0a, 0x0f, 0x4f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, - 0x0a, 0x14, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x4f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x75, 0x72, 0x63, 0x68, - 0x61, 0x73, 0x65, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x10, 0x02, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4f, 0x75, 0x74, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x69, - 0x6e, 0x67, 0x10, 0x03, 0x12, 0x22, 0x0a, 0x1e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0x04, 0x12, 0x23, 0x0a, 0x1f, 0x4f, 0x70, 0x65, 0x72, - 0x61, 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, 0x2a, 0x25, - 0x0a, 0x0c, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x09, - 0x0a, 0x05, 0x52, 0x65, 0x61, 0x64, 0x79, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x10, 0x01, 0x32, 0xdb, 0x03, 0x0a, 0x17, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, - 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x46, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x17, 0x47, 0x65, 0x74, - 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, - 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, - 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x53, 0x61, 0x6c, 0x65, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x12, 0x1f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x61, 0x6c, - 0x65, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x61, - 0x6c, 0x65, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x67, 0x0a, 0x1a, 0x47, 0x65, 0x74, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x41, 0x6e, 0x64, 0x4f, 0x75, 0x74, - 0x70, 0x75, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x22, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x41, 0x6e, 0x64, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x47, 0x65, - 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x41, 0x6e, 0x64, 0x4f, 0x75, - 0x74, 0x70, 0x75, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x12, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x64, 0x75, - 0x63, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x1a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x64, - 0x75, 0x63, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x42, 0x15, 0x5a, 0x13, 0x2e, 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, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x37, 0x0a, 0x1d, 0x47, 0x65, + 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x4e, + 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4e, 0x75, 0x6d, + 0x62, 0x65, 0x72, 0x22, 0x4c, 0x0a, 0x1e, 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, 0x12, 0x2a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, + 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, + 0x73, 0x2a, 0xf1, 0x01, 0x0a, 0x0f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0x00, 0x12, + 0x1b, 0x0a, 0x17, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x50, 0x75, 0x72, 0x63, 0x68, 0x61, 0x73, 0x65, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, + 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, + 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x02, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4f, 0x75, + 0x74, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x69, 0x6e, 0x67, 0x10, 0x03, 0x12, 0x22, 0x0a, 0x1e, 0x4f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, + 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0x04, 0x12, + 0x23, 0x0a, 0x1f, 0x4f, 0x70, 0x65, 0x72, 0x61, 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, 0x2a, 0x25, 0x0a, 0x0c, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x65, 0x61, 0x64, 0x79, 0x10, 0x00, + 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x01, 0x32, 0xb8, 0x04, 0x0a, + 0x17, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, + 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x46, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x2e, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x5e, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, + 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x2e, 0x47, 0x65, + 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, + 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x47, + 0x65, 0x74, 0x49, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x64, 0x75, + 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x61, 0x6c, 0x65, 0x73, 0x44, + 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1f, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x53, 0x61, 0x6c, 0x65, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x61, 0x6c, 0x65, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x67, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x70, 0x75, + 0x74, 0x41, 0x6e, 0x64, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x22, + 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x41, 0x6e, + 0x64, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x70, + 0x75, 0x74, 0x41, 0x6e, 0x64, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x12, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, + 0x1a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x75, + 0x74, 0x70, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x16, 0x47, 0x65, + 0x74, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 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, 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, 0x15, 0x5a, 0x13, 0x2e, 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, } var ( @@ -1355,7 +1463,7 @@ } var file_product_inventory_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_product_inventory_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_product_inventory_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_product_inventory_proto_goTypes = []interface{}{ (OperationSource)(0), // 0: OperationSource (FinishStatus)(0), // 1: FinishStatus @@ -1373,6 +1481,8 @@ (*OutputProduct)(nil), // 13: OutputProduct (*OrderProductOutputRequest)(nil), // 14: OrderProductOutputRequest (*OrderProductOutputResponse)(nil), // 15: OrderProductOutputResponse + (*GetOutputOperationInfoRequest)(nil), // 16: GetOutputOperationInfoRequest + (*GetOutputOperationInfoResponse)(nil), // 17: GetOutputOperationInfoResponse } var file_product_inventory_proto_depIdxs = []int32{ 3, // 0: CreateOperationRequest.ProductList:type_name -> InventoryProduct @@ -1382,21 +1492,24 @@ 10, // 4: GetOrderInputAndOutputInfoResponse.InputList:type_name -> InputAndOutputInfo 10, // 5: GetOrderInputAndOutputInfoResponse.OutputList:type_name -> InputAndOutputInfo 13, // 6: OrderProductOutputRequest.Products:type_name -> OutputProduct - 2, // 7: productInventoryService.CreateOperation:input_type -> CreateOperationRequest - 5, // 8: productInventoryService.GetInventoryProductInfo:input_type -> GetInventoryProductInfoRequest - 8, // 9: productInventoryService.UpdateSalesDetailStatus:input_type -> UpdateSalesDetailStatusRequest - 11, // 10: productInventoryService.GetOrderInputAndOutputInfo:input_type -> GetOrderInputAndOutputInfoRequest - 14, // 11: productInventoryService.OrderProductOutput:input_type -> OrderProductOutputRequest - 4, // 12: productInventoryService.CreateOperation:output_type -> CreateOperationResponse - 7, // 13: productInventoryService.GetInventoryProductInfo:output_type -> GetInventoryProductInfoResponse - 9, // 14: productInventoryService.UpdateSalesDetailStatus:output_type -> UpdateSalesDetailStatusResponse - 12, // 15: productInventoryService.GetOrderInputAndOutputInfo:output_type -> GetOrderInputAndOutputInfoResponse - 15, // 16: productInventoryService.OrderProductOutput:output_type -> OrderProductOutputResponse - 12, // [12:17] is the sub-list for method output_type - 7, // [7:12] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 13, // 7: GetOutputOperationInfoResponse.Products:type_name -> OutputProduct + 2, // 8: productInventoryService.CreateOperation:input_type -> CreateOperationRequest + 5, // 9: productInventoryService.GetInventoryProductInfo:input_type -> GetInventoryProductInfoRequest + 8, // 10: productInventoryService.UpdateSalesDetailStatus:input_type -> UpdateSalesDetailStatusRequest + 11, // 11: productInventoryService.GetOrderInputAndOutputInfo:input_type -> GetOrderInputAndOutputInfoRequest + 14, // 12: productInventoryService.OrderProductOutput:input_type -> OrderProductOutputRequest + 16, // 13: productInventoryService.GetOutputOperationInfo:input_type -> GetOutputOperationInfoRequest + 4, // 14: productInventoryService.CreateOperation:output_type -> CreateOperationResponse + 7, // 15: productInventoryService.GetInventoryProductInfo:output_type -> GetInventoryProductInfoResponse + 9, // 16: productInventoryService.UpdateSalesDetailStatus:output_type -> UpdateSalesDetailStatusResponse + 12, // 17: productInventoryService.GetOrderInputAndOutputInfo:output_type -> GetOrderInputAndOutputInfoResponse + 15, // 18: productInventoryService.OrderProductOutput:output_type -> OrderProductOutputResponse + 17, // 19: productInventoryService.GetOutputOperationInfo:output_type -> GetOutputOperationInfoResponse + 14, // [14:20] is the sub-list for method output_type + 8, // [8:14] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_product_inventory_proto_init() } @@ -1573,6 +1686,30 @@ return nil } } + file_product_inventory_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetOutputOperationInfoRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_product_inventory_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetOutputOperationInfoResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1580,7 +1717,7 @@ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_product_inventory_proto_rawDesc, NumEnums: 2, - NumMessages: 14, + NumMessages: 16, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/product_inventory/product_inventory_grpc.pb.go b/proto/product_inventory/product_inventory_grpc.pb.go index f2bc889..5823631 100644 --- a/proto/product_inventory/product_inventory_grpc.pb.go +++ b/proto/product_inventory/product_inventory_grpc.pb.go @@ -1,8 +1,4 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. -// versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.19.0 -// source: product_inventory.proto package product_inventory @@ -18,14 +14,6 @@ // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ProductInventoryService_CreateOperation_FullMethodName = "/productInventoryService/CreateOperation" - ProductInventoryService_GetInventoryProductInfo_FullMethodName = "/productInventoryService/GetInventoryProductInfo" - ProductInventoryService_UpdateSalesDetailStatus_FullMethodName = "/productInventoryService/UpdateSalesDetailStatus" - ProductInventoryService_GetOrderInputAndOutputInfo_FullMethodName = "/productInventoryService/GetOrderInputAndOutputInfo" - ProductInventoryService_OrderProductOutput_FullMethodName = "/productInventoryService/OrderProductOutput" -) - // ProductInventoryServiceClient is the client API for ProductInventoryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -35,6 +23,7 @@ UpdateSalesDetailStatus(ctx context.Context, in *UpdateSalesDetailStatusRequest, opts ...grpc.CallOption) (*UpdateSalesDetailStatusResponse, error) GetOrderInputAndOutputInfo(ctx context.Context, in *GetOrderInputAndOutputInfoRequest, opts ...grpc.CallOption) (*GetOrderInputAndOutputInfoResponse, error) OrderProductOutput(ctx context.Context, in *OrderProductOutputRequest, opts ...grpc.CallOption) (*OrderProductOutputResponse, error) + GetOutputOperationInfo(ctx context.Context, in *GetOutputOperationInfoRequest, opts ...grpc.CallOption) (*GetOutputOperationInfoResponse, error) } type productInventoryServiceClient struct { @@ -47,7 +36,7 @@ func (c *productInventoryServiceClient) CreateOperation(ctx context.Context, in *CreateOperationRequest, opts ...grpc.CallOption) (*CreateOperationResponse, error) { out := new(CreateOperationResponse) - err := c.cc.Invoke(ctx, ProductInventoryService_CreateOperation_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/productInventoryService/CreateOperation", in, out, opts...) if err != nil { return nil, err } @@ -56,7 +45,7 @@ func (c *productInventoryServiceClient) GetInventoryProductInfo(ctx context.Context, in *GetInventoryProductInfoRequest, opts ...grpc.CallOption) (*GetInventoryProductInfoResponse, error) { out := new(GetInventoryProductInfoResponse) - err := c.cc.Invoke(ctx, ProductInventoryService_GetInventoryProductInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/productInventoryService/GetInventoryProductInfo", in, out, opts...) if err != nil { return nil, err } @@ -65,7 +54,7 @@ func (c *productInventoryServiceClient) UpdateSalesDetailStatus(ctx context.Context, in *UpdateSalesDetailStatusRequest, opts ...grpc.CallOption) (*UpdateSalesDetailStatusResponse, error) { out := new(UpdateSalesDetailStatusResponse) - err := c.cc.Invoke(ctx, ProductInventoryService_UpdateSalesDetailStatus_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/productInventoryService/UpdateSalesDetailStatus", in, out, opts...) if err != nil { return nil, err } @@ -74,7 +63,7 @@ func (c *productInventoryServiceClient) GetOrderInputAndOutputInfo(ctx context.Context, in *GetOrderInputAndOutputInfoRequest, opts ...grpc.CallOption) (*GetOrderInputAndOutputInfoResponse, error) { out := new(GetOrderInputAndOutputInfoResponse) - err := c.cc.Invoke(ctx, ProductInventoryService_GetOrderInputAndOutputInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/productInventoryService/GetOrderInputAndOutputInfo", in, out, opts...) if err != nil { return nil, err } @@ -83,7 +72,16 @@ func (c *productInventoryServiceClient) OrderProductOutput(ctx context.Context, in *OrderProductOutputRequest, opts ...grpc.CallOption) (*OrderProductOutputResponse, error) { out := new(OrderProductOutputResponse) - err := c.cc.Invoke(ctx, ProductInventoryService_OrderProductOutput_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/productInventoryService/OrderProductOutput", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *productInventoryServiceClient) GetOutputOperationInfo(ctx context.Context, in *GetOutputOperationInfoRequest, opts ...grpc.CallOption) (*GetOutputOperationInfoResponse, error) { + out := new(GetOutputOperationInfoResponse) + err := c.cc.Invoke(ctx, "/productInventoryService/GetOutputOperationInfo", in, out, opts...) if err != nil { return nil, err } @@ -99,6 +97,7 @@ UpdateSalesDetailStatus(context.Context, *UpdateSalesDetailStatusRequest) (*UpdateSalesDetailStatusResponse, error) GetOrderInputAndOutputInfo(context.Context, *GetOrderInputAndOutputInfoRequest) (*GetOrderInputAndOutputInfoResponse, error) OrderProductOutput(context.Context, *OrderProductOutputRequest) (*OrderProductOutputResponse, error) + GetOutputOperationInfo(context.Context, *GetOutputOperationInfoRequest) (*GetOutputOperationInfoResponse, error) mustEmbedUnimplementedProductInventoryServiceServer() } @@ -120,6 +119,9 @@ } func (UnimplementedProductInventoryServiceServer) OrderProductOutput(context.Context, *OrderProductOutputRequest) (*OrderProductOutputResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method OrderProductOutput not implemented") +} +func (UnimplementedProductInventoryServiceServer) GetOutputOperationInfo(context.Context, *GetOutputOperationInfoRequest) (*GetOutputOperationInfoResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetOutputOperationInfo not implemented") } func (UnimplementedProductInventoryServiceServer) mustEmbedUnimplementedProductInventoryServiceServer() { } @@ -145,7 +147,7 @@ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductInventoryService_CreateOperation_FullMethodName, + FullMethod: "/productInventoryService/CreateOperation", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductInventoryServiceServer).CreateOperation(ctx, req.(*CreateOperationRequest)) @@ -163,7 +165,7 @@ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductInventoryService_GetInventoryProductInfo_FullMethodName, + FullMethod: "/productInventoryService/GetInventoryProductInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductInventoryServiceServer).GetInventoryProductInfo(ctx, req.(*GetInventoryProductInfoRequest)) @@ -181,7 +183,7 @@ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductInventoryService_UpdateSalesDetailStatus_FullMethodName, + FullMethod: "/productInventoryService/UpdateSalesDetailStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductInventoryServiceServer).UpdateSalesDetailStatus(ctx, req.(*UpdateSalesDetailStatusRequest)) @@ -199,7 +201,7 @@ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductInventoryService_GetOrderInputAndOutputInfo_FullMethodName, + FullMethod: "/productInventoryService/GetOrderInputAndOutputInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductInventoryServiceServer).GetOrderInputAndOutputInfo(ctx, req.(*GetOrderInputAndOutputInfoRequest)) @@ -217,10 +219,28 @@ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductInventoryService_OrderProductOutput_FullMethodName, + FullMethod: "/productInventoryService/OrderProductOutput", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductInventoryServiceServer).OrderProductOutput(ctx, req.(*OrderProductOutputRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ProductInventoryService_GetOutputOperationInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetOutputOperationInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ProductInventoryServiceServer).GetOutputOperationInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/productInventoryService/GetOutputOperationInfo", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ProductInventoryServiceServer).GetOutputOperationInfo(ctx, req.(*GetOutputOperationInfoRequest)) } return interceptor(ctx, in, info, handler) } @@ -252,6 +272,10 @@ MethodName: "OrderProductOutput", Handler: _ProductInventoryService_OrderProductOutput_Handler, }, + { + MethodName: "GetOutputOperationInfo", + Handler: _ProductInventoryService_GetOutputOperationInfo_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "product_inventory.proto", -- Gitblit v1.8.0