From ed3d45b189f102249eabd0cb5a0299bc66b0dea6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
proto/inventory_order/server.go | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/proto/inventory_order/server.go b/proto/inventory_order/server.go
index 884c8d9..faa9a98 100644
--- a/proto/inventory_order/server.go
+++ b/proto/inventory_order/server.go
@@ -44,9 +44,11 @@
if err != nil {
return nil, err
}
+ operationResp := make([]*OperationResponse, 0)
for _, list := range req.List {
var operation models.Operation
var details []*models.OperationDetails
+ var or OperationResponse
operation.SourceNumber = list.SourceNumber
operation.OperationDate = timex.TimeToString2(time.Now())
operation.Number = strconv.FormatInt(time.Now().Unix(), 10)
@@ -56,6 +58,10 @@
operation.FromLocationID = fromLocation.Id
operation.ToLocationID = toLocation.Id
operation.BaseOperationType = constvar.BaseOperationTypeOutgoing
+ operation.Source = req.Source
+ or.WorkOrderId = operation.SourceNumber
+ or.Number = operation.Number
+ operationResp = append(operationResp, &or)
if req.OperationType == 1 {
operation.BaseOperationType = constvar.BaseOperationTypeIncoming
}
@@ -70,5 +76,23 @@
}
err = models.NewOperationSearch().CreateBatch(operations)
resp := new(CreateOperationListResponse)
+ 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