From eaa4218d45fade3a9ac2cfb7ff81cbfceeb650cd Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 11 一月 2024 10:36:23 +0800
Subject: [PATCH] 问题修改
---
controllers/operation.go | 854 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 763 insertions(+), 91 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index fa8137d..ae51152 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1,21 +1,39 @@
package controllers
import (
+ "context"
+ "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ uuid "github.com/satori/go.uuid"
"github.com/shopspring/decimal"
+ "github.com/xuri/excelize/v2"
"gorm.io/gorm"
+ "os"
"sort"
"strconv"
+ "strings"
"time"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
+ "wms/opa"
"wms/pkg/logx"
+ "wms/pkg/mysqlx"
"wms/pkg/structx"
+ "wms/proto/client"
+ "wms/proto/init_client"
+ "wms/proto/inventory_order"
+ "wms/proto/product_inventory"
+ "wms/proto/purchase_wms"
+ "wms/proto/supplier"
"wms/request"
+ "wms/response"
+ "wms/service"
+ "wms/utils/http"
+ "wms/utils/upload"
)
type OperationController struct {
@@ -43,6 +61,7 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+
if err := slf.FormatLocation(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -60,8 +79,19 @@
}
params.Status = constvar.OperationStatus_Ready
- params.Number = strconv.FormatInt(time.Now().Unix(), 10)
+ //params.Number = strconv.FormatInt(time.Now().Unix(), 10)
params.BaseOperationType = operationType.BaseOperationType
+
+ var numberNum int64
+ if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if numberNum > 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
+ return
+ }
+
if err := models.NewOperationSearch().Create(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -71,7 +101,7 @@
}
func CheckDetailsRepeat(details []*models.OperationDetails) bool {
- detailIDs := []string{}
+ var detailIDs []string
var tempID string
for _, v := range details {
detailIDs = append(detailIDs, v.ProductId)
@@ -93,32 +123,41 @@
return err
}
if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
- if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First(); err != nil {
+ location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First()
+ if err != nil {
return err
- } else {
- params.FromLocationID = location.Id
}
- if params.ToLocationID == 0 {
- return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ for k, v := range params.Details {
+ params.Details[k].FromLocationID = location.Id
+ if v.ToLocationID == 0 {
+ params.Details[k].ToLocationID = params.LocationID
+ }
}
+
}
if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
+ location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First()
+ if err != nil {
return err
- } else {
- params.ToLocationID = location.Id
}
- if params.FromLocationID == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
+ for k, v := range params.Details {
+ params.Details[k].ToLocationID = location.Id
+ if v.FromLocationID == 0 {
+ return errors.New("璇烽�夋嫨鍑哄簱浣嶇疆")
+ }
}
+
}
if operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
- if params.ToLocationID == 0 {
- return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ for _, v := range params.Details {
+ if v.ToLocationID == 0 {
+ return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ }
+ if v.FromLocationID == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
+ }
}
- if params.FromLocationID == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
- }
+
}
return nil
}
@@ -128,12 +167,20 @@
return errors.New("璇峰～鍏ユ簮鍗曞彿")
}
- if params.OperationTypeId == 0 {
- return errors.New("operationTypeId涓�0")
+ if params.Number == "" {
+ return errors.New("璇峰～鍏ュ崟鍙�")
+ }
+
+ if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
+ return errors.New("鏈瘑鍒璁板綍绫诲瀷")
}
if params.OperationDate == "" {
return errors.New("璇烽�夋嫨瀹夋帓鏃ユ湡")
+ }
+
+ if params.LocationID == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
}
if len(params.Details) <= 0 {
@@ -156,6 +203,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
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鍏ュ簱/鍑哄簱鍒楄〃
@@ -176,10 +247,10 @@
search := models.NewOperationSearch()
search.SetPage(params.Page, params.PageSize)
if params.Number != "" {
- search.SetNumber(params.Number)
+ search.SetKeyword(params.Number)
}
- if params.SourceNumber != "" {
- search.SetSourceNumber(params.SourceNumber)
+ if int(params.Status) != 0 {
+ search.SetStatus(params.Status)
}
list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
if err != nil {
@@ -254,7 +325,7 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
-// DeleteDevice
+// Delete
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅
@@ -296,7 +367,7 @@
util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
}
-// DeleteDevice
+// Finish
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鏇存敼璁板綍鐘舵��
@@ -314,7 +385,7 @@
util.ResponseFormat(c, code.RequestParamError, "id涓�0")
return
}
- operation, err := models.NewOperationSearch().SetID(id).First()
+ operation, err := models.NewOperationSearch().SetPreload(true).SetID(id).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
return
@@ -323,82 +394,344 @@
util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚")
return
}
- operationType, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
+
+ listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).SetPreload(true).FindAll()
if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
- 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 {
- return err
- }
- if operationType.BaseOperationType != constvar.BaseOperationTypeInternal {
- var listProdtId []string
- var listProdt []*models.Material
- mapProdt := make(map[string]decimal.Decimal)
- listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
- if err != nil {
- return err
- }
- for _, v := range listDetails {
- listProdtId = append(listProdtId, v.ProductId)
- mapProdt[v.ProductId] = v.Amount
- }
- if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
- return err
- }
- if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
- for k, v := range listProdt {
- if value, ok := mapProdt[v.ID]; !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- } else {
- listProdt[k].Amount = listProdt[k].Amount.Add(value)
- if err := tx.Save(listProdt[k]).Error; err != nil {
- return err
- }
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
- //var locAmount models.LocationProductAmount
- //if err := models.NewLocationProductAmountSearch().Orm.Table("wms_location_produt_amount").Joins("inner join wms_location_product on wms_location_produt.id=wms_location_produt_amount.location_product_id").Where("wms_location_produt.product_id=? and wms_location_produt.location_id=?",operation.ToLocationID,v.ID).First(&locAmount).Error;err!=nil {
- // return err
- //}
- }
- }
-
- }
- if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- for k, v := range listProdt {
- if value, ok := mapProdt[v.ID]; !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- } else {
- if v.Amount.LessThan(value) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
- }
- listProdt[k].Amount = listProdt[k].Amount.Sub(value)
- if err := tx.Save(listProdt[k]).Error; err != nil {
- return err
- }
- }
- }
- }
-
- }
- return nil
- }); err != nil {
+ var mapLocAmount map[string]*models.LocationProductAmount
+ locAmountList, err := models.NewLocationProductAmountSearch().Find()
+ if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
+ if len(locAmountList) > 0 {
+ mapLocAmount = make(map[string]*models.LocationProductAmount)
+ for _, v := range locAmountList {
+ mapLocAmount[strconv.Itoa(v.LocationId)+v.ProductId] = v
+ }
+ }
+
+ err = models.WithTransaction(func(tx *gorm.DB) error {
+ 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
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ locationRoleList, err := models.NewLocationProductSearch().Find()
+ if err != nil {
+ return errors.New("鑾峰彇涓婃灦瑙勫垯淇℃伅澶辫触")
+ }
+ var mapLocationRoleProduct, mapLocationRoleCategory map[string]*models.LocationProduct
+ if len(locationRoleList) > 0 {
+ mapLocationRoleProduct = make(map[string]*models.LocationProduct)
+ mapLocationRoleCategory = make(map[string]*models.LocationProduct)
+ for _, v := range locationRoleList {
+ if v.RuleType == constvar.RuleType_Product {
+ mapLocationRoleProduct[strconv.Itoa(v.AreaId)+v.ProductId] = v
+ }
+ if v.RuleType == constvar.RuleType_ProductCategory {
+ mapLocationRoleCategory[strconv.Itoa(v.AreaId)+strconv.Itoa(v.ProductCategoryID)] = v
+ }
+ }
+ }
+
+ var details []*models.OperationDetails
+ for k, v := range listDetails {
+ listDetails[k].Product.Amount = listDetails[k].Product.Amount.Add(v.Amount)
+ if err := tx.Save(&listDetails[k].Product).Error; err != nil {
+ return err
+ }
+
+ if roleProduct, ok := mapLocationRoleProduct[strconv.Itoa(operation.LocationID)+v.ProductId]; ok {
+ detail := &models.OperationDetails{
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ FromLocationID: roleProduct.AreaId,
+ ToLocationID: roleProduct.LocationId,
+ }
+ details = append(details, detail)
+
+ if locAmount, aok := mapLocAmount[strconv.Itoa(roleProduct.LocationId)+v.ProductId]; aok {
+ locAmount.Amount = locAmount.Amount.Add(v.Amount)
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: roleProduct.LocationId,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
+ }
+ } else {
+ if roleCategory, cok := mapLocationRoleCategory[strconv.Itoa(operation.LocationID)+strconv.Itoa(v.Product.CategoryId)]; cok {
+ detail := &models.OperationDetails{
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ FromLocationID: roleCategory.AreaId,
+ ToLocationID: roleCategory.LocationId,
+ }
+ details = append(details, detail)
+
+ if locAmount, aok := mapLocAmount[strconv.Itoa(roleCategory.LocationId)+v.ProductId]; aok {
+ locAmount.Amount = locAmount.Amount.Add(v.Amount)
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: roleCategory.LocationId,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
+ }
+ } else {
+ if locAmount, aok := mapLocAmount[strconv.Itoa(operation.LocationID)+v.ProductId]; aok {
+ locAmount.Amount = locAmount.Amount.Add(v.Amount)
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: operation.LocationID,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
+ }
+ }
+ }
+ }
+ if len(details) > 0 {
+ if err := tx.Create(&models.Operation{
+ Number: operation.Number,
+ SourceNumber: operation.SourceNumber,
+ OperationTypeId: 0,
+ OperationTypeName: operation.OperationTypeName,
+ Status: constvar.OperationStatus_Finish,
+ OperationDate: operation.OperationDate,
+ ContacterID: operation.ContacterID,
+ ContacterName: operation.ContacterName,
+ CompanyID: operation.CompanyID,
+ CompanyName: operation.CompanyName,
+ Comment: operation.Comment,
+ BaseOperationType: constvar.BaseOperationTypeInternal,
+ Details: details,
+ }).Error; err != nil {
+ return err
+ }
+ }
+ if operation.Source != "" {
+ go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
+ }
+
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ for k, v := range listDetails {
+ //todo 婕旂ず娴嬭瘯鏁版嵁
+ data, err := os.ReadFile("conf/input.json")
+ if err != nil {
+ return errors.New("鏂囦欢璇诲彇澶辫触")
+ }
+ m := make(map[string]interface{})
+ err = json.Unmarshal(data, &m)
+ if err != nil {
+ return errors.New("鏍煎紡杞崲澶辫触")
+ }
+ if opa.OpaCheck(c, m, "operation") {
+ if v.Product.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
+ }
+ }
+ //todo ================end===============================
+ if v.Product.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
+ }
+ listDetails[k].Product.Amount = listDetails[k].Product.Amount.Sub(v.Amount)
+ if err := tx.Save(&listDetails[k].Product).Error; err != nil {
+ return err
+ }
+
+ if locAmount, aok := mapLocAmount[strconv.Itoa(v.FromLocationID)+v.ProductId]; aok {
+ if locAmount.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, locAmount.Amount.String(), v.Amount.String()))
+ }
+ locAmount.Amount = locAmount.Amount.Sub(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
+ return err
+ }
+ } else {
+ return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
+ }
+ }
+ if operation.Source != "" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
+ }
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
+ for _, v := range listDetails {
+ if fromLocAmount, aok := mapLocAmount[strconv.Itoa(v.FromLocationID)+v.ProductId]; aok {
+ if fromLocAmount.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, fromLocAmount.Amount.String(), v.Amount.String()))
+ }
+ fromLocAmount.Amount = fromLocAmount.Amount.Sub(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(fromLocAmount.Id).Update(fromLocAmount); err != nil {
+ return err
+ }
+ } else {
+ return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
+ }
+
+ if toLocAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
+ toLocAmount.Amount = toLocAmount.Amount.Add(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(toLocAmount.Id).Update(toLocAmount); err != nil {
+ return err
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: v.ToLocationID,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
+ }
+ }
+ }
+ return nil
+ })
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-// ListAll
+func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
+ var histories []*models.MoveHistory
+ operationMap := make(map[int]*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: v.FromLocationID,
+ FromLocation: v.FromLocation.Name,
+ ToLocationId: v.ToLocationID,
+ ToLocation: v.ToLocation.Name,
+ }
+ histories = append(histories, history)
+ }
+ operationMap[operation.Id] = operation
+ }
+ if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
+ return err
+ }
+ for _, history := range histories {
+ service.AddNewHistoryReportRecord(history, operationMap[history.OperationId])
+ }
+ return nil
+}
+
+//var (
+// ProductInventoryServiceConn *grpc.ClientConn
+// PurchaseServiceConn *grpc.ClientConn
+//)
+//
+//func InitProductInventoryServiceConn() {
+// var err error
+// ProductInventoryServiceConn, err = grpc.Dial(conf.GrpcServerConf.CrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+// if err != nil {
+// logx.Errorf("grpc dial product service error: %v", err.Error())
+// return
+// }
+// PurchaseServiceConn, err = grpc.Dial(conf.GrpcServerConf.SrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+// if err != nil {
+// logx.Errorf("grpc dial product service error: %v", err.Error())
+// return
+// }
+//}
+//
+//func CloseProductInventoryServiceConn() {
+// if ProductInventoryServiceConn != nil {
+// ProductInventoryServiceConn.Close()
+// }
+// if PurchaseServiceConn != nil {
+// PurchaseServiceConn.Close()
+// }
+//}
+
+func UpdateOutStatus(source, number string, status int64) {
+ if source == "CRM" {
+ cl := product_inventory.NewProductInventoryServiceClient(init_client.CrmConn)
+ _, err := cl.UpdateSalesDetailStatus(context.Background(), &product_inventory.UpdateSalesDetailStatusRequest{
+ Number: number,
+ SalesDetailStatus: "宸插嚭搴�",
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
+ }
+ }
+ if source == "APS_APPLY_MATERIAL" {
+ cl := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ _, err := cl.UpdateMaterialApplyStatus(context.Background(), &inventory_order.UpdateMaterialApplyStatusRequest{
+ Number: number,
+ Status: status,
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
+ }
+ }
+}
+
+func UpdatePurchaseStatus(source, number string) {
+ if source == "SRM_PURCHASE" {
+ cl := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
+ _, err := cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
+ if err != nil {
+ logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
+ }
+ }
+}
+
+// ListTransfer
// @Tags 鍏ュ簱/鍑哄簱
-// @Summary 璋冩嫧
+// @Summary 搴撳瓨璋冩嫧鍒楄〃
// @Produce application/json
// @Param object body request.OperationAllList true "鍙傛暟"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/operation/listAll [post]
-func (slf OperationController) ListAll(c *gin.Context) {
+// @Router /api-wms/v1/operation/listTransfer [post]
+func (slf OperationController) ListTransfer(c *gin.Context) {
var params request.OperationAllList
if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
@@ -412,15 +745,354 @@
search.SetPage(params.Page, params.PageSize)
search.SetPage(params.Page, params.PageSize)
if params.Number != "" {
- search.SetNumber(params.Number)
+ search.SetKeyword(params.Number)
}
- if params.SourceNumber != "" {
- search.SetSourceNumber(params.SourceNumber)
- }
- list, total, err := search.SetPreload(true).SetOrder("created_at desc").Find()
+ list, total, err := search.SetPreload(true).SetBaseOperationType(constvar.BaseOperationTypeInternal).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
return
}
util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
}
+
+// GetLogisticCompanyList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇鐗╂祦鍏徃鍒楄〃
+// @Produce application/json
+// @Success 200 {object} util.ResponseList{data=[]models.LogisticCompany} "鎴愬姛"
+// @Router /api-wms/v1/operation/getLogisticCompanyList [get]
+func (slf OperationController) GetLogisticCompanyList(c *gin.Context) {
+ companies, err := models.NewLogisticCompanySearch().FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, companies)
+}
+
+// Cancel
+//
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鍙栨秷
+// @Produce application/json
+// @Param id path int true "id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/cancel/{id} [put]
+func (slf OperationController) Cancel(c *gin.Context) {
+ id, err := strconv.Atoi(c.Param("id"))
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "閿欒鐨刬d鍊�")
+ return
+ }
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "id涓�0")
+ return
+ }
+ operation, err := models.NewOperationSearch().SetPreload(true).SetID(id).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶鍙栨秷")
+ 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
+ }
+ //鏇存柊aps鐗╂枡鐢宠鐘舵��
+ if operation.Source == "APS_APPLY_MATERIAL" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 3)
+ }
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
+}
+
+// outputOperation
+//
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鎵撳嵃
+// @Produce application/json
+// @Param id path int true "id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/outputOperation/{id} [put]
+func (slf OperationController) OutputOperation(c *gin.Context) {
+ id, err := strconv.Atoi(c.Param("id"))
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "閿欒鐨刬d鍊�")
+ return
+ }
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "id涓�0")
+ return
+ }
+ operation, err := models.NewOperationSearch().SetPreload(true).SetID(id).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
+ return
+ }
+ if len(operation.Details) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "娌℃湁鐩稿叧浜у搧鏄庣粏鐨勪俊鎭�")
+ return
+ }
+
+ var fileUrl string
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else {
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, fileUrl)
+}
+
+func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
+ }
+
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ readerCloser.Close()
+ defer f.Close()
+
+ style, _ := f.NewStyle(&excelize.Style{
+ Border: []excelize.Border{
+ {Type: "left", Color: "#000000", Style: 2},
+ {Type: "top", Color: "#000000", Style: 2},
+ {Type: "bottom", Color: "#000000", Style: 2},
+ {Type: "right", Color: "#000000", Style: 2},
+ },
+ Alignment: &excelize.Alignment{
+ Horizontal: "center",
+ Vertical: "center",
+ },
+ })
+ styleLeft, _ := f.NewStyle(&excelize.Style{
+ Alignment: &excelize.Alignment{
+ Horizontal: "left",
+ Vertical: "center",
+ },
+ })
+
+ f.SetCellValue("Sheet1", "B3", operation.CompanyName)
+ f.SetCellValue("Sheet1", "E3", operation.OperationDate)
+ f.SetCellValue("Sheet1", "H3", operation.Number)
+
+ rowIndex := 5
+ totalAmount := decimal.NewFromInt(0)
+ for _, v := range operation.Details {
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), v.ProductId)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Specs)
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Product.Unit)
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Amount.String())
+ f.SetCellValue("Sheet1", "H"+strconv.Itoa(rowIndex), v.ToLocation.Name)
+ f.SetCellValue("Sheet1", "I"+strconv.Itoa(rowIndex), operation.Comment)
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+ if err := f.MergeCell("Sheet1", "A"+strconv.Itoa(rowIndex), "C"+strconv.Itoa(rowIndex)); err != nil {
+ return "", err
+ }
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), "鍚堣")
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), totalAmount.String())
+ f.SetCellStyle("Sheet1", "A4", "I"+strconv.Itoa(rowIndex), style)
+ rowIndex++
+
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), "瀹℃牳锛�")
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), "妫�楠岋細")
+ f.SetCellValue("Sheet1", "G"+strconv.Itoa(rowIndex), "淇濈锛�")
+ f.SetCellStyle("Sheet1", "A"+strconv.Itoa(rowIndex), "G"+strconv.Itoa(rowIndex), styleLeft)
+
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ return "", err
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
+
+ return fileUrl, nil
+}
+
+func ExportOutputOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ repositoryLevels := strings.Split(operation.Location.JointName, "/")
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
+ }
+
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ readerCloser.Close()
+ defer f.Close()
+
+ style, _ := f.NewStyle(&excelize.Style{
+ Border: []excelize.Border{
+ {Type: "left", Color: "#000000", Style: 1},
+ {Type: "top", Color: "#000000", Style: 1},
+ {Type: "bottom", Color: "#000000", Style: 1},
+ {Type: "right", Color: "#000000", Style: 1},
+ },
+ Alignment: &excelize.Alignment{
+ Horizontal: "center",
+ Vertical: "center",
+ },
+ })
+
+ 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)
+ totalWeight := decimal.NewFromInt(0)
+
+ addRows := len(operation.Details) - 1
+ if addRows > 0 {
+ f.InsertRows("Sheet1", 9, addRows)
+ f.SetCellStyle("Sheet1", "A9", "K"+strconv.Itoa(rowIndex+addRows), style)
+ }
+
+ for k, v := range operation.Details {
+ productTotalWeight := v.Amount.Mul(v.Product.Weight).Div(decimal.NewFromInt(1000))
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), k+1)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "H"+strconv.Itoa(rowIndex), v.Amount)
+ f.SetCellValue("Sheet1", "I"+strconv.Itoa(rowIndex), v.Product.Weight)
+ f.SetCellValue("Sheet1", "J"+strconv.Itoa(rowIndex), productTotalWeight)
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ totalWeight = totalWeight.Add(productTotalWeight)
+ }
+
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ return "", err
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
+
+ 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(init_client.SrmConn)
+ 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(init_client.CrmConn)
+ 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)
+}
+
+// ListByCondition
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鍑哄叆搴撴槑缁�
+// @Produce application/json
+// @Param object body request.OperationCondition true "鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/listByCondition [post]
+func (slf OperationController) ListByCondition(c *gin.Context) {
+ var params request.OperationCondition
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if !params.PageInfo.Check() {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒")
+ return
+ }
+
+ db := mysqlx.GetDB().Table("wms_operation").
+ Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id,from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").
+ InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").
+ InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").
+ InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation_details.from_location_id").
+ InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation_details.to_location_id")
+ if params.Condition != "" {
+ db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or from_location.`name` like ? or to_location.`name` like ? or material.`name` like ? ", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%")
+ }
+ var (
+ records = make([]*response.InventoryHistory, 0)
+ total int64
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+
+ if err := db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize).Order("wms_operation.created_at desc").Find(&records).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
+}
--
Gitblit v1.8.0