From 18939d88db4799b2ba0359016d9a4ae1e76e2a22 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 29 三月 2024 14:01:35 +0800
Subject: [PATCH] 完善
---
service/operation.go | 56 ++++++++++++++-------------
proto/product_inventory/server.go | 11 +++--
2 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/proto/product_inventory/server.go b/proto/product_inventory/server.go
index be5f88a..8bd4069 100644
--- a/proto/product_inventory/server.go
+++ b/proto/product_inventory/server.go
@@ -447,11 +447,12 @@
productHasSendAmount[productNumber] = productHasSendAmount[productNumber].Add(locationSendAmount)
}
outputInfoList = append(outputInfoList, &service.OutputInfo{
- LocationID: int(locationID),
- WarehouseID: int(LocationIDWarehouseIDMap[locationID]),
- Products: productInfoList,
- OperationID: 0,
- SourceNumber: req.OrderNumber,
+ LocationID: int(locationID),
+ WarehouseID: int(LocationIDWarehouseIDMap[locationID]),
+ Products: productInfoList,
+ OperationID: 0,
+ SourceNumber: req.OrderNumber,
+ SaleDetailsNumber: req.OrderNumber,
})
}
diff --git a/service/operation.go b/service/operation.go
index 6ec8332..95cb627 100644
--- a/service/operation.go
+++ b/service/operation.go
@@ -8,11 +8,12 @@
)
type OutputInfo struct {
- LocationID int
- WarehouseID int
- Products []*ProductInfo
- OperationID int
- SourceNumber string
+ LocationID int
+ WarehouseID int
+ Products []*ProductInfo
+ OperationID int
+ SourceNumber string
+ SaleDetailsNumber string
}
type ProductInfo struct {
@@ -60,28 +61,29 @@
continue
}
operation := &models.Operation{
- Id: 0,
- Number: autoCode,
- SourceNumber: output.SourceNumber,
- OperationTypeId: opTypeMap[output.WarehouseID].Id,
- OperationTypeName: opTypeMap[output.WarehouseID].Name,
- Status: constvar.OperationStatus_Ready,
- OperationDate: time.Now().Format("2006-01-02 15:04:05"),
- ContacterID: 0,
- ContacterName: "",
- CompanyID: 0,
- CompanyName: "",
- Comment: "crm鍙戣揣鐢宠",
- LogisticCompanyId: "",
- LogisticCompany: models.LogisticCompany{},
- WaybillNumber: "",
- Weight: decimal.Decimal{},
- LogisticWeight: decimal.Decimal{},
- Source: "crm",
- Details: details,
- BaseOperationType: constvar.BaseOperationTypeOutgoing,
- LocationID: output.LocationID,
- OperationSource: constvar.OperationSourceSaleDelivery,
+ Id: 0,
+ Number: autoCode,
+ SourceNumber: output.SourceNumber,
+ OperationTypeId: opTypeMap[output.WarehouseID].Id,
+ OperationTypeName: opTypeMap[output.WarehouseID].Name,
+ Status: constvar.OperationStatus_Ready,
+ OperationDate: time.Now().Format("2006-01-02 15:04:05"),
+ ContacterID: 0,
+ ContacterName: "",
+ CompanyID: 0,
+ CompanyName: "",
+ Comment: "crm鍙戣揣鐢宠",
+ LogisticCompanyId: "",
+ LogisticCompany: models.LogisticCompany{},
+ WaybillNumber: "",
+ Weight: decimal.Decimal{},
+ LogisticWeight: decimal.Decimal{},
+ Source: "crm",
+ Details: details,
+ BaseOperationType: constvar.BaseOperationTypeOutgoing,
+ LocationID: output.LocationID,
+ OperationSource: constvar.OperationSourceSaleDelivery,
+ SalesDetailsNumber: output.SaleDetailsNumber,
}
operations = append(operations, operation)
autoCode = models.GetAutoCode(maxAutoIncr, codeStandard)
--
Gitblit v1.8.0