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

liujiandao

2023-10-21 26a2ae9619dfff4c43487ca39307c06be635c23f

 controllers/product_controller.go

@@ -535,6 +535,10 @@
      util.ResponseFormat(c, code.RequestParamError, "该信息无法修改")
      return
   }
   if params.ProductId == "" {
      util.ResponseFormat(c, code.RequestParamError, "请选择报废产品")
      return
   }
   detail := &models.OperationDetails{
      ProductId: params.ProductId,
      //ProductName: params.ProductName,
@@ -542,15 +546,16 @@
      //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},
      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},
      BaseOperationType: params.BaseOperationType,
   }
   if err := models.WithTransaction(func(tx *gorm.DB) error {
      if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {