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

jiangshuai

2023-11-15 57c1d91e82ec4085ccedf099063cd14e609a301f

 controllers/reorder_rule_controller.go

@@ -17,6 +17,7 @@
   "wms/pkg/logx"
   "wms/pkg/timex"
   "wms/proto/inventory_order"
   "wms/proto/purchase_wms"
   "wms/request"
)

@@ -289,6 +290,16 @@
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   if params.Route == "采购" {
      client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
      resp, err := client.GetSupplierListByProductId(c, &purchase_wms.GetSupplierListByProductIdRequest{ProductId: params.ProductId})
      if err != nil {
         util.ResponseFormat(c, code.RequestParamError, "grpc调用失败")
         return
      }
      util.ResponseFormat(c, code.Success, resp.List)
      return
   }
   client := inventory_order.NewInventoryOrderServiceClient(InventoryOrderServiceConn)
   order, err := client.CreateNewOrder(c, &inventory_order.CreateNewOrderRequest{
      OrderNumber: params.OrderNumber.IntPart(),
@@ -300,18 +311,25 @@
      util.ResponseFormat(c, code.RequestParamError, "grpc调用失败")
      return
   }
   err = orderAgain(params, order.OrderId)
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "重订失败")
      return
   }
   util.ResponseFormat(c, code.Success, "重订成功")
}

func orderAgain(params models.ReorderRule, SourceNumber string) error {
   location, err := models.NewLocationSearch().SetID(params.LocationId).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查询位置信息失败")
      return
      return err
   }
   houseCode := strings.Split(location.JointName, "/")[0]
   var operationType models.OperationType
   err = models.NewOperationTypeSearch().Orm.Model(&models.OperationType{}).Joins("left join wms_warehouse on wms_job_type.warehouse_id = wms_warehouse.id").
      Where("wms_job_type.base_operation_type = 1 and wms_warehouse.code = ?", houseCode).First(&operationType).Error
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查询位置信息失败")
      return
      return err
   }
   var operation models.Operation
   var details models.OperationDetails
@@ -327,7 +345,7 @@
   operation.FromLocationID = 1
   operation.Number = strconv.FormatInt(time.Now().Unix(), 10)
   operation.ToLocationID = params.LocationId
   operation.SourceNumber = order.OrderId
   operation.SourceNumber = SourceNumber

   err = models.WithTransaction(func(db *gorm.DB) error {
      if err = models.NewOperationSearch().SetOrm(db).Create(&operation); err != nil {
@@ -337,9 +355,32 @@
      err = models.NewReorderRuleSearch().SetOrm(db).SetID(params.Id).Update(&params)
      return err
   })

   return err
}

// SubmitOrder
// @Tags      重订货规则
// @Summary   再订一次
// @Produce   application/json
// @Param     object  body  models.ReorderRule true  "参数"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/reorderRule/submitOrder [post]
func (slf ReorderRuleController) SubmitOrder(c *gin.Context) {
   var params models.ReorderRule
   client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
   resp, err := client.CreatePurchaseByWms(c, &purchase_wms.CreatePurchaseByWmsRequest{
      SupplierId: params.SupplierId,
      ProductId:  params.ProductId,
      Amount:     params.OrderNumber.IntPart(),
   })
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "grpc调用失败")
      return
   }
   err = orderAgain(params, resp.PurchaseNumber)
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "重订失败")
      return
   }
   util.ResponseFormat(c, code.Success, "重订成功")
}