调整operation去掉FromLocationID,ToLocationID,以及所有调整。

jiangshuai

2023-12-28 47847bb0325c27039c1c32b5debe02f8552a2324

 models/operation.go

@@ -18,10 +18,10 @@
      OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"`         //作业类型id
      OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:作业类型名称"`       //作业类型名称
      Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`                  //状态
      FromLocationID    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
      FromLocation      Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
      ToLocationID      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
      ToLocation        Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
      //FromLocationID    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
      //FromLocation      Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
      //ToLocationID      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
      //ToLocation        Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
      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:联系人姓名"`
@@ -42,6 +42,9 @@
      ReceiverName  string `json:"receiverName" gorm:"type:varchar(31);comment:收货人姓名"`
      ReceiverPhone string `json:"receiverPhone" gorm:"type:varchar(31);comment:联系电话"`
      ReceiverAddr  string `json:"receiverAddr" gorm:"type:varchar(255);comment:收货地址"`

      LocationID int      `json:"locationID"   gorm:"type:int;not null;comment:源位置id"` //源位置id
      Location   Location `json:"location" gorm:"foreignkey:locationID;references:Id"` //源位置
   }

   OperationSearch struct {
@@ -158,7 +161,7 @@
   }

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

   if slf.Disuse {