Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

jiangshuai

2023-09-25 541486c20ad74c2bcbb2e42137a116981b313787

 controllers/product_controller.go

@@ -82,6 +82,22 @@
      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))
}

@@ -343,10 +359,10 @@
      return
   }
   detail := &models.OperationDetails{
      ProductId:   params.ProductId,
      ProductName: params.ProductName,
      Amount:      params.Amount,
      Unit:        params.Unit,
      ProductId: params.ProductId,
      //ProductName: params.ProductName,
      Amount: params.Amount,
      //Unit:        params.Unit,
   }
   operation := models.Operation{
      Number:          strconv.FormatInt(time.Now().Unix(), 10),
@@ -384,7 +400,9 @@
      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,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.SourceNumber != "" {
      db = db.Where("wms_operation.source_number like ?", fmt.Sprintf("%%%v%%", params.SourceNumber))
@@ -515,10 +533,10 @@
      return
   }
   detail := &models.OperationDetails{
      ProductId:   params.ProductId,
      ProductName: params.ProductName,
      Amount:      params.Amount,
      Unit:        params.Unit,
      ProductId: params.ProductId,
      //ProductName: params.ProductName,
      Amount: params.Amount,
      //Unit:        params.Unit,
   }
   operation := models.Operation{
      Id:              params.Id,