增加根据位置或仓库查询产品及库存列表

zhangqian

2024-07-04 c950586b718ae6fc198bedf424609a4ac94cb5d1

 models/operation.go

@@ -61,10 +61,11 @@
      CheckedBy    string `json:"checkedBy" gorm:"type:varchar(255);comment:验证者UserId"`
      Remark       string `json:"remark"`

      WarehouseId         int      `json:"warehouseId" gorm:"type:int;not null;comment:仓库id"`
      IsInternalOutput    bool     `json:"isInternalOutput"` //是否调拨产生的出库
      InventoryDealerType int      `json:"inventoryDealerType" gorm:"type:varchar(255);comment:调拨出入库分类(对应dict字典表的ID)"`
      InventoryDealer     MiniDict `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
      WarehouseId         int       `json:"warehouseId" gorm:"type:int;not null;default:0;comment:仓库id"`
      Warehouse           Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"`
      IsInternalOutput    bool      `json:"isInternalOutput"` //是否调拨产生的出库
      InventoryDealerType int       `json:"inventoryDealerType" gorm:"type:varchar(255);comment:调拨出入库分类(对应dict字典表的ID)"`
      InventoryDealer     MiniDict  `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
   }

   OperationSearch struct {
@@ -92,6 +93,12 @@

func NewOperationSearch() *OperationSearch {
   return &OperationSearch{Orm: mysqlx.GetDB()}
}

func (slf *OperationSearch) BeforeCreate(tx *gorm.DB) {
   for k := range slf.Details {
      slf.Details[k].BaseOperationType = slf.BaseOperationType
   }
}

func (slf *OperationSearch) SetOrm(tx *gorm.DB) *OperationSearch {
@@ -195,6 +202,11 @@
   return slf
}

func (slf *OperationSearch) SetWarehouseId(warehouseId int) *OperationSearch {
   slf.WarehouseId = warehouseId
   return slf
}

func (slf *OperationSearch) build() *gorm.DB {
   var db = slf.Orm.Model(&Operation{})

@@ -226,7 +238,14 @@
   }

   if slf.Preload {
      db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("Location").Preload("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation").Preload("InventoryDealer")
      db = db.Model(&Operation{}).Preload("Details").
         Preload("Details.Product").
         Preload("LogisticCompany").
         Preload("Location").
         Preload("ToLocation").
         Preload("Details.FromLocation").
         Preload("Details.ToLocation").
         Preload("InventoryDealer").Preload("Warehouse")
   }

   if slf.Disuse {
@@ -269,6 +288,10 @@
      db = db.Where("inventory_dealer_type in (?)", slf.InventoryDealerTypeIds)
   }

   if slf.WarehouseId != 0 {
      db = db.Where("warehouse_id = ?", slf.WarehouseId)
   }

   return db
}