From aeed976c2999e2cea097cdee38d8baeefe323f3d Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 30 三月 2024 16:15:59 +0800
Subject: [PATCH] 修改
---
controllers/operation.go | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 2a2b48f..c585774 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -408,6 +408,7 @@
return
}
if len(locAmountList) > 0 {
+ mapLocAmount = make(map[string]*models.LocationProductAmount)
for _, v := range locAmountList {
mapLocAmount[strconv.Itoa(v.LocationId)+v.ProductId] = v
}
@@ -537,9 +538,6 @@
return err
}
}
- if operation.Source != "" {
- go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
- }
}
@@ -581,9 +579,6 @@
return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
}
}
- if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
- }
}
if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
@@ -623,6 +618,17 @@
if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
+ }
+ //淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ if operation.Source != "" {
+ go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
+ go UpdateOutsourceOrder(operation.Source, operation.SourceNumber, operation.Id, listDetails)
+ }
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operation.Source != "" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
+ }
}
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
@@ -715,10 +721,36 @@
func UpdatePurchaseStatus(source, number string) {
if source == "SRM_PURCHASE" {
+ count, err := models.NewOperationSearch().SetSourceNumber(number).SetStatus(constvar.OperationStatus_Ready).Count()
+ if err != nil || count > 0 {
+ return
+ }
cl := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
- _, err := cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
+ _, err = cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
if err != nil {
logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
+ }
+ }
+}
+
+func UpdateOutsourceOrder(source, number string, operationId int, details []*models.OperationDetails) {
+ if source == "APS_OUTSOURCING_RECEIVE" {
+ products := make([]*inventory_order.OperationProduct, 0)
+ for _, detail := range details {
+ if operationId == detail.OperationID {
+ var op inventory_order.OperationProduct
+ op.ProductNumber = detail.ProductId
+ op.Amount = detail.Amount.IntPart()
+ products = append(products, &op)
+ }
+ }
+ cl := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ _, err := cl.UpdateOutsourceOrder(context.Background(), &inventory_order.UpdateOutsourceOrderRequest{
+ OutsourceNumber: number,
+ Products: products,
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateOutsourceOrder service error: %v", err)
}
}
}
@@ -859,11 +891,11 @@
}
func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
- readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
@@ -940,11 +972,11 @@
func ExportOutputOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
repositoryLevels := strings.Split(operation.Location.JointName, "/")
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
- readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
@@ -1089,7 +1121,7 @@
return
}
- if err := db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize).Find(&records).Error; err != nil {
+ 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
}
--
Gitblit v1.8.0