计算工时，生产条形码

zhangqian

2023-11-27 252ad9f55e8828bcacb8ddef28c8e9ff0a62f8d6

计算工时，生产条形码

 docs/docs.go

@@ -1537,6 +1537,10 @@
        "model.ReportWork": {
            "type": "object",
            "properties": {
                "barCode": {
                    "description": "条形码",
                    "type": "integer"
                },
                "channel": {
                    "description": "通道",
                    "type": "integer"
@@ -1554,6 +1558,10 @@
                    "type": "string"
                },
                "endTime": {
                    "type": "integer"
                },
                "finishAmount": {
                    "description": "本次报工 - 上次报工",
                    "type": "integer"
                },
                "id": {
@@ -1586,6 +1594,10 @@
                "workerName": {
                    "description": "报工人姓名",
                    "type": "string"
                },
                "workerTime": {
                    "description": "工时，单位秒",
                    "type": "integer"
                }
            }
        },

 docs/swagger.json

@@ -1525,6 +1525,10 @@
        "model.ReportWork": {
            "type": "object",
            "properties": {
                "barCode": {
                    "description": "条形码",
                    "type": "integer"
                },
                "channel": {
                    "description": "通道",
                    "type": "integer"
@@ -1542,6 +1546,10 @@
                    "type": "string"
                },
                "endTime": {
                    "type": "integer"
                },
                "finishAmount": {
                    "description": "本次报工 - 上次报工",
                    "type": "integer"
                },
                "id": {
@@ -1574,6 +1582,10 @@
                "workerName": {
                    "description": "报工人姓名",
                    "type": "string"
                },
                "workerTime": {
                    "description": "工时，单位秒",
                    "type": "integer"
                }
            }
        },

 docs/swagger.yaml

@@ -446,6 +446,9 @@
    type: object
  model.ReportWork:
    properties:
      barCode:
        description: 条形码
        type: integer
      channel:
        description: 通道
        type: integer
@@ -458,6 +461,9 @@
      deviceName:
        type: string
      endTime:
        type: integer
      finishAmount:
        description: 本次报工 - 上次报工
        type: integer
      id:
        type: integer
@@ -481,6 +487,9 @@
      workerName:
        description: 报工人姓名
        type: string
      workerTime:
        description: 工时，单位秒
        type: integer
    type: object
  problem.CheckResult:
    properties:

 model/report_work.go

@@ -21,6 +21,8 @@
        FinishAmount int    `json:"finishAmount"` //本次报工 - 上次报工
        WorkerID     string `json:"workerID"`     //报工人id
        WorkerName   string `json:"workerName"`   //报工人姓名
        WorkerTime   int64  `json:"workerTime"`   //工时，单位秒
        BarCode      int64  `json:"barCode"`      //条形码
    }

    ReportWorkSearch struct {
@@ -139,6 +141,10 @@
        db = db.Where("procedure_id = ?", slf.ProcedureID)
    }

    if slf.ProceduresID != 0 {
        db = db.Where("procedures_id = ?", slf.ProceduresID)
    }

    if len(slf.Channels) > 0 {
        db = db.Where("channel IN (?)", slf.Channels)
    }

 service/report_work.go

@@ -5,6 +5,7 @@
    "apsClient/constvar"
    "apsClient/model"
    "apsClient/model/request"
    "apsClient/pkg/snowflake"
    "errors"
    "time"
)
@@ -60,6 +61,8 @@
        FinishAmount: finishAmount,
        WorkerID:     params.WorkerID,
        WorkerName:   workerName,
        WorkerTime:   nowTs - startTs,
        BarCode:      snowflake.GenerateId(),
    }

    err = model.NewReportWorkSearch(nil).Create(record)