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

zhangqian

2024-01-12 a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c

 models/operation.go

@@ -13,27 +13,27 @@
   Operation struct {
      WmsModel
      Id                int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      Number            string                   `json:"number" gorm:"type:varchar(255)"`                                 //单号
      SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //源单号
      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"`    //目标位置
      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-客户"`
      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"`
      LogisticCompany   LogisticCompany          `json:"logisticCompany"      gorm:"foreignKey:LogisticCompanyId"`
      WaybillNumber     string                   `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`    //运单号
      Weight            decimal.Decimal          `gorm:"type:decimal(20,2);comment:重量" json:"weight"`           //重量
      LogisticWeight    decimal.Decimal          `gorm:"type:decimal(20,2);comment:物流重量" json:"logisticWeight"` //物流重量
      Source            string                   `json:"source" gorm:"type:varchar(255);comment:来源系统,用于返回修改状态"`
      Number            string                   `json:"number" gorm:"type:varchar(255)"`                           //单号
      SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                     //源单号
      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"`    //目标位置
      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-客户"`
      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"`
      LogisticCompany   LogisticCompany `json:"logisticCompany"      gorm:"foreignKey:LogisticCompanyId"`
      WaybillNumber     string          `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`    //运单号
      Weight            decimal.Decimal `gorm:"type:decimal(20,2);comment:重量" json:"weight"`           //重量
      LogisticWeight    decimal.Decimal `gorm:"type:decimal(20,2);comment:物流重量" json:"logisticWeight"` //物流重量
      Source            string          `json:"source" gorm:"type:varchar(255);comment:来源系统,用于返回修改状态"`

      Details           []*OperationDetails        `json:"details" gorm:"foreignKey:OperationID;references:Id"`
      BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型
@@ -42,6 +42,11 @@
      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"`          //源位置
      ToLocationID int      `json:"toLocationId"    gorm:"type:int;not null;comment:仓库位置id"`      //目标位置id
      ToLocation   Location `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"` //目标位置
   }

   OperationSearch struct {
@@ -158,7 +163,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("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation")
   }

   if slf.Disuse {
@@ -277,7 +282,7 @@
   if slf.PageNum*slf.PageSize > 0 {
      db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
   }
   if err := db.Preload("FromLocation").Preload("ToLocation").Order("created_at desc").Find(&records).Error; err != nil {
   if err := db.Order("created_at desc").Find(&records).Error; err != nil {
      return records, total, fmt.Errorf("find records err: %v", err)
   }