出入库明细查询修改

liujiandao

2023-11-16 42e747988aa1bcdceda506c867b884ba0d1e0ca7

出入库明细查询修改

 controllers/report_forms_controller.go

@@ -163,48 +163,72 @@
    }
    //获取操作详情
    detailsSearch := models.NewOperationDetailsSearch()
    if params.PageInfo.Check() {
        detailsSearch.SetPage(params.Page, params.PageSize)
    var (
        result []*response.InventoryHistory
        total  int64
    )
    detailsSearch.Orm = detailsSearch.Orm.Model(&models.OperationDetails{}).
        Select("wms_operation.number, wms_operation.updated_at as date, material.name as product_name, wms_operation.from_location_id,"+
            "wms_operation.to_location_id, wms_operation_details.amount, material.unit, wms_operation.contacter_name as contacted_name,"+
            "wms_operation.base_operation_type, material.weight, wms_operation_details.product_id").
        Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id").
        Joins("left join material on wms_operation_details.product_id = material.id").
        Where("wms_operation.status = ?", constvar.OperationStatus_Finish).Order("wms_operation.created_at desc")
    if params.ProduceId != "" {
        detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.product_id = ?", params.ProduceId)
    }
    details, total, err := detailsSearch.SetPreload(true).SetOrder("created_at desc").SetProductId(params.ProduceId).Find()
    if params.BaseOperationType != 0 {
        detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation.base_operation_type = ?", params.BaseOperationType)
    }

    err := detailsSearch.Orm.Count(&total).Error
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查询操作详情失败")
        util.ResponseFormat(c, code.RequestParamError, "查询total失败")
        return
    }
    var operationIds []int
    for _, detail := range details {
        operationIds = append(operationIds, detail.OperationID)
    if params.Page*params.PageSize > 0 {
        detailsSearch.Orm = detailsSearch.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
    }
    //获取已完成的操作记录
    operations, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
        SetStatus(constvar.OperationStatus_Finish).FindNotTotal()

    err = detailsSearch.Orm.Find(&result).Error
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查询操作记录失败")
        util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("查询操作明细失败: %v", err))
        return
    }
    var result []response.InventoryHistory
    for _, detail := range details {
        var resp response.InventoryHistory
        resp.Amount = detail.Amount
        resp.Unit = detail.Product.Unit
        resp.ProductName = detail.Product.Name
        for _, operation := range operations {
            if detail.OperationID == operation.Id {
                resp.Number = operation.Number
                resp.Date = operation.UpdateTime
                resp.Status = "完成"
                resp.ContactedName = operation.ContacterName
                resp.FromLocation = operation.FromLocation.Name
                resp.ToLocation = operation.ToLocation.Name
                resp.BaseOperationType = operation.BaseOperationType
                result = append(result, resp)
                break
    var locationIds []int
    for _, history := range result {
        locationIds = append(locationIds, history.FromLocationId, history.ToLocationId)
    }
    locations, err := models.NewLocationSearch().SetIds(locationIds).FindNotTotal()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("查询位置失败: %v", err))
        return
    }
    for _, history := range result {
        history.Status = "完成"
        for _, location := range locations {
            if history.ToLocationId == location.Id {
                history.ToLocation = location.Name
            }
            if history.FromLocationId == location.Id {
                history.FromLocation = location.Name
            }
        }
    }
    util.ResponseFormatList(c, code.Success, result, int(total))
}

// GetOutOrInOperationList
// @Tags      报表
// @Summary   获取出入库操作明细
// @Produce   application/json
// @Param     object  body  request.GetLocationForms true  "查询参数"
// @Success   200 {object} util.ResponseList{data=[]response.LocationForms}    "成功"
// @Router    /api-wms/v1/forms/getOutOrInOperationList [post]
func (slf ReportFormsController) GetOutOrInOperationList(c *gin.Context) {

}

// GetLocationForms
// @Tags      报表
// @Summary   获取位置报表

 response/report_forms_response.go

@@ -29,6 +29,10 @@
    ContactedName     string                     `json:"contactedName"`     //完成者
    Status            string                     `json:"status"`            //状态
    BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //基础作业类型
    Weight            decimal.Decimal            `json:"weight"`            //重量
    ProductId         string                     `json:"productId"`
    FromLocationId    int                        `json:"fromLocationId"`
    ToLocationId      int                        `json:"toLocationId"`
}

type LocationForms struct {