jiangshuai
2023-09-21 1b874e0b21375fa2b3e51ee7967316bc2ad415e5
Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
3个文件已修改
11 ■■■■ 已修改文件
controllers/location.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/location.go 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/operation_type.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/location.go
@@ -35,7 +35,7 @@
        util.ResponseFormat(c, code.RequestParamError, "创建失败")
        return
    }
    util.ResponseFormat(c, code.RequestParamError, "创建成功")
    util.ResponseFormat(c, code.Success, "创建成功")
}
// GetLocationList
models/location.go
@@ -22,6 +22,9 @@
        IsReturnLocation     bool                          `json:"isReturnLocation" gorm:"type:tinyint;comment:是否退货位置"`   //是否退货位置
        ReplenishLocation    bool                          `json:"replenishLocation" gorm:"type:tinyint;comment:是否补充位置"`  //是否补充位置
        ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:下架策略"` //下架策略
        Notes                string                        `json:"notes" gorm:"type:varchar(255);comment:外部备注"`           //外部备注
        RecentlyCount        string                        `json:"recentlyCount" gorm:"type:varchar(255);comment:最近盘点"`   //最近盘点
        NextCount            string                        `json:"nextCount" gorm:"type:varchar(255);comment:下次盘点"`       //下次盘点
    }
    LocationSearch struct {
@@ -101,8 +104,8 @@
func (slf *LocationSearch) build() *gorm.DB {
    var db = slf.Orm.Table(slf.TableName())
    if slf.ID != 0 {
        db = db.Where("id = ?", slf.ID)
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }
    if slf.Order != "" {
models/operation_type.go
@@ -18,6 +18,7 @@
        Company           Company                    `json:"company" gorm:"foreignKey:CompanyId"`                           //公司
        WarehouseId       int                        `json:"warehouseId" gorm:"type:int;not null;comment:仓库id"`             //仓库id
        Warehouse         Warehouse                  `json:"warehouse" gorm:"foreignKey:WarehouseId"`                       //仓库
        Prefix            string                     `json:"prefix" gorm:"type:varchar(255);comment:前缀"`                    //前缀
        DefaultLocationSrcId  int      `json:"defaultLocationSrcId"   gorm:"type:int;not null;comment:默认源位置id"`  //默认源位置id
        DefaultLocationSrc    Location `json:"defaultLocationSrc"     gorm:"foreignKey:DefaultLocationSrcId"`    //默认源位置
@@ -29,6 +30,7 @@
        ReservationDaysBefore         int                        `json:"reservationDaysBefore" gorm:"type:int;"`                         //收货前几天
        ReservationDaysBeforePriority int                        `json:"ReservationDaysBeforePriority" gorm:"type:int;"`                 //在优先级的前几天
        ShowOperations                bool                       `json:"showOperations" gorm:"column:show_operations;type:int"`          //显示作业详情
        EarlyOperations               bool                       `json:"earlyOperations" gorm:"type:int;comment:预填写作业详情"`                //预填写作业详情
        CreateBackorder               constvar.WhetherType       `json:"createBackorder" gorm:"column:create_backorder"`                 //创建欠单
        ReturnOperationTypeID         int                        `json:"returnOperationTypeID" gorm:"column:return_job_type_id"`         //退货类型ID
        ReturnOperationType           string                     `json:"returnOperationType" gorm:"-"`                                   //退货类型名称