1.拆分报废、调拨、盘点列表接口

jiangshuai

2023-10-21 e695d7c697196a36f8cdafc90e6a403a12707591

1.拆分报废、调拨、盘点列表接口

 controllers/operation.go

@@ -128,8 +128,8 @@
        return errors.New("请填入源单号")
    }

    if params.OperationTypeId == 0 {
        return errors.New("operationTypeId为0")
    if params.OperationTypeId == 0 || int(params.BaseOperationType) == 0 {
        return errors.New("未识别该记录类型")
    }

    if params.OperationDate == "" {
@@ -177,6 +177,9 @@
    search.SetPage(params.Page, params.PageSize)
    if params.Number != "" {
        search.SetKeyword(params.Number)
    }
    if int(params.Status) != 0 {
        search.SetStatus(params.Status)
    }
    list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
    if err != nil {
@@ -440,14 +443,14 @@
    util.ResponseFormat(c, code.Success, "操作成功")
}

// ListAll
// listTransfer
// @Tags      入库/出库
// @Summary   调拨
// @Summary   库存调拨列表
// @Produce   application/json
// @Param     object  body  request.OperationAllList true  "参数"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/operation/listAll [post]
func (slf OperationController) ListAll(c *gin.Context) {
// @Router    /api-wms/v1/operation/listTransfer [post]
func (slf OperationController) ListTransfer(c *gin.Context) {
    var params request.OperationAllList
    if err := c.BindJSON(&params); err != nil {
        util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误:"+err.Error())
@@ -463,7 +466,7 @@
    if params.Number != "" {
        search.SetKeyword(params.Number)
    }
    list, total, err := search.SetPreload(true).SetOrder("created_at desc").Find()
    list, total, err := search.SetPreload(true).SetBaseOperationType(constvar.BaseOperationTypeInternal).SetOrder("created_at desc").Find()
    if err != nil {
        util.ResponseFormat(c, code.RequestError, "查找失败:"+err.Error())
        return

 controllers/product_controller.go

@@ -399,9 +399,7 @@
        return
    }

    //db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,wms_operation_details.product_name,wms_operation_details.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id")

    db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id")
    db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)

    if params.Number != "" {
        db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or material.name like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))

 docs/docs.go

@@ -943,7 +943,7 @@
                }
            }
        },
        "/api-wms/v1/operation/listAll": {
        "/api-wms/v1/operation/listTransfer": {
            "post": {
                "produces": [
                    "application/json"
@@ -951,7 +951,7 @@
                "tags": [
                    "入库/出库"
                ],
                "summary": "调拨",
                "summary": "库存调拨列表",
                "parameters": [
                    {
                        "description": "参数",
@@ -3192,6 +3192,9 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/constvar.OperationStatus"
                }
            }
        },

 docs/swagger.json

@@ -931,7 +931,7 @@
                }
            }
        },
        "/api-wms/v1/operation/listAll": {
        "/api-wms/v1/operation/listTransfer": {
            "post": {
                "produces": [
                    "application/json"
@@ -939,7 +939,7 @@
                "tags": [
                    "入库/出库"
                ],
                "summary": "调拨",
                "summary": "库存调拨列表",
                "parameters": [
                    {
                        "description": "参数",
@@ -3180,6 +3180,9 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/constvar.OperationStatus"
                }
            }
        },

 docs/swagger.yaml

@@ -914,6 +914,8 @@
      pageSize:
        description: 每页大小
        type: integer
      status:
        $ref: '#/definitions/constvar.OperationStatus'
    type: object
  request.PageInfo:
    properties:
@@ -1844,7 +1846,7 @@
      summary: 入库/出库列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/listAll:
  /api-wms/v1/operation/listTransfer:
    post:
      parameters:
      - description: 参数
@@ -1860,7 +1862,7 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 调拨
      summary: 库存调拨列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/operation:

 models/operation.go

@@ -111,6 +111,10 @@
    slf.Status = status
    return slf
}
func (slf *OperationSearch) SetBaseOperationType(baseOperationType constvar.BaseOperationType) *OperationSearch {
    slf.BaseOperationType = baseOperationType
    return slf
}

func (slf *OperationSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&Operation{})
@@ -154,6 +158,10 @@
        db = db.Where("status = ?", slf.Status)
    }

    if int(slf.BaseOperationType) != 0 {
        db = db.Where("base_operation_type=?", slf.BaseOperationType)
    }

    return db
}


 request/operation.go

@@ -40,8 +40,9 @@

type OperationList struct {
    PageInfo
    OperationTypeId int    `json:"operationTypeId" form:"operationTypeId"`
    Number          string `json:"number"`
    OperationTypeId int                      `json:"operationTypeId" form:"operationTypeId"`
    Number          string                   `json:"number"`
    Status          constvar.OperationStatus `json:"status"`
}

type UpdateOperation struct {

 router/router.go

@@ -82,7 +82,7 @@
        operationAPI.POST("update", operationController.Update)
        operationAPI.DELETE("operation/:id", operationController.Delete)
        operationAPI.PUT("finish/:id", operationController.Finish)
        operationAPI.POST("listAll", operationController.ListAll)
        operationAPI.POST("listTransfer", operationController.ListTransfer)

    }