From d1cb09e7a23e7221b6c090ad33e4481a5b79f615 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 17:44:29 +0800
Subject: [PATCH] 出入库报表搜索增加几个字段
---
controllers/location_product_amount.go | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index ce3bcf4..b003c1b 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -14,6 +14,7 @@
"wms/models"
"wms/request"
"wms/response"
+ "wms/service"
)
type LocationProductAmountController struct {
@@ -44,11 +45,9 @@
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`).
- InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
- InnerJoins("inner join material on material.id=wms_location_product.product_id").
- InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id")
- //Joins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
- //Joins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id and wms_operation.base_operation_type=? and wms_operation.status=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready)
+ 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")
+
var (
records = make([]*models.LocationProductAmountWithOperation, 0)
total int64
@@ -71,17 +70,21 @@
if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
if errors.Is(res.Error, gorm.ErrRecordNotFound) {
records[k].Status = constvar.OperationStatus_Finish
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
continue
} else {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find operation err: %v", res.Error.Error()))
return
}
} else {
- records[k].AdjustAmount = operation.Details[0].Amount
+ if len(operation.Details) > 0 {
+ records[k].AdjustAmount = operation.Details[0].Amount
+ records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ }
records[k].OperationId = operation.Id
records[k].Status = operation.Status
- records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
}
+ records[k].BaseOperationType = constvar.BaseOperationTypeAdjust
}
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
@@ -123,25 +126,22 @@
return errors.New("璇ュ晢鍝佸湪宸查�変腑鐨勪綅缃瓨鍦ㄦ湭楠岃瘉鐨勫簱瀛樼洏鐐逛俊鎭紝鏃犳硶缁х画娣诲姞鐩稿叧淇℃伅")
}
- locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
- if err != nil {
- return errors.New("鍙傛暟寮傚父锛屾湭鎵惧埌璇ヤ笂鏋惰鍒�")
- }
-
- existAmount, err := models.NewLocationProductAmountSearch().SetLocationProductId(locProduct.Id).First()
- if err != nil {
- return err
+ existAmount, res := models.NewLocationProductAmountSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).FirstRes()
+ if res.Error != nil && !errors.Is(res.Error, gorm.ErrRecordNotFound) {
+ return res.Error
}
location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
if err != nil {
return err
}
- //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
var locAmount models.LocationProductAmount
- if existAmount.Id == 0 {
+ if res.Error != nil && errors.Is(res.Error, gorm.ErrRecordNotFound) {
locAmount = models.LocationProductAmount{
- LocationProductId: locProduct.Id,
+ LocationId: reqParams.LocationId,
+ //TODO:姝ゅ鏂板浜哖roductCategoryId鍏ュ弬锛岀洰鍓嶄笉娓呮杩欎釜鍊肩殑鏉ユ簮
+ ProductCategoryID: reqParams.ProductCategoryId,
+ ProductId: reqParams.ProductId,
Amount: decimal.NewFromInt(0),
CreateDate: time.Now().Format("2006-01-02 15:04:05"),
}
@@ -175,6 +175,8 @@
}); err != nil {
return err
}
+
+ service.AddNewLocationReportRecord(locAmount.Id)
return nil
}
--
Gitblit v1.8.0