From c822e91086c19dbaa8dd9c4369ace4c857180eb4 Mon Sep 17 00:00:00 2001 From: "Xin.zhang@le-it.com.cn" Date: Sat, 18 Sep 2021 11:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E4=B8=8D=E4=B8=8A=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SerialOrderOPDetailRecvDataLst.dao.impl.go | 11 +++++++---- models/om/SerialOrderOPTrace.go | 2 +- services/om/implments/SerialOrder.service.impl.go | 10 ---------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go b/dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go index 9a9c0ef..3c27f8d 100644 --- a/dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go +++ b/dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go @@ -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 -} \ No newline at end of file +} diff --git a/models/om/SerialOrderOPTrace.go b/models/om/SerialOrderOPTrace.go index 9e839b2..3cc492e 100644 --- a/models/om/SerialOrderOPTrace.go +++ b/models/om/SerialOrderOPTrace.go @@ -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"` diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 809f80e..3d22d02 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -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", "数据追溯") }