From ed3d45b189f102249eabd0cb5a0299bc66b0dea6 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期一, 18 十二月 2023 21:04:12 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- controllers/operation.go | 424 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 352 insertions(+), 72 deletions(-) diff --git a/controllers/operation.go b/controllers/operation.go index b673452..e467303 100644 --- a/controllers/operation.go +++ b/controllers/operation.go @@ -8,24 +8,29 @@ "github.com/gin-gonic/gin" "github.com/shopspring/decimal" "github.com/xuri/excelize/v2" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials/insecure" "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" + "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" ) @@ -72,8 +77,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()) @@ -140,6 +156,10 @@ return errors.New("璇峰~鍏ユ簮鍗曞彿") } + if params.Number == "" { + return errors.New("璇峰~鍏ュ崟鍙�") + } + if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 { return errors.New("鏈瘑鍒璁板綍绫诲瀷") } @@ -166,6 +186,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, "鍙傛暟瑙f瀽澶辫触锛屽弬鏁颁笉鑳戒负绌�") + 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 @@ -335,9 +379,12 @@ util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚") return } - if err := models.WithTransaction(func(tx *gorm.DB) error { + 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 { + 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 } @@ -404,7 +451,6 @@ // return err //} - //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁 locAmount, err := models.NewLocationProductAmountSearch(). SetProductId(v.ID). SetLocationId(locationRule.LocationId). @@ -454,7 +500,6 @@ // return err //} - //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁 locAmount, err := models.NewLocationProductAmountSearch(). SetProductId(v.ID). SetLocationId(locationRule.LocationId). @@ -471,7 +516,6 @@ return res.Error } } else { - //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁 locAmount, err := models.NewLocationProductAmountSearch(). SetProductId(v.ID). SetLocationId(operation.ToLocationID). @@ -495,8 +539,8 @@ return err } } - if operation.SourceNumber != "" { - go UpdatePurchaseStatus(operation.SourceNumber) + if operation.Source != "" { + go UpdatePurchaseStatus(operation.Source, operation.SourceNumber) } } @@ -528,10 +572,13 @@ } locAmount, res := models.NewLocationProductAmountSearch(). SetProductId(v.ID). - SetLocationId(operation.ToLocationID). + SetLocationId(operation.FromLocationID). FirstRes() if res.Error != nil { - return err + if res.Error == gorm.ErrRecordNotFound { + return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱") + } + return res.Error } if locAmount.Amount.LessThan(value) { return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String())) @@ -541,8 +588,8 @@ return err } } - if operation.SourceNumber != "" { - go UpdateSalesDetailStatus(operation.SourceNumber) + if operation.Source != "" { + go UpdateOutStatus(operation.Source, operation.Number, 4) } } @@ -695,7 +742,8 @@ } } return nil - }); err != nil { + }) + if err != nil { util.ResponseFormat(c, code.RequestError, err.Error()) return } @@ -703,50 +751,98 @@ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛") } -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 +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: operation.FromLocationID, + FromLocation: operation.FromLocation.Name, + ToLocationId: operation.ToLocationID, + ToLocation: operation.ToLocation.Name, + } + histories = append(histories, history) + } + operationMap[operation.Id] = operation } - 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 + 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 CloseProductInventoryServiceConn() { - if ProductInventoryServiceConn != nil { - ProductInventoryServiceConn.Close() - } - if PurchaseServiceConn != nil { - PurchaseServiceConn.Close() - } -} - -func UpdateSalesDetailStatus(number string) { - client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn) - _, err := client.UpdateSalesDetailStatus(context.Background(), &product_inventory.UpdateSalesDetailStatusRequest{ - Number: number, - SalesDetailStatus: "宸插嚭搴�", - }) - if err != nil { - logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err) - } -} - -func UpdatePurchaseStatus(number string) { - client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn) - _, err := client.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number}) - if err != nil { - logx.Errorf("grpc dial UpdatePurchaseStatus 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) + } } } @@ -824,22 +920,27 @@ 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.Number, 3) + } util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛") } -// inputSelfmade +// outputOperation // // @Tags 鍏ュ簱/鍑哄簱 -// @Summary 鎵撳嵃-鑷埗-鍏ュ簱 +// @Summary 鎵撳嵃 // @Produce application/json // @Param id path int true "id" // @Success 200 {object} util.Response "鎴愬姛" -// @Router /api-wms/v1/operation/inputSelfmade/{id} [put] -func (slf OperationController) InputSelfmade(c *gin.Context) { +// @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鍊�") @@ -854,19 +955,48 @@ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error()) return } - - readerCloser, err := http.HttpGetWithReadCloser(conf.FileTemplateConf.InputSelfmadeAddr) - if err != nil { - util.ResponseFormat(c, code.RequestParamError, "鑾峰彇妯$増澶辫触:"+err.Error()) + 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().SetPreload(true).SetCategory(category).First() + if err != nil { + return "", errors.New("鑾峰彇妯$増璁板綍澶辫触:" + err.Error()) + } + readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl) + if err != nil { + return "", errors.New("鑾峰彇妯$増澶辫触:" + err.Error()) } f, err := excelize.OpenReader(readerCloser) if err != nil { - util.ResponseFormat(c, code.RequestParamError, "璇诲彇excel妯$増澶辫触锛�"+err.Error()) - return + return "", errors.New("璇诲彇excel妯$増澶辫触锛�" + err.Error()) } readerCloser.Close() + defer f.Close() style, _ := f.NewStyle(&excelize.Style{ Border: []excelize.Border{ @@ -905,8 +1035,7 @@ totalAmount = totalAmount.Add(v.Amount) } if err := f.MergeCell("Sheet1", "A"+strconv.Itoa(rowIndex), "C"+strconv.Itoa(rowIndex)); err != nil { - util.ResponseFormat(c, code.RequestParamError, err.Error()) - return + return "", err } f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), "鍚堣") f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), totalAmount.String()) @@ -920,16 +1049,167 @@ buf, err := f.WriteToBuffer() if err != nil { - util.ResponseFormat(c, code.RequestParamError, err.Error()) - return + return "", err } fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes()) if err != nil { logx.Errorf("file upload err: %v", err) - util.ResponseFormat(c, code.RequestParamError, err.Error()) + return "", err + } + + return fileUrl, nil +} + +func ExportOutputOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) { + repositoryLevels := strings.Split(operation.FromLocation.JointName, "/") + template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First() + if err != nil { + return "", errors.New("鑾峰彇妯$増璁板綍澶辫触:" + err.Error()) + } + readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.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), "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, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error()) + return + } + if !params.PageInfo.Check() { + util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒") return } - util.ResponseFormat(c, code.Success, fileUrl) + 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.from_location_id,from_location.`name` AS from_location,wms_operation.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.from_location_id").InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation.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 ?", "%"+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).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