From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts

---
 proto/inventory_order.proto |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/proto/inventory_order.proto b/proto/inventory_order.proto
index 113c6de..65d34d7 100644
--- a/proto/inventory_order.proto
+++ b/proto/inventory_order.proto
@@ -4,6 +4,8 @@
 
 service inventoryOrderService {
   rpc CreateNewOrder(CreateNewOrderRequest) returns(CreateNewOrderResponse) {}
+  rpc CreateOperationList(CreateOperationListRequest) returns(CreateOperationListResponse) {}
+  rpc UpdateMaterialApplyStatus(UpdateMaterialApplyStatusRequest) returns(UpdateMaterialApplyStatusResponse) {}
 }
 
 message CreateNewOrderRequest{
@@ -17,4 +19,41 @@
   int32   Code = 1;
   string  Msg = 2;
   string OrderId = 3;
+}
+
+//-------------------------------------------------------CreateOperationList------------------------------------
+
+message OperationProduct {
+  string ProductNumber = 1;
+  int64 Amount = 2;
+}
+
+message OperationList {
+  string SourceNumber = 1;
+  repeated OperationProduct Products = 2;
+}
+
+message CreateOperationListRequest{
+  int64 OperationType = 1;
+  string Source = 2;
+  repeated OperationList List = 3;
+}
+
+message OperationResponse{
+  string WorkOrderId = 1;
+  string Number = 2;
+}
+
+message CreateOperationListResponse{
+  repeated OperationResponse List = 1;
+}
+
+//--------------------------------------------------UpdateMaterialApplyStatus-----------------------------------
+
+message UpdateMaterialApplyStatusRequest{
+  string Number = 1;
+  int64 Status = 2;
+}
+
+message UpdateMaterialApplyStatusResponse{
 }
\ No newline at end of file

--
Gitblit v1.8.0