From f45e4cb8045fe60f96f467dc4ea1e2ae57445712 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 03 七月 2024 23:13:40 +0800
Subject: [PATCH] 默认位置parent_id为视图位置id
---
proto/purchase_wms/server.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/proto/purchase_wms/server.go b/proto/purchase_wms/server.go
index e9440e7..5d1da59 100644
--- a/proto/purchase_wms/server.go
+++ b/proto/purchase_wms/server.go
@@ -2,6 +2,7 @@
import (
"context"
+ "errors"
"github.com/shopspring/decimal"
"gorm.io/gorm"
"strconv"
@@ -24,8 +25,10 @@
operation.Number = strconv.FormatInt(time.Now().Unix(), 10)
operation.Status = constvar.OperationStatus_Ready
operation.CompanyName = req.SupplierName
- operation.CompanyID = int(req.SupplierId)
+ operation.CompanyID = strconv.FormatInt(req.SupplierId, 10)
operation.Source = req.Source
+ operation.OperationSource = constvar.OperationSource(req.OperationSource)
+ operation.SalesDetailsNumber = req.SalesDetailsNumber
warehouse, err := models.NewWarehouseSearch().SetName(req.WarehouseName).First()
if err != nil {
return nil, err
@@ -90,7 +93,13 @@
}
func (s *Server) SrmGetOperationInfo(c context.Context, req *SrmGetOperationInfoRequest) (*SrmGetOperationInfoResponse, error) {
- operations, err := models.NewOperationSearch().SetSourceNumber(req.Number).SetPreload(true).FindNotTotal()
+ if req.Number == "" && req.SalesDetailsNumber == "" && req.OperationSource == 0 {
+ return nil, errors.New("鍙傛暟缂哄け")
+ }
+ operations, err := models.NewOperationSearch().SetSourceNumber(req.Number).
+ SetOperationSource(constvar.OperationSource(req.OperationSource)).
+ SetSalesDetailsNumber(req.SalesDetailsNumber).
+ SetPreload(true).FindNotTotal()
if err != nil {
return nil, err
}
@@ -101,9 +110,7 @@
index := strings.LastIndex(operation.OperationTypeName, "-")
so.WarehouseName = operation.OperationTypeName[:index]
so.Status = int64(operation.Status)
- if operation.Status == constvar.OperationStatus_Finish {
- so.OverTime = operation.UpdateTime
- }
+ so.OverTime = operation.CreateTime
for _, detail := range operation.Details {
s := so
s.ProductId = detail.ProductId
--
Gitblit v1.8.0