采购单修改2

liujiandao

2024-04-07 4630cbf64d1d4f33376efaaec7b4fcb90b01bf05

 api/v1/test/product.go

@@ -159,49 +159,28 @@
// @accept application/json
// @Produce application/json
// @Param data query testReq.ProductSearch true "分页获取Product列表"
// @Param Authorization   header string true "token"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /p/getProductList [get]
func (pApi *ProductApi) GetProductList(c *gin.Context) {
   var pageInfo testReq.ProductSearch
   err := c.ShouldBindQuery(&pageInfo)
   var params testReq.ProductSearch
   err := c.ShouldBindQuery(&params)
   if err != nil {
      response.FailWithMessage(err.Error(), c)
      return
   }
   list, total, err := pService.GetProductInfoList(pageInfo)
   list, total, err := pService.GetProductInfoList(params)
   if err != nil {
      global.GVA_LOG.Error("获取失败!", zap.Error(err))
      response.FailWithMessage("获取失败", c)
      return
   }

   productList := make([]testResp.Product, 0, len(list))

   for _, item := range list {
      productList = append(productList, testResp.Product{
         Name:             item.Name,
         Number:           item.Number,
         SupplierId:       item.SupplierId,
         Unit:             item.Unit,
         PurchasePrice:    item.PurchasePrice,
         DeliveryTime:     item.DeliveryTime,
         ShippingDuration: item.ShippingDuration,
         Specifications:   item.Specifications,
         ModelNumber:      item.ModelNumber,
         ProductType:      "",
         MinimumStock:     item.MinimumStock,
         MaximumStock:     item.MaximumStock,
         Remark:           "",
         SupplierName:     item.Supplier.Name,
         CategoryName:     item.CategoryName,
      })
   }

   response.OkWithDetailed(response.PageResult{
      List:     list,
      Total:    total,
      Page:     pageInfo.Page,
      PageSize: pageInfo.PageSize,
      Page:     params.Page,
      PageSize: params.PageSize,
   }, "获取成功", c)
}

@@ -256,7 +235,7 @@
         Number:         item.ID,
         Unit:           item.Unit,
         Specifications: item.Specs,
         ModelNumber:    string(item.Model),
         ModelNumber:    item.Type,
         MinimumStock:   item.MinInventory.IntPart(),
         MaximumStock:   item.MaxInventory.IntPart(),
         Remark:         "",