|
@@ -158,11 +158,11 @@ func (gs *GridService) OpenGrid(gridId int) (err error) {
|
|
|
|
|
|
func (gs *GridService) GetGridUseInfo(cabinetIds []int) (use int64, noUse int64, err error) {
|
|
|
|
|
|
- err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("grid_info != ?", "请假中").Where("stone_state = ?", "未存物").Count(&noUse).Error
|
|
|
+ err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("grid_info in ?", []string{"未存入", "非正常取出", "已取出"}).Where("stone_state = ?", "未存物").Count(&noUse).Error
|
|
|
if err != nil {
|
|
|
return use, noUse, rescode.RegisterErrorWithCause(err, code.ErrCodeMap[code.ErrDatabaseCode])
|
|
|
}
|
|
|
- err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("grid_info != ?", "请假中").Where("stone_state = ?", "存物").Count(&use).Error
|
|
|
+ err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("grid_info in ?", []string{model.GridNoRecharge, model.GridRecharging, model.GridRechargeFull}).Where("stone_state = ?", "存物").Count(&use).Error
|
|
|
if err != nil {
|
|
|
return use, noUse, rescode.RegisterErrorWithCause(err, code.ErrCodeMap[code.ErrDatabaseCode])
|
|
|
}
|