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
---
controllers/location_product_amount.go | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 90d59f1..4b65a15 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -45,7 +45,9 @@
//wms_operation_details.amount as adjust_amount,wms_operation.id as operation_id,wms_operation.status
search.Orm = search.Orm.
Table("wms_location_product_amount").
- Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.name as location_name,material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,wms_location_product_amount.create_date`).
+ Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.name as location_name,
+ material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,
+ wms_location_product_amount.create_date,material.weight`).
InnerJoins("inner join material on material.id=wms_location_product_amount.product_id").
InnerJoins("inner join wms_location on wms_location.id=wms_location_product_amount.location_id")
@@ -165,6 +167,7 @@
Comment: "搴撳瓨鐩樼偣",
BaseOperationType: constvar.BaseOperationTypeAdjust,
Details: []*models.OperationDetails{detail},
+ LocationID: location.Id,
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -332,6 +335,10 @@
}
first, err := models.NewLocationProductAmountSearch().SetLocationId(params.LocationId).SetProductId(params.ProductId).First()
if err != nil {
+ if err == gorm.ErrRecordNotFound {
+ util.ResponseFormat(c, code.Success, nil)
+ return
+ }
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
--
Gitblit v1.8.0