调整listbycondition接口服务

jiangshuai

2023-12-12 ec58bf196fb360bfcec35ed784ae9da90ffa3d42

 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"
)
@@ -166,6 +171,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, "参数解析失败，参数不能为空")
      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 +364,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 +436,6 @@
               //   return err
               //}

               //TODO:出入库的finish和报废的finish都要增加对location_product_amount表数量的更新,因为此表有ProductCategory字段，所以operation_details表中要增加ProductCategoryId字段
               locAmount, err := models.NewLocationProductAmountSearch().
                  SetProductId(v.ID).
                  SetLocationId(locationRule.LocationId).
@@ -454,7 +485,6 @@
                  //   return err
                  //}

                  //TODO:出入库的finish和报废的finish都要增加对location_product_amount表数量的更新,因为此表有ProductCategory字段，所以operation_details表中要增加ProductCategoryId字段
                  locAmount, err := models.NewLocationProductAmountSearch().
                     SetProductId(v.ID).
                     SetLocationId(locationRule.LocationId).
@@ -471,7 +501,6 @@
                     return res.Error
                  }
               } else {
                  //TODO:出入库的finish和报废的finish都要增加对location_product_amount表数量的更新,因为此表有ProductCategory字段，所以operation_details表中要增加ProductCategoryId字段
                  locAmount, err := models.NewLocationProductAmountSearch().
                     SetProductId(v.ID).
                     SetLocationId(operation.ToLocationID).
@@ -495,8 +524,8 @@
               return err
            }
         }
         if operation.SourceNumber != "" {
            go UpdatePurchaseStatus(operation.SourceNumber)
         if operation.Source != "" {
            go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
         }

      }
@@ -528,10 +557,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 +573,8 @@
               return err
            }
         }
         if operation.SourceNumber != "" {
            go UpdateSalesDetailStatus(operation.SourceNumber)
         if operation.Source != "" {
            go UpdateOutStatus(operation.Source, operation.Number, 4)
         }
      }

@@ -695,7 +727,8 @@
         }
      }
      return nil
   }); err != nil {
   })
   if err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }
@@ -703,50 +736,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,9 +905,14 @@
      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, "操作成功")
}
@@ -895,6 +981,7 @@
      return "", errors.New("读取excel模版失败：" + err.Error())
   }
   readerCloser.Close()
   defer f.Close()

   style, _ := f.NewStyle(&excelize.Style{
      Border: []excelize.Border{
@@ -960,6 +1047,7 @@
}

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())
@@ -974,6 +1062,7 @@
      return "", errors.New("读取excel模版失败：" + err.Error())
   }
   readerCloser.Close()
   defer f.Close()

   style, _ := f.NewStyle(&excelize.Style{
      Border: []excelize.Border{
@@ -988,11 +1077,15 @@
      },
   })

   f.SetCellValue("Sheet1", "C2", operation.FromLocation.Name)
   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)
@@ -1030,3 +1123,78 @@
   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(&params); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误:"+err.Error())
      return
   }
   if !params.PageInfo.Check() {
      util.ResponseFormat(c, code.RequestParamError, "数据分页信息错误")
      return
   }

   db := mysqlx.GetDB().Table("wms_operation").Select("wms_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)
}