Merge pull request '1.向mes里写入workOrder写入sort字段,2.修改生成的流水号使用的日期为当前日期 不再使用计划开始日期' (#443) from fix_om into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/443
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>

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
 	}

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),

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 {