Browse Source

Merge pull request 'develop' (#207) from develop into master

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/207
pull/209/head
zhangxin 2 years ago
parent
commit
a1d0f25015
2 changed files with 0 additions and 6 deletions
  1. +0
    -3
      services/pln/implments/CustOrder.service.impl.go
  2. +0
    -3
      services/pln/implments/ToyotaCalloff.service.impl.go

+ 0
- 3
services/pln/implments/CustOrder.service.impl.go View File

@ -26,7 +26,6 @@ import (
"LAPP_ACURA_MOM_BACKEND/utils" "LAPP_ACURA_MOM_BACKEND/utils"
"container/list" "container/list"
"errors" "errors"
"fmt"
"github.com/360EntSecGroup-Skylar/excelize/v2" "github.com/360EntSecGroup-Skylar/excelize/v2"
uuid "github.com/iris-contrib/go.uuid" uuid "github.com/iris-contrib/go.uuid"
"strconv" "strconv"
@ -3157,9 +3156,7 @@ func (impl *CustOrderServiceImplement) SelectPic1(user *global.User, dayModel *b
} }
timeModelList := impl.InitDayModelList(dayModel, todayStartTime) timeModelList := impl.InitDayModelList(dayModel, todayStartTime)
// 查询正在正在生产的客户订单 // 查询正在正在生产的客户订单
fmt.Println("--------------------------------------------")
custOrderLi, err := custOrderDao.SelectRunningCustOrder(workLineId) custOrderLi, err := custOrderDao.SelectRunningCustOrder(workLineId)
fmt.Println("--------------------------------------------")
if err != nil { if err != nil {
return nil, grmi.NewBusinessError("查询正在生产的客户订单失败, 错误:" + err.Error()) return nil, grmi.NewBusinessError("查询正在生产的客户订单失败, 错误:" + err.Error())


+ 0
- 3
services/pln/implments/ToyotaCalloff.service.impl.go View File

@ -385,9 +385,6 @@ func (impl *ToyotaCalloffServiceImplement) ParseToyotaCallOffFile() {
return return
} }
for _, project := range projectLi { for _, project := range projectLi {
if project.CalloffFolder == "" {
continue
}
inboxPath := path.Join(conf.DbConfig.CallOffFolder, project.CalloffFolder) inboxPath := path.Join(conf.DbConfig.CallOffFolder, project.CalloffFolder)
outBoxPath := path.Join(conf.DbConfig.OutCallOffFolder, project.CalloffFolder) outBoxPath := path.Join(conf.DbConfig.OutCallOffFolder, project.CalloffFolder)
errorBoxPath := path.Join(conf.DbConfig.ErrorCallOffFolder, project.CalloffFolder) errorBoxPath := path.Join(conf.DbConfig.ErrorCallOffFolder, project.CalloffFolder)


Loading…
Cancel
Save