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/purchase_wms.proto | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/proto/purchase_wms.proto b/proto/purchase_wms.proto
index 213f11b..c344dfd 100644
--- a/proto/purchase_wms.proto
+++ b/proto/purchase_wms.proto
@@ -20,12 +20,14 @@
message PurchaseToWmsRequest {
string Number = 1; //閲囪喘缂栧彿
string SupplierName = 2; //渚涘簲鍟�
- repeated PurchaseProduct Product = 3;
+ string Source = 3;//鏉ユ簮
+ repeated PurchaseProduct Product = 4;
}
message PurchaseToWmsResponse {
int32 code = 1;
string message = 2;
+ string Warehouse = 3;
}
//------------------------------------------------UpdatePurchaseStatus-------------------------------------
--
Gitblit v1.8.0