From fe9a8f47ea30dbd9637c803563abd74bda46900a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 五月 2024 17:24:11 +0800
Subject: [PATCH] 每月1号执行
---
controllers/operation.go | 278 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 237 insertions(+), 41 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 37418a6..e334da1 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -2,7 +2,6 @@
import (
"context"
- "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
@@ -10,16 +9,15 @@
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
- "os"
"sort"
"strconv"
"strings"
"time"
+ "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
- "wms/opa"
"wms/pkg/logx"
"wms/pkg/mysqlx"
"wms/pkg/structx"
@@ -538,29 +536,26 @@
return err
}
}
- if operation.Source != "" {
- go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
- }
}
- if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing || operation.BaseOperationType == constvar.BaseOperationTypeDisuse {
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()))
- }
- }
+ //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()))
@@ -581,9 +576,6 @@
} else {
return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
}
- }
- if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
}
}
@@ -619,11 +611,43 @@
}
}
}
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeAdjust {
+ for _, v := range listDetails {
+ if locAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
+ locAmount.Amount = 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: 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
+ }
+ //淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
+ 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, "鎿嶄綔鎴愬姛")
@@ -716,10 +740,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)
}
}
}
@@ -839,32 +889,157 @@
}
var fileUrl string
+ companyName := conf.WebConf.CompanyName
+ if companyName == "" {
+ util.ResponseFormat(c, code.RequestParamError, "缂哄皯宸ュ巶鍚嶇О閰嶇疆")
+ return
+ }
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if companyName == "geruimi" {
+ 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
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(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)
+ m := make(map[string]string)
+ m["url"] = fileUrl
+ m["name"] = companyName
+ util.ResponseFormat(c, code.Success, m)
}
-func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+func JialianOperation(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.Attachment.FileUrl)
+ 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()
+
+ f.SetCellValue("Sheet1", "H2", operation.OperationDate)
+ f.SetCellValue("Sheet1", "O2", operation.Number)
+
+ rowIndex := 5
+ totalAmount := decimal.NewFromInt(0)
+ totalPrice := decimal.NewFromInt(0)
+ for i, v := range operation.Details {
+ //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
+ if i > 8 {
+ break
+ }
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Type)
+ f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Unit)
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Amount.String())
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.SalePrice.String())
+ if !v.Product.SalePrice.IsZero() {
+ ap := v.Amount.Mul(v.Product.SalePrice)
+ totalPrice = totalPrice.Add(ap)
+ price := ap.String()
+ split := strings.Split(price, ".")
+ if len(split) == 2 {
+ for n, a := range split[1] {
+ f.SetCellValue("Sheet1", string('M'+n)+strconv.Itoa(rowIndex), string(a))
+ }
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), s[:j])
+ break
+ }
+ f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), string(s[j]))
+ n++
+ }
+ }
+
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+ //鍚堣
+ if !totalPrice.IsZero() {
+ price := totalPrice.String()
+ split := strings.Split(price, ".")
+ if len(split) == 2 {
+ for n, a := range split[1] {
+ f.SetCellValue("Sheet1", string('M'+n)+"14", string(a))
+ }
+ } else {
+ f.SetCellValue("Sheet1", "M14", "0")
+ f.SetCellValue("Sheet1", "N14", "0")
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue("Sheet1", string('L'-n)+"14", s[:j])
+ break
+ }
+ f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
+ n++
+ }
+ }
+ f.SetCellValue("Sheet1", "D14", totalAmount)
+
+ f.SetCellValue("Sheet1", "B15", operation.Manager)
+ f.SetCellValue("Sheet1", "D15", operation.Accountant)
+ f.SetCellValue("Sheet1", "F15", operation.Custodian)
+
+ 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 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())
}
@@ -941,11 +1116,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())
}
@@ -1072,7 +1247,10 @@
}
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`").
+ 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`,material.weight,wms_operation.operation_type_name").
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").
@@ -1090,9 +1268,27 @@
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
}
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
+
+// GetPersonnelList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇浜哄憳鍒楄〃
+// @Produce application/json
+// @Param object body request.OperationCondition true "鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]inventory_order.WorkerInfo} "鎴愬姛"
+// @Router /api-wms/v1/operation/getPersonnelList [get]
+func (slf OperationController) GetPersonnelList(c *gin.Context) {
+ cli := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ list, err := cli.GetWorkerList(context.Background(), &inventory_order.GetWorkerListRequest{})
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍐呴儴閿欒")
+ logx.Error("grpc璋冪敤澶辫触, GetPersonnelList err : " + err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, list.List)
+}
--
Gitblit v1.8.0