From 9ceaa0c500368b0a512be2053e54e2ee49c5f537 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 05 七月 2024 16:22:08 +0800
Subject: [PATCH] 库存调拨产生的出入库操作补充对应的仓库ID和位置 & fix some bug
---
service/operation.go | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/service/operation.go b/service/operation.go
index c5af300..c685dd9 100644
--- a/service/operation.go
+++ b/service/operation.go
@@ -273,8 +273,10 @@
Comment: "搴撳瓨璋冩嫧鍏ュ簱",
BaseOperationType: constvar.BaseOperationTypeIncoming,
Details: internalInputDetails,
- LocationID: internalInputDetails[0].ToLocationID,
+ LocationID: originOperation.LocationID,
+ ToLocationID: originOperation.ToLocationID,
OperationTypeName: "搴撳瓨璋冩嫧鍏ュ簱",
+ WarehouseId: originOperation.ToLocation.WarehouseId,
}
if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
return err
@@ -316,9 +318,11 @@
Comment: "搴撳瓨璋冩嫧鍑哄簱",
BaseOperationType: constvar.BaseOperationTypeOutgoing,
Details: outputDetails,
- LocationID: outputDetails[0].FromLocationID,
+ LocationID: originOperation.LocationID,
+ ToLocationID: originOperation.ToLocationID,
OperationTypeName: "搴撳瓨璋冩嫧鍑哄簱",
IsInternalOutput: true,
+ WarehouseId: originOperation.WarehouseId,
}
if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
return err
@@ -342,8 +346,8 @@
inputDetails = append(inputDetails, &models.OperationDetails{
ProductId: v.ProductId,
Amount: v.Amount.Sub(v.StockAmount),
- FromLocationID: v.FromLocationID,
- ToLocationID: v.ToLocationID,
+ FromLocationID: 0,
+ ToLocationID: v.FromLocationID,
TotalGrossWeight: v.TotalGrossWeight,
TotalNetWeight: v.TotalNetWeight,
AuxiliaryAmount: v.AuxiliaryAmount,
@@ -356,8 +360,8 @@
outputDetails = append(outputDetails, &models.OperationDetails{
ProductId: v.ProductId,
Amount: v.StockAmount.Sub(v.Amount),
- FromLocationID: v.ToLocationID,
- ToLocationID: v.FromLocationID,
+ FromLocationID: v.FromLocationID,
+ ToLocationID: 0,
TotalGrossWeight: v.TotalGrossWeight,
TotalNetWeight: v.TotalNetWeight,
AuxiliaryAmount: v.AuxiliaryAmount,
--
Gitblit v1.8.0