From 67b13bb40517145cfadc05d7b22411b16f1528d7 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 10:33:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
proto/purchase_wms/server.go | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/proto/purchase_wms/server.go b/proto/purchase_wms/server.go
index cbab86d..ede24f6 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"
@@ -26,6 +27,8 @@
operation.CompanyName = req.SupplierName
operation.CompanyID = int(req.SupplierId)
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
}
--
Gitblit v1.8.0