新增操作类型增加基础操作类型和仓库id来支持库存盘点

zhangqian

2024-06-28 1691d8ee8fe10799d98b296625fd30183407ef25

 request/operation.go

@@ -14,28 +14,30 @@
   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"`
   ContacterID       int                 `json:"contacterID" gorm:"type:int;comment:联系人ID"`           //联系人ID-非必填
   ContacterName     string              `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"` //联系人姓名-非必填
   CompanyID         string              `json:"companyID"`                                           //公司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"`
   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"` //物流重量
   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
   ToLocationId      int                 `json:"toLocationId"    gorm:"type:int;not null;comment:仓库位置id"` //目标位置id
   ManagerId         string              `json:"managerId" gorm:"type:varchar(255);comment:主管id"`
   Manager           string              `json:"manager" gorm:"type:varchar(255);comment:主管名称"`
   AccountantId      string              `json:"accountantId" gorm:"type:varchar(255);comment:会计id"`
   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:保管员名称"`
   OperationDate     string                     `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"` //安排日期
   Details           []*OperationDetails        `json:"details"`
   ContacterID       int                        `json:"contacterID" gorm:"type:int;comment:联系人ID"`           //联系人ID-非必填
   ContacterName     string                     `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"` //联系人姓名-非必填
   CompanyID         string                     `json:"companyID"`                                           //公司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"`
   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"` //物流重量
   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
   ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:仓库位置id"` //目标位置id
   ManagerId         string                     `json:"managerId" gorm:"type:varchar(255);comment:主管id"`
   Manager           string                     `json:"manager" gorm:"type:varchar(255);comment:主管名称"`
   AccountantId      string                     `json:"accountantId" gorm:"type:varchar(255);comment:会计id"`
   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:保管员名称"`
   BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型 5库存盘点
   WarehouseId       int                        `json:"warehouseId" gorm:"type:int;not null;comment:仓库id"`             //仓库id
}

type OperationDetails struct {
@@ -59,9 +61,10 @@

type OperationList struct {
   PageInfo
   OperationTypeId int                      `json:"operationTypeId" form:"operationTypeId"`
   Number          string                   `json:"number"`
   Status          constvar.OperationStatus `json:"status"`
   OperationTypeId   int                        `json:"operationTypeId" form:"operationTypeId"`
   BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` // 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
   Number            string                     `json:"number"`
   Status            constvar.OperationStatus   `json:"status"`
}

type UpdateOperation struct {