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

zhangqian

2024-01-12 a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c

 models/operation_type.go

@@ -36,6 +36,7 @@
      ReturnOperationType           string                     `json:"returnOperationType" gorm:"-"`                                   //退货类型名称
      ReadyCount                    int                        `json:"readyCount" gorm:"-"`                                            //就绪数量
      FinishCount                   int                        `json:"finishCount" gorm:"-"`                                           //完成数量
      CancelCount                   int                        `json:"cancelCount" gorm:"-"`                                           //取消数量
   }

   OperationTypeSearch struct {
@@ -135,6 +136,10 @@
      db = db.Where("warehouse_id = ?", slf.WarehouseId)
   }

   if int(slf.BaseOperationType) != 0 {
      db = db.Where("base_operation_type = ?", slf.BaseOperationType)
   }

   return db
}