From 6ae9a1f35f59d13075ac931558bc38a11b7a6e54 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 十二月 2023 10:12:08 +0800
Subject: [PATCH] grpc接口关于operation 位置信息数据结构的变动
---
proto/inventory_order/server.go | 8 ++++++--
proto/purchase_wms/server.go | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/proto/inventory_order/server.go b/proto/inventory_order/server.go
index faa9a98..c38a32e 100644
--- a/proto/inventory_order/server.go
+++ b/proto/inventory_order/server.go
@@ -55,10 +55,12 @@
operation.Status = constvar.OperationStatus_Ready
operation.OperationTypeName = operationType.Name
operation.OperationTypeId = operationType.Id
- operation.FromLocationID = fromLocation.Id
- operation.ToLocationID = toLocation.Id
operation.BaseOperationType = constvar.BaseOperationTypeOutgoing
operation.Source = req.Source
+ operation.LocationID = fromLocation.Id
+ if req.OperationType == 1 {
+ operation.LocationID = toLocation.Id
+ }
or.WorkOrderId = operation.SourceNumber
or.Number = operation.Number
operationResp = append(operationResp, &or)
@@ -69,6 +71,8 @@
var detail models.OperationDetails
detail.ProductId = product.ProductNumber
detail.Amount = decimal.NewFromInt(product.Amount)
+ detail.FromLocationID = fromLocation.Id
+ detail.ToLocationID = toLocation.Id
details = append(details, &detail)
}
operation.Details = details
diff --git a/proto/purchase_wms/server.go b/proto/purchase_wms/server.go
index 9cf3096..4416273 100644
--- a/proto/purchase_wms/server.go
+++ b/proto/purchase_wms/server.go
@@ -38,17 +38,18 @@
if err != nil {
return nil, err
}
- operation.ToLocationID = location.Id
first, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First()
if err != nil {
return nil, err
}
- operation.FromLocationID = first.Id
+ operation.LocationID = location.Id
operation.BaseOperationType = constvar.BaseOperationTypeIncoming
for _, product := range req.Product {
var detail models.OperationDetails
detail.ProductId = product.Id
detail.Amount = decimal.NewFromInt(product.Amount)
+ detail.FromLocationID = first.Id
+ detail.ToLocationID = location.Id
details = append(details, &detail)
}
err = models.WithTransaction(func(db *gorm.DB) error {
--
Gitblit v1.8.0