From a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 一月 2024 10:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/reorder_rule_controller.go | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/controllers/reorder_rule_controller.go b/controllers/reorder_rule_controller.go
index d1fce38..2a42385 100644
--- a/controllers/reorder_rule_controller.go
+++ b/controllers/reorder_rule_controller.go
@@ -150,17 +150,17 @@
var pa []request.ProductAmount
search := models.NewOperationDetailsSearch()
search.Orm = search.Orm.Model(&models.OperationDetails{}).
- Select("wms_operation_details.product_id, wms_operation_details.amount, wms_operation.to_location_id as to_location_id, " +
- "wms_operation.from_location_id as from_location_id, wms_operation.base_operation_type").
+ Select("wms_operation_details.product_id, wms_operation_details.amount, wms_operation_details.to_location_id as to_location_id, " +
+ "wms_operation_details.from_location_id as from_location_id, wms_operation.base_operation_type").
Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id")
if len(productIds) > 0 {
search.Orm.Where("wms_operation_details.product_id in (?)", productIds)
}
if len(toLocationIds) > 0 {
- search.Orm.Where("wms_operation.to_location_id in (?)", toLocationIds)
+ search.Orm.Where("wms_operation_details.to_location_id in (?)", toLocationIds)
}
if len(fromLocationIds) > 0 {
- search.Orm.Where("wms_operation.from_location_id in (?)", fromLocationIds)
+ search.Orm.Where("wms_operation_details.from_location_id in (?)", fromLocationIds)
}
if len(status) > 0 {
search.Orm.Where("wms_operation.status in (?)", status)
@@ -332,16 +332,17 @@
var details models.OperationDetails
details.ProductId = params.ProductId
details.Amount = params.OrderNumber
+ details.FromLocationID = 1
+ details.ToLocationID = params.LocationId
operation.Details = append(operation.Details, &details)
operation.BaseOperationType = constvar.BaseOperationTypeIncoming
operation.Status = constvar.OperationStatus_Ready
operation.OperationTypeId = operationType.Id
operation.OperationTypeName = operationType.Name
operation.OperationDate = timex.TimeToString2(time.Now())
- //todo 渚涘簲鍟嗕綅缃�
- operation.FromLocationID = 1
+ operation.LocationID = params.LocationId
operation.Number = strconv.FormatInt(time.Now().Unix(), 10)
- operation.ToLocationID = params.LocationId
+
operation.SourceNumber = SourceNumber
err = models.WithTransaction(func(db *gorm.DB) error {
--
Gitblit v1.8.0