From e1ec7e077a10938ce795c766915c5c5673dcf282 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 20 三月 2024 19:08:10 +0800
Subject: [PATCH] crm发货申请补充发货单号
---
proto/inventory_order/server.go | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/proto/inventory_order/server.go b/proto/inventory_order/server.go
index 998dcc7..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
@@ -79,3 +83,20 @@
resp.List = operationResp
return resp, err
}
+
+func (s *Server) GetWarehouseInfo(ctx context.Context, req *GetWarehouseInfoRequest) (*GetWarehouseInfoResponse, error) {
+ warehouses, err := models.NewWarehouseSearch().FindNotTotal()
+ if err != nil {
+ return nil, err
+ }
+ list := make([]*WarehouseInfo, 0)
+ for _, warehouse := range warehouses {
+ var wi WarehouseInfo
+ wi.Id = strconv.Itoa(warehouse.Id)
+ wi.Name = warehouse.Name
+ list = append(list, &wi)
+ }
+ resp := new(GetWarehouseInfoResponse)
+ resp.List = list
+ return resp, nil
+}
--
Gitblit v1.8.0