出入库报表搜索增加几个字段

zhangqian

2023-11-29 d1cb09e7a23e7221b6c090ad33e4481a5b79f615

出入库报表搜索增加几个字段

 controllers/operation.go

@@ -733,6 +733,7 @@

func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
    var histories []*models.MoveHistory
    operationMap := make(map[string]*models.Operation, len(operationList))
    for _, operation := range operationList {
        for _, v := range operation.Details {
            history := &models.MoveHistory{
@@ -753,12 +754,13 @@
            }
            histories = append(histories, history)
        }
        operationMap[operation.Number] = operation
    }
    if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
        return err
    }
    for _, history := range histories {
        service.AddNewHistoryReportRecord(history)
        service.AddNewHistoryReportRecord(history, operationMap[history.Number])
    }
    return nil
}

 service/input_history_search.go

@@ -20,6 +20,11 @@
    OperationTypeName string                     `json:"operationTypeName,omitempty"` //业务名称
    FromLocation      string                     `json:"fromLocation,omitempty"`      //源位置名称
    ToLocation        string                     `json:"toLocation,omitempty"`        //目标位置名称
    Date              string                     `json:"date,omitempty"`              //日期
    Company           string                     `json:"company,omitempty"`           // 供应商/客户
    Carrier           string                     `json:"carrier,omitempty"`           //承运商名称
    WaybillNumber     string                     `json:"waybillNumber"`               //运单号
    ReceiverName      string                     `json:"receiverName"`                //收货人
}

const (
@@ -76,13 +81,20 @@
    return
}

func AddNewHistoryReportRecord(record *models.MoveHistory) {
func AddNewHistoryReportRecord(record *models.MoveHistory, operation *models.Operation) {
    var report HistoryReport
    err := structx.AssignTo(record, &report)
    if err != nil {
        logx.Errorf("AddNewHistoryReportRecord AssignTo err:%v", err)
        return
    }

    report.Date = record.UpdatedAt.Format("2006-01-02")
    report.Carrier = operation.LogisticCompany.Name
    report.Company = operation.CompanyName
    report.WaybillNumber = operation.WaybillNumber
    report.ReceiverName = operation.ReceiverName

    err = blevex.Add(HistoryReportIndexName, strconv.Itoa(record.Id), report)
    if err != nil {
        logx.Errorf("AddNewHistoryReportRecord bleve add err:%v", err)