From f16252d8b4736a0212b14a2bfb0eeee411d0cc76 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期一, 13 十一月 2023 11:16:34 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- controllers/reorder_rule_controller.go | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/reorder_rule_controller.go b/controllers/reorder_rule_controller.go index bbb446c..a2b1dbe 100644 --- a/controllers/reorder_rule_controller.go +++ b/controllers/reorder_rule_controller.go @@ -119,7 +119,7 @@ rule.Prediction = rule.Amount.Add(rule.Prediction) } //鍑哄簱灏辩华 - operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal} + operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse} amount, err = GetProductAmount(productIds, nil, locationIds, status, operationType) if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ヨ閲嶈璐ц鍒欏垪琛ㄥけ璐�") @@ -221,7 +221,7 @@ } prediction = amount.Add(prediction) //鍑哄簱灏辩华 - operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal} + operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse} list, err = GetProductAmount(productIds, nil, locationIds, status, operationType) if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ヨ閲嶈璐ц鍒欏垪琛ㄥけ璐�") -- Gitblit v1.8.0