Browse Source

修改字段赋值不上的bug

pull/99/head
parent
commit
c822e91086
3 changed files with 8 additions and 15 deletions
  1. +7
    -4
      dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go
  2. +1
    -1
      models/om/SerialOrderOPTrace.go
  3. +0
    -10
      services/om/implments/SerialOrder.service.impl.go

+ 7
- 4
dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go View File

@ -339,8 +339,11 @@ func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) SelectOPDetailData(seria
meta.SerialOrder_PlantNr.ColumnName,
meta.SerialOrderOPDetailRecvDataLst_SerialOrderId.ColumnName,
meta.SerialOrder_SerialOrderId.ColumnName)
session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.SerialOrderOPDetail.TableName, detailCondition).Join("LEFT", baseMeta.OPCComRule.TableName, opcCondition).Join("LEFT", baseMeta.Operation.TableName, operationCondition)
session = session.Join("LEFT", meta.SerialOrder.TableName, serialOrderCondition)
session := impl.session.Table(impl.meta.TableName).
Join("LEFT", meta.SerialOrderOPDetail.TableName, detailCondition).
Join("LEFT", baseMeta.OPCComRule.TableName, opcCondition).
Join("LEFT", baseMeta.Operation.TableName, operationCondition).
Join("LEFT", meta.SerialOrder.TableName, serialOrderCondition)
parameters := []interface{}{impl.plantNr, serialOrderId}
where := fmt.Sprintf("%s = ? and %s = ?", meta.SerialOrderOPDetailRecvDataLst_PlantNr.ColumnName, meta.SerialOrderOPDetailRecvDataLst_SerialOrderId.ColumnName)
if PO != 0 {
@ -351,9 +354,9 @@ func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) SelectOPDetailData(seria
where += fmt.Sprintf(" and %s = ?", meta.SerialOrderOPDetailRecvDataLst_WorkPlaceNr.ColumnName)
parameters = append(parameters, workPlaceNr)
}
err := session.Where(where, parameters...).Asc(meta.SerialOrderOPDetailRecvDataLst_PO.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_StepNo.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_OriginPos.ColumnName).Find(&data)
err := session.Select("OM_SerialOrder.*,OM_SerialOrderOPDetailRecvDataLst.*,OM_SerialOrderOPDetail.*,OPCComRule.*,Operation.*").Where(where, parameters...).Asc(meta.SerialOrderOPDetailRecvDataLst_PO.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_StepNo.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_OriginPos.ColumnName).Find(&data)
if err != nil {
return nil, grmi.NewDataBaseError(err)
}
return data, nil
}
}

+ 1
- 1
models/om/SerialOrderOPTrace.go View File

@ -4,9 +4,9 @@ type SerialOrderOPTrace struct {
ArtId string `json:"SerialOrderOPTrace-ArtId"`
WorkOrderId string `json:"SerialOrderOPTrace-WorkOrderId"`
SerialOrderId string `json:"SerialOrderOPTrace-SerialOrderId"`
StepDesc string `json:"SerialOrderOPTrace-StepDesc"`
PO int `json:"SerialOrderOPTrace-PO"`
WorkPlaceId string `json:"SerialOrderOPTrace-WorkPlaceId"`
StepDesc string `json:"SerialOrderOPTrace-StepDesc"`
RecvData string `json:"SerialOrderOPTrace-RecvData"`
Status string `json:"SerialOrderOPTrace-Status"`
Remark1 string `json:"SerialOrderOPTrace-Remark1"`


+ 0
- 10
services/om/implments/SerialOrder.service.impl.go View File

@ -13,8 +13,6 @@ import (
baseModel "LAPP_LF_MOM_BACKEND/models/base"
model "LAPP_LF_MOM_BACKEND/models/om"
"LAPP_LF_MOM_BACKEND/web/models"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"
@ -823,12 +821,6 @@ func (impl SerialOrderServiceImplement) ExportSerialOrderTraceData(user *models.
status = "否"
}
workPlaceId := workPlaceMap[op.SerialOrderOPDetailRecvDataLst.WorkPlaceNr]
//if op.SerialOrderOPDetailRecvDataLst.RecvData == "03391633580660421243" {
// fmt.Println("op.SerialOrderOPDetailRecvDataLst.CreateTime:", op.SerialOrderOPDetailRecvDataLst.CreateTime.ToString())
//
//}
fmt.Println("op.SerialOrderOPDetailRecvDataLst.CreateTime:", op.SerialOrderOPDetailRecvDataLst.CreateTime.ToString(), op.SerialOrderOPDetailRecvDataLst.Pos)
trace := model.SerialOrderOPTrace{
ArtId: op.SerialOrder.ArtId,
WorkOrderId: op.SerialOrder.WorkOrderId,
@ -846,7 +838,5 @@ func (impl SerialOrderServiceImplement) ExportSerialOrderTraceData(user *models.
traceDataLi = append(traceDataLi, trace)
}
}
d, _ := json.MarshalIndent(traceDataLi, "", " ")
fmt.Println("traceDataLi:", string(d))
return grmi.SaveExcelFile(traceDataLi, opTraceTitle, "Sheet1", "数据追溯")
}

Loading…
Cancel
Save