From 62cc4765bdb6e7084897fefd91b6c25a64dd4d72 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 十二月 2023 17:40:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 proto/product_inventory/server.go |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/proto/product_inventory/server.go b/proto/product_inventory/server.go
index f64413b..b564f8d 100644
--- a/proto/product_inventory/server.go
+++ b/proto/product_inventory/server.go
@@ -101,7 +101,7 @@
 	products := make([]*ProductInfo, 0)
 	for _, material := range materials {
 		var p ProductInfo
-		p.Id = material.ID
+		p.Number = material.ID
 		p.Name = material.Name
 		for _, detail := range details {
 			if material.ID == detail.ProductId {
@@ -171,6 +171,8 @@
 	operation.ReceiverPhone = req.Phone
 	operation.ReceiverAddr = req.Address
 	operation.Source = req.Source
+	operation.CompanyID = int(req.ClientId)
+	operation.CompanyName = req.ClientName
 	if req.DeliverType == 1 {
 		for _, product := range req.ProductList {
 			var detail models.OperationDetails

--
Gitblit v1.8.0