From 216c9e49dafdb7a5bd025f6d6fa899a33befc38c Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 17 四月 2024 10:33:01 +0800
Subject: [PATCH] 产品添加字段
---
controllers/operation.go | 139 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 127 insertions(+), 12 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index ae51152..450d03c 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -15,6 +15,7 @@
"strconv"
"strings"
"time"
+ "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
@@ -538,9 +539,6 @@
return err
}
}
- if operation.Source != "" {
- go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
- }
}
@@ -582,9 +580,6 @@
return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
}
}
- if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
- }
}
if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
@@ -624,6 +619,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, "鎿嶄綔鎴愬姛")
@@ -716,10 +722,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)
}
}
}
@@ -840,10 +872,18 @@
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
+ if conf.WebConf.CompanyName == "jialian" {
+ fileUrl, err = JialianInputOperation(operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else {
+ 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)
@@ -857,6 +897,60 @@
}
util.ResponseFormat(c, code.Success, fileUrl)
+}
+
+func JialianInputOperation(operation *models.Operation) (string, error) {
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(14).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()
+
+ f.SetCellValue("Sheet1", "C2", operation.CompanyName)
+ f.SetCellValue("Sheet1", "H2", operation.OperationDate)
+ f.SetCellValue("Sheet1", "O2", operation.Number)
+
+ rowIndex := 5
+ totalAmount := 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())
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+ 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) {
@@ -1072,7 +1166,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").
@@ -1096,3 +1193,21 @@
}
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