From 96844c22ef3fba86a55e0af1b51bc1009d6fa950 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 20 十月 2023 11:57:48 +0800
Subject: [PATCH] 1.库存盘点bug修改
---
controllers/product_controller.go | 306 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 305 insertions(+), 1 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index ab40488..b9c02b5 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -1,11 +1,19 @@
package controllers
import (
+ "errors"
+ "fmt"
"github.com/gin-gonic/gin"
+ "github.com/shopspring/decimal"
"github.com/spf13/cast"
+ "gorm.io/gorm"
+ "strconv"
+ "time"
+ "wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
+ "wms/pkg/logx"
"wms/request"
"wms/utils"
)
@@ -68,12 +76,28 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- products, total, err := search.SetKeyword(params.KeyWord).SetOrder("created_at desc").Find()
+ products, total, err := search.SetKeyword(params.KeyWord).SetCategoryId(params.CategoryId).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
}
+ ids := make([]int, 0)
+ for _, product := range products {
+ ids = append(ids, product.CategoryId)
+ }
+ categories, err := models.NewProductCategorySearch().SetIds(ids).FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "浜у搧绫诲瀷鏌ユ壘澶辫触")
+ return
+ }
+ for _, product := range products {
+ for _, category := range categories {
+ if product.CategoryId == int(category.ID) {
+ product.CategoryName = category.Name
+ }
+ }
+ }
util.ResponseFormatList(c, code.Success, products, int(total))
}
@@ -304,3 +328,283 @@
util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
}
+
+// AddDisuse
+// @Tags 浜у搧
+// @Summary 娣诲姞鎶ュ簾淇℃伅
+// @Produce application/json
+// @Param object body request.AddDisuse true "鍏ュ簱/鍑哄簱淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/product/addDisuse [post]
+func (slf ProductController) AddDisuse(c *gin.Context) {
+ var params request.AddDisuse
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if params.Amount.LessThanOrEqual(decimal.NewFromInt(0)) {
+ util.ResponseFormat(c, code.RequestParamError, "鏁伴噺寮傚父")
+ return
+ }
+ if params.FromLocationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨婧愪綅缃�")
+ return
+ }
+ if params.ToLocationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨鎶ュ簾浣嶇疆")
+ return
+ }
+ if params.SourceNumber == "" {
+ util.ResponseFormat(c, code.RequestParamError, "璇疯緭鍏ユ簮鍗曟嵁")
+ return
+ }
+ detail := &models.OperationDetails{
+ ProductId: params.ProductId,
+ Amount: params.Amount,
+ }
+ operation := models.Operation{
+ Number: strconv.FormatInt(time.Now().Unix(), 10),
+ SourceNumber: params.SourceNumber,
+ OperationTypeId: 0,
+ Status: constvar.OperationStatus_Ready,
+ FromLocationID: params.FromLocationId,
+ ToLocationID: params.ToLocationId,
+ OperationDate: time.Now().Format("2006-01-02 15:04:05"),
+ Details: []*models.OperationDetails{detail},
+ BaseOperationType: constvar.BaseOperationTypeDisuse,
+ }
+ if err := models.NewOperationSearch().Create(&operation); err != nil {
+ logx.Errorf("Operation create err: %v", err)
+ util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+// ListDisuse
+// @Tags 浜у搧
+// @Summary 鎶ュ簾鍒楄〃
+// @Produce application/json
+// @Param object body request.QueryDisuseList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/product/listDisuse [post]
+func (slf ProductController) ListDisuse(c *gin.Context) {
+ var params request.QueryDisuseList
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if !params.PageInfo.Check() {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒")
+ return
+ }
+
+ //db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,wms_operation_details.product_name,wms_operation_details.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id")
+
+ db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").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")
+
+ if params.Number != "" {
+ db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or material.name like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))
+ }
+ db = db.Where("wms_operation.operation_type_id=?", 0)
+ var (
+ records = make([]*models.ResponseDisuseList, 0)
+ total int64
+ )
+
+ //list, total, err := search.SetDisuse(true).SetPreload(true).SetOrder("created_at desc").Find()
+
+ if err := db.Count(&total).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
+ return
+ }
+ db = db.Preload("ToLocation").Preload("FromLocation")
+ if params.Page*params.PageSize > 0 {
+ db = db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
+ }
+ if err := db.Order("wms_operation.created_at desc").Find(&records).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
+ return
+ }
+ util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
+}
+
+// FinishDisuse
+//
+// @Tags 浜у搧
+// @Summary 楠岃瘉鎶ュ簾
+// @Produce application/json
+// @Param id path int true "id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/product/finishDisuse/{id} [put]
+func (slf ProductController) FinishDisuse(c *gin.Context) {
+ id, err := strconv.Atoi(c.Param("id"))
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "閿欒鐨刬d鍊�")
+ return
+ }
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "id涓�0")
+ return
+ }
+ operation, err := models.NewOperationSearch().SetID(id).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏充俊鎭�:"+err.Error())
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestError, "璇ラ獙璇佹棤娉曞畬鎴�")
+ return
+ }
+ if 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 {
+ return err
+ }
+ var listProdtId []string
+ var listProdt []*models.Material
+ mapProdt := make(map[string]decimal.Decimal)
+ listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
+ if err != nil {
+ return err
+ }
+ for _, v := range listDetails {
+ listProdtId = append(listProdtId, v.ProductId)
+ mapProdt[v.ProductId] = v.Amount
+ }
+ if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
+ return err
+ }
+ for k, v := range listProdt {
+ if value, ok := mapProdt[v.ID]; !ok {
+ return errors.New("浜у搧绉嶇被寮傚父")
+ } else {
+ if v.Amount.LessThan(value) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鎶ュ簾锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愭姤搴熸搷浣�", v.Name, v.Amount.String(), value.String()))
+ }
+ listProdt[k].Amount = listProdt[k].Amount.Sub(value)
+ if err := tx.Save(listProdt[k]).Error; err != nil {
+ return err
+ }
+ var locAmount models.LocationProductAmount
+ if err := models.NewLocationProductAmountSearch().Orm.
+ Table("wms_location_product_amount").
+ Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
+ Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).
+ First(&locAmount).Error; err != nil {
+ return err
+ }
+ if locAmount.Amount.LessThan(value) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+ }
+ locAmount.Amount = locAmount.Amount.Sub(value)
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+ }); err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
+}
+
+// UpdateDisuse
+// @Tags 浜у搧
+// @Summary 淇敼鎶ュ簾淇℃伅
+// @Produce application/json
+// @Param object body request.UpdateDisuse true "鍏ュ簱/鍑哄簱淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/product/updateDisuse [post]
+func (slf ProductController) UpdateDisuse(c *gin.Context) {
+ var params request.UpdateDisuse
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if params.Amount.LessThanOrEqual(decimal.NewFromInt(0)) {
+ util.ResponseFormat(c, code.RequestParamError, "鏁伴噺寮傚父")
+ return
+ }
+ if params.FromLocationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨婧愪綅缃�")
+ return
+ }
+ if params.ToLocationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨鎶ュ簾浣嶇疆")
+ return
+ }
+ if params.SourceNumber == "" {
+ util.ResponseFormat(c, code.RequestParamError, "璇疯緭鍏ユ簮鍗曟嵁")
+ return
+ }
+ if params.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestParamError, "璇ヤ俊鎭棤娉曚慨鏀�")
+ return
+ }
+ detail := &models.OperationDetails{
+ ProductId: params.ProductId,
+ //ProductName: params.ProductName,
+ Amount: params.Amount,
+ //Unit: params.Unit,
+ }
+ operation := models.Operation{
+ Id: params.Id,
+ Number: params.Number,
+ SourceNumber: params.SourceNumber,
+ OperationTypeId: 0,
+ Status: params.Status,
+ FromLocationID: params.FromLocationId,
+ ToLocationID: params.ToLocationId,
+ OperationDate: params.OperationDate,
+ Details: []*models.OperationDetails{detail},
+ }
+ if err := models.WithTransaction(func(tx *gorm.DB) error {
+ if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {
+ return err
+ }
+ operationSearch := models.NewOperationSearch().SetOrm(tx)
+ if err := operationSearch.Orm.Model(&operation).Association("Details").Replace(operation.Details); err != nil {
+ return err
+ }
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(params.Id).Save(&operation); err != nil {
+ return err
+ }
+ return nil
+ }); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触锛�"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+// ListHistory
+// @Tags 浜у搧
+// @Summary 浜у搧浣嶇疆鍘嗗彶淇℃伅
+// @Produce application/json
+// @Param object body request.QueryOperationHistory true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.Operation} "鎴愬姛"
+// @Router /api-wms/v1/product/listHistory [post]
+func (slf ProductController) ListHistory(c *gin.Context) {
+ var params request.QueryOperationHistory
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if !params.PageInfo.Check() {
+ util.ResponseFormat(c, code.RequestParamError, "椤电爜淇℃伅閿欒")
+ return
+ }
+
+ search := models.NewOperationSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetOrder("created_at desc")
+ search.SetOrm(search.Orm.InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation_details.product_id=? and (wms_operation.from_location_id=? or wms_operation.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
+
+ list, total, err := search.Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+
+ util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
+}
--
Gitblit v1.8.0