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

jiangshuai

2023-11-22 ed81fc8d860adb66676d4990e4ce0ff56cff79a6

 proto/product_inventory/server.go

@@ -93,7 +93,7 @@
      Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id").
      Where("wms_operation_details.product_id in (?)", productIds).
      Where("wms_operation.from_location_id in (?)", locationIds).Where("wms_operation.status = ?", constvar.OperationStatus_Ready).
      Where("wms_operation.base_operation_type in (?)", []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal}).
      Where("wms_operation.base_operation_type in (?)", []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse}).
      Find(&canUse).Error
   if err != nil {
      return nil, err
@@ -129,6 +129,7 @@
            cu = cu.Add(info.Amount)
         }
      }
      cu = at.Sub(cu)
      p.AvailableNumber = cu.String()

      products = append(products, &p)
@@ -155,7 +156,7 @@
   }
   operation.OperationTypeName = operationType.Name
   operation.OperationTypeId = operationType.Id
   location, err := models.NewLocationSearch().SetJointNames([]string{warehouse.Code}).First()
   location, err := models.NewLocationSearch().SetID(warehouse.LocationId).First()
   if err != nil {
      return nil, err
   }