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

zhangqian

2024-07-04 c950586b718ae6fc198bedf424609a4ac94cb5d1

 models/operation.go

@@ -26,7 +26,7 @@
      OperationDate     string                   `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"`
      ContacterID       int                      `json:"contacterID" gorm:"type:int;comment:联系人ID"`
      ContacterName     string                   `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
      CompanyID         int                      `json:"companyID" gorm:"type:int;comment:公司ID-客户"`
      CompanyID         string                   `json:"companyID" gorm:"type:varchar(255);comment:公司ID-客户"`
      CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:公司名称-客户"`
      Comment           string                   `json:"comment" gorm:"type:text;comment:备注"`
      LogisticCompanyId string                   `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:物流公司id"`
@@ -57,23 +57,33 @@
      Accountant   string `json:"accountant" gorm:"type:varchar(255);comment:会计名称"`
      CustodianId  string `json:"custodianId" gorm:"type:varchar(255);comment:保管员id"`
      Custodian    string `json:"custodian" gorm:"type:varchar(255);comment:保管员名称"`
      CreatedBy    string `json:"createBy" gorm:"type:varchar(255);comment:创建者UserId"`
      CheckedBy    string `json:"checkedBy" gorm:"type:varchar(255);comment:验证者UserId"`
      Remark       string `json:"remark"`

      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 {
      Operation
      Order               string
      PageNum             int
      PageSize            int
      Keyword             string
      Orm                 *gorm.DB
      Preload             bool
      Disuse              bool
      Ids                 []int
      SourceNumbers       []string
      SalesDetailsNumbers []string
      Fields              string
      BeginTime           time.Time
      EndTime             time.Time
      Order                  string
      PageNum                int
      PageSize               int
      Keyword                string
      Orm                    *gorm.DB
      Preload                bool
      Disuse                 bool
      Ids                    []int
      SourceNumbers          []string
      SalesDetailsNumbers    []string
      Fields                 string
      BeginTime              time.Time
      EndTime                time.Time
      InventoryDealerTypeIds []int //
   }
)

@@ -83,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 {
@@ -181,6 +197,16 @@
   return slf
}

func (slf *OperationSearch) SetInventoryDealerTypeIds(inventoryDealerTypeArr []int) *OperationSearch {
   slf.InventoryDealerTypeIds = inventoryDealerTypeArr
   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{})

@@ -212,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")
      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 {
@@ -250,6 +283,15 @@
   if !slf.BeginTime.IsZero() && !slf.EndTime.IsZero() {
      db = db.Where("created_at between ? and ?", slf.BeginTime, slf.EndTime)
   }

   if len(slf.InventoryDealerTypeIds) > 0 {
      db = db.Where("inventory_dealer_type in (?)", slf.InventoryDealerTypeIds)
   }

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

   return db
}