From d1cb09e7a23e7221b6c090ad33e4481a5b79f615 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 17:44:29 +0800
Subject: [PATCH] 出入库报表搜索增加几个字段
---
controllers/operation.go | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 5 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 4e5ab53..f42fe69 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -14,6 +14,7 @@
"os"
"sort"
"strconv"
+ "strings"
"time"
"wms/conf"
"wms/constvar"
@@ -23,9 +24,12 @@
"wms/opa"
"wms/pkg/logx"
"wms/pkg/structx"
+ "wms/proto/client"
"wms/proto/product_inventory"
"wms/proto/purchase_wms"
+ "wms/proto/supplier"
"wms/request"
+ "wms/service"
"wms/utils/http"
"wms/utils/upload"
)
@@ -166,6 +170,30 @@
}
return nil
+}
+
+// GetOperationInfo
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鍏ュ簱/鍑哄簱鍒楄〃
+// @Produce application/json
+//
+// @Param id path string true "id"
+//
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/getOperationInfo/{id} [get]
+func (slf OperationController) GetOperationInfo(c *gin.Context) {
+ number := c.Param("id")
+ if number == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屽弬鏁颁笉鑳戒负绌�")
+ return
+ }
+ id, _ := strconv.Atoi(number)
+ operation, err := models.NewOperationSearch().SetID(id).SetPreload(true).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, operation)
}
// List
@@ -337,7 +365,10 @@
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
- if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
+ return err
+ }
+ if err := AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
return err
}
@@ -404,7 +435,6 @@
// return err
//}
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
locAmount, err := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
SetLocationId(locationRule.LocationId).
@@ -454,7 +484,6 @@
// return err
//}
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
locAmount, err := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
SetLocationId(locationRule.LocationId).
@@ -471,7 +500,6 @@
return res.Error
}
} else {
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
locAmount, err := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
SetLocationId(operation.ToLocationID).
@@ -703,6 +731,40 @@
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
+func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
+ var histories []*models.MoveHistory
+ operationMap := make(map[string]*models.Operation, len(operationList))
+ for _, operation := range operationList {
+ for _, v := range operation.Details {
+ history := &models.MoveHistory{
+ Number: operation.Number,
+ BaseOperationType: operation.BaseOperationType,
+ OperationTypeId: operation.OperationTypeId,
+ OperationTypeName: operation.OperationTypeName,
+ OperationId: operation.Id,
+ ProductId: v.ProductId,
+ ProductName: v.Product.Name,
+ Amount: v.Amount,
+ Unit: v.Product.Unit,
+ Weight: operation.Weight,
+ FromLocationId: operation.FromLocationID,
+ FromLocation: operation.FromLocation.Name,
+ ToLocationId: operation.ToLocationID,
+ ToLocation: operation.ToLocation.Name,
+ }
+ histories = append(histories, history)
+ }
+ operationMap[operation.Number] = operation
+ }
+ if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
+ return err
+ }
+ for _, history := range histories {
+ service.AddNewHistoryReportRecord(history, operationMap[history.Number])
+ }
+ return nil
+}
+
var (
ProductInventoryServiceConn *grpc.ClientConn
PurchaseServiceConn *grpc.ClientConn
@@ -824,6 +886,7 @@
return
}
operation.Status = constvar.OperationStatus_Cancel
+ operation.AuditDate = time.Now().Format("2006-01-02 15:04:05")
if err := models.NewOperationSearch().SetID(operation.Id).Save(operation); err != nil {
util.ResponseFormat(c, code.SaveFail, err.Error())
return
@@ -960,6 +1023,7 @@
}
func ExportOutputOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ repositoryLevels := strings.Split(operation.FromLocation.JointName, "/")
template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
@@ -988,11 +1052,15 @@
},
})
- f.SetCellValue("Sheet1", "C2", operation.FromLocation.Name)
+ f.SetCellValue("Sheet1", "C2", repositoryLevels[0])
f.SetCellValue("Sheet1", "H2", operation.WaybillNumber)
+ f.SetCellValue("Sheet1", "K2", operation.AuditDate)
f.SetCellValue("Sheet1", "H3", operation.SourceNumber)
f.SetCellValue("Sheet1", "K3", operation.Number)
f.SetCellValue("Sheet1", "C4", operation.CompanyName)
+ f.SetCellValue("Sheet1", "I4", operation.ReceiverAddr)
+ f.SetCellValue("Sheet1", "C5", operation.ReceiverName)
+ f.SetCellValue("Sheet1", "H5", operation.ReceiverPhone)
rowIndex := 8
totalAmount := decimal.NewFromInt(0)
@@ -1030,3 +1098,39 @@
return fileUrl, nil
}
+
+// GetSupplierList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇鐗╂祦鍏徃鍒楄〃
+// @Produce application/json
+//
+// @Success 200 {object} util.Response "鎴愬姛"
+//
+// @Router /api-wms/v1/operation/getSupplierList [get]
+func (slf OperationController) GetSupplierList(c *gin.Context) {
+ cli := supplier.NewSupplierServiceClient(supplier.SupplierConn)
+ resp, err := cli.GetSupplierList(c, &supplier.SupplierListRequest{Status: 1})
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, resp.List)
+}
+
+// GetClientList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇鐗╂祦鍏徃鍒楄〃
+// @Produce application/json
+//
+// @Success 200 {object} util.Response "鎴愬姛"
+//
+// @Router /api-wms/v1/operation/getClientList [get]
+func (slf OperationController) GetClientList(c *gin.Context) {
+ cli := client.NewClientServiceClient(client.ClientConn)
+ resp, err := cli.GetClientList(c, &client.ClientListRequest{})
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, resp.List)
+}
--
Gitblit v1.8.0