From 9e5133dfeab70167254c2c2a5a00f86aa0bdebd3 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 16 Nov 2021 09:14:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E6=B5=81=E6=B0=B4=E5=8F=B7=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B8=BA=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=20=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/om/implments/SerialOrder.service.impl.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 0260d3c..85a3da0 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -401,7 +401,6 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta log.Error("InsertFromWorkOrder SerialOrder InsertFromWorkOrder generate serial order id failed, error: " + err.Error()) return nil, err } - planStartDate := workOrder.PlanStartDate.Restore().Format("20060102") article, exist := artMap[workOrder.ArtId] if !exist { article, err = articleDao.SelectOne(workOrder.ArtId) @@ -416,7 +415,7 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta return nil, err } } - prefix := article.PartId + baseModel.PlantName + planStartDate + prefix := article.PartId + baseModel.PlantName + time.Now().Format("20060102") serialOrderId := strings.Replace(serialNum, "SO-", prefix, 1) var planEndTime time.Time if perDuration != 0 { From 331086663fed9ca73c013abdf3a6ab46fd81bc26 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 18 Nov 2021 09:00:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infra/logger/config.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/infra/logger/config.go b/infra/logger/config.go index 8b5da20..e7fb9b2 100644 --- a/infra/logger/config.go +++ b/infra/logger/config.go @@ -1,6 +1,7 @@ package logger import ( + "LAPP_GAAS_GFrame_BACKEND/utils" "errors" "github.com/spf13/viper" ) @@ -48,9 +49,13 @@ type outputSettings struct { func InitConfig() error { var err error + baseDir, err := utils.GetCurrentPath("conf") + if err != nil { + return err + } viper.SetConfigName("log_config") viper.SetConfigType("yaml") - viper.AddConfigPath("./conf/") + viper.AddConfigPath(baseDir) if err = viper.ReadInConfig(); err != nil { return err } From 63bbb7ef8c440731ac710ab5e0b4913804776018 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 18 Nov 2021 09:01:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=91mes=E9=87=8C=E5=86=99=E5=85=A5work?= =?UTF-8?q?Order=E5=86=99=E5=85=A5sort=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/om/implments/OmToMes.serivce.impl.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/om/implments/OmToMes.serivce.impl.go b/services/om/implments/OmToMes.serivce.impl.go index 536081f..bb2eb94 100644 --- a/services/om/implments/OmToMes.serivce.impl.go +++ b/services/om/implments/OmToMes.serivce.impl.go @@ -63,7 +63,7 @@ func (impl *OmToMesServiceImplement) TransferWorkOrderToMes(plantNr int) { session := engine.NewSession() workOrderStatusRecDao := dal.NewWorkOrderStatusRecLstDAO(session, plantNr, user) articleDao := baseDal.NewArticleDAO(session, plantNr, user) - // 通过查询WorkOrderStatusRecLst表获取需要导入到mes的work order 拼接数据 + // 通过查询WorkOrderStatusRecLst表获取需要导入到mes的work order 拼接数据 workOrderJoinLi, err := workOrderStatusRecDao.GetWorkOrderToMes() if err != nil { log.Error("TransferWorkOrderToMes get workOrder from db failed, error:" + err.Error()) @@ -84,11 +84,15 @@ func (impl *OmToMesServiceImplement) TransferWorkOrderToMes(plantNr int) { log.Error("TransferWorkOrderToMes 物料数据不存在, ArtId:" + workOrderJoin.WorkOrder.ArtId) return } + startTimeStr := workOrderJoin.WorkOrder.PlanStartTime.Restore().Format("200601021504") + startTimeStr = startTimeStr[3:] + sort, _ := strconv.Atoi(startTimeStr) orderHeader := apiModel.ACCWOWORKORDERHEADER{ WONO: workOrderJoin.WorkOrder.WorkOrderId, LINE: workOrderJoin.WorkOrder.UsedResourceId, PARTNO: article.PartId, REV: "0", + SORT: sort, PLANSTARTTIME: workOrderJoin.WorkOrder.PlanStartTime, PLANFINISHTIME: workOrderJoin.WorkOrder.PlanEndTime, PLANQUANTITY: int(workOrderJoin.WorkOrderQty.PlanQty),