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

jiangshuai

2023-10-18 97f8c17ef33e511d515164f1b1f00dd0fb9cd01f

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

 controllers/report_forms_controller.go

@@ -134,7 +134,7 @@
    for _, detail := range details {
        operationIds = append(operationIds, detail.OperationID)
    }
    //获取操作记录
    //获取已完成的操作记录
    operations, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).FindNotTotal()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查询操作记录失败")
@@ -145,11 +145,12 @@
        var resp response.InventoryHistory
        resp.Amount = detail.Amount
        resp.Unit = params.Unit
        resp.ProductName = params.ProductName
        for _, operation := range operations {
            if detail.OperationID == operation.Id {
                resp.Number = operation.Number
                resp.Date = operation.UpdateTime
                resp.BaseOperationType = operation.BaseOperationType
                resp.Status = "完成"
                resp.ContactedName = operation.ContacterName
                resp.FromLocation = operation.FromLocation.Name
                resp.ToLocation = operation.ToLocation.Name

 controllers/warehouse.go

@@ -54,7 +54,36 @@
        return
    }
    params.LocationId = locationId
    if err := models.NewWarehouseSearch().Create(&params); err != nil {
    err = models.WithTransaction(func(tx *gorm.DB) error {
        err := models.NewWarehouseSearch().SetOrm(tx).Create(&params)
        if err != nil {
            return err
        }
        //创建三个默认操作类型
        var types []*models.OperationType
        inType := &models.OperationType{
            Name:              params.Name + "-入库",
            BaseOperationType: constvar.BaseOperationTypeIncoming,
            WarehouseId:       params.Id,
        }
        types = append(types, inType)
        outType := &models.OperationType{
            Name:              params.Name + "-出库",
            BaseOperationType: constvar.BaseOperationTypeOutgoing,
            WarehouseId:       params.Id,
        }
        types = append(types, outType)
        internalType := &models.OperationType{
            Name:              params.Name + "-内部调拨",
            BaseOperationType: constvar.BaseOperationTypeInternal,
            WarehouseId:       params.Id,
        }
        types = append(types, internalType)
        err = models.NewOperationTypeSearch().SetOrm(tx).CreateBatch(types)
        return err
    })
    if err != nil {
        _ = models.NewLocationSearch().SetID(locationId).Delete()
        logx.Errorf("warehouse create err: %v", err)
        util.ResponseFormat(c, code.SaveFail, "插入失败")
        return
@@ -174,22 +203,31 @@
        return
    }

    //删除位置信息
    first, err := models.NewWarehouseSearch().SetID(id).First()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "获取仓库信息失败")
        return
    }
    err = models.NewLocationSearch().SetID(first.LocationId).Delete()
    err = models.WithTransaction(func(tx *gorm.DB) error {
        //删除位置信息
        err = models.NewLocationSearch().SetOrm(tx).SetJointName(first.Code).Delete()
        if err != nil {
            return err
        }
        //删除操作类型
        err = models.NewOperationTypeSearch().SetOrm(tx).SetWarehouseId(first.Id).Delete()
        if err != nil {
            return err
        }
        //删除仓库
        err = models.NewWarehouseSearch().SetOrm(tx).SetID(id).Delete()
        return err
    })
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "删除位置信息失败")
        util.ResponseFormat(c, code.RequestParamError, "删除仓库失败")
        return
    }
    err = models.NewWarehouseSearch().SetID(id).Delete()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "删除仓库信息失败")
        return
    }

    util.ResponseFormat(c, code.UpdateSuccess, "删除成功")
}


 docs/docs.go

@@ -3570,14 +3570,6 @@
                    "description": "数量",
                    "type": "number"
                },
                "baseOperationType": {
                    "description": "基础作业类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
                        }
                    ]
                },
                "contactedName": {
                    "description": "完成者",
                    "type": "string"
@@ -3592,6 +3584,14 @@
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "status": {
                    "description": "状态",
                    "type": "string"
                },
                "toLocation": {
@@ -3702,6 +3702,8 @@
    Description:      "",
    InfoInstanceName: "swagger",
    SwaggerTemplate:  docTemplate,
    LeftDelim:        "{{",
    RightDelim:       "}}",
}

func init() {

 docs/swagger.json

@@ -3558,14 +3558,6 @@
                    "description": "数量",
                    "type": "number"
                },
                "baseOperationType": {
                    "description": "基础作业类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
                        }
                    ]
                },
                "contactedName": {
                    "description": "完成者",
                    "type": "string"
@@ -3582,6 +3574,14 @@
                    "description": "单号",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "status": {
                    "description": "状态",
                    "type": "string"
                },
                "toLocation": {
                    "description": "目标位置",
                    "type": "string"

 docs/swagger.yaml

@@ -1173,10 +1173,6 @@
      amount:
        description: 数量
        type: number
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      contactedName:
        description: 完成者
        type: string
@@ -1189,6 +1185,12 @@
      number:
        description: 单号
        type: string
      productName:
        description: 产品名称
        type: string
      status:
        description: 状态
        type: string
      toLocation:
        description: 目标位置
        type: string

 models/material.go

@@ -12,7 +12,7 @@
    // Material 物料
    Material struct {
        BaseModelString
        Name string `gorm:"unique;type:varchar(191);not null;comment:物料名称" json:"name"` //物料名称
        Name string `gorm:"type:varchar(191);not null;comment:物料名称" json:"name"` //物料名称
        //MaterialType constvar.ProductType  `gorm:"index;type:int(11);comment:物料类型(数字)" json:"materialType"`
        Model constvar.MaterialMode `gorm:"type:varchar(191);not null;comment:物料类型(字符串)" json:"model"` //物料类型(字符串)
        //Explain           string                  `gorm:"type:varchar(512);comment:编号说明" json:"explain"`

 models/operation_type.go

@@ -103,6 +103,11 @@
    return slf
}

func (slf *OperationTypeSearch) SetWarehouseId(warehouseId int) *OperationTypeSearch {
    slf.WarehouseId = warehouseId
    return slf
}

func (slf *OperationTypeSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&OperationType{})

@@ -126,6 +131,10 @@
        db = db.Preload("Company").Preload("Warehouse").Preload("DefaultLocationSrc").Preload("DefaultLocationDest")
    }

    if slf.WarehouseId > 0 {
        db = db.Where("warehouse_id = ?", slf.WarehouseId)
    }

    return db
}


 response/report_forms_response.go

@@ -2,7 +2,6 @@

import (
    "github.com/shopspring/decimal"
    "wms/constvar"
)

type InventoryForms struct {
@@ -19,14 +18,15 @@
}

type InventoryHistory struct {
    Number            string                     `json:"number"`            //单号
    Date              string                     `json:"date"`              //日期
    FromLocation      string                     `json:"fromLocation"`      //源位置
    ToLocation        string                     `json:"toLocation"`        //目标位置
    Amount            decimal.Decimal            `json:"amount"`            //数量
    Unit              string                     `json:"unit"`              //单位
    ContactedName     string                     `json:"contactedName"`     //完成者
    BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //基础作业类型
    Number        string          `json:"number"`        //单号
    Date          string          `json:"date"`          //日期
    ProductName   string          `json:"productName"`   //产品名称
    FromLocation  string          `json:"fromLocation"`  //源位置
    ToLocation    string          `json:"toLocation"`    //目标位置
    Amount        decimal.Decimal `json:"amount"`        //数量
    Unit          string          `json:"unit"`          //单位
    ContactedName string          `json:"contactedName"` //完成者
    Status        string          `json:"status"`        //状态
}

type LocationForms struct {