From 7d4f02f6a8066018911d09bad42c5c540abaa66b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 11 三月 2024 15:18:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/operation.go | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 2a2b48f..ae51152 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
}
@@ -859,11 +860,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 +941,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 +1090,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