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

liujiandao

2023-09-20 2baa7bad0482613829e217997c44a51d8ec0ec66

 request/operation.go

@@ -1,7 +1,7 @@
package request

import (
   "google.golang.org/genproto/googleapis/type/decimal"
   "github.com/shopspring/decimal"
   "wms/constvar"
)

@@ -15,6 +15,15 @@
   ToLocationId    int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"` //目标位置id
   OperationDate   string                   `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"`
   Details         []*OperationDetails      `json:"details"`
   CarrierID       int                      `json:"carrierID" gorm:"type:int;comment:承运商ID"`
   CarrierName     string                   `json:"carrierName" gorm:"type:varchar(63);comment:承运商名称"`
   Tracking        string                   `json:"tracking" gorm:"type:varchar(127);comment:追踪参考"`
   ContacterID     int                      `json:"contacterID" gorm:"type:int;comment:联系人ID"`
   ContacterName   string                   `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
   Weight          decimal.Decimal          `json:"weight" gorm:"type:decimal(20,2);comment:重量(kg)"`
   TransferWeight  decimal.Decimal          `json:"transferWeight" gorm:"type:decimal(20,2);comment:物流重量(kg)"`
   CompanyID       int                      `json:"companyID" gorm:"type:int;comment:公司ID"`
   CompanyName     string                   `json:"companyName" gorm:"type:varchar(127);comment:公司名称(kg)"`
}

type OperationDetails struct {
@@ -23,3 +32,29 @@
   Quantity       decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);not null;comment:数量"`       //数量
   FinishQuantity decimal.Decimal `json:"finishQuantity" gorm:"type:decimal(20,2);not null;comment:数量"` //完成数量
}

type OperationList struct {
   PageInfo
   OperationTypeId int `json:"operationTypeId" form:"operationTypeId"`
}

type UpdateOperation struct {
   Id              int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
   Number          string                   `json:"number" gorm:"column:number;type:varchar(255)"`           //单号
   SourceNumber    string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                   //源单号
   OperationTypeId int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"` //作业类型id
   Status          constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`          //状态
   FromLocationId  int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"` //源位置id
   ToLocationId    int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"` //目标位置id
   OperationDate   string                   `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"`
   Details         []*OperationDetails      `json:"details"`
   CarrierID       int                      `json:"carrierID" gorm:"type:int;comment:承运商ID"`
   CarrierName     string                   `json:"carrierName" gorm:"type:varchar(63);comment:承运商名称"`
   Tracking        string                   `json:"tracking" gorm:"type:varchar(127);comment:追踪参考"`
   ContacterID     int                      `json:"contacterID" gorm:"type:int;comment:联系人ID"`
   ContacterName   string                   `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
   Weight          decimal.Decimal          `json:"weight" gorm:"type:decimal(20,2);comment:重量(kg)"`
   TransferWeight  decimal.Decimal          `json:"transferWeight" gorm:"type:decimal(20,2);comment:物流重量(kg)"`
   CompanyID       int                      `json:"companyID" gorm:"type:int;comment:公司ID"`
   CompanyName     string                   `json:"companyName" gorm:"type:varchar(127);comment:公司名称(kg)"`
}