From 2aa8d8ac17a5ea6de87070cb6e665c3873247a1d Mon Sep 17 00:00:00 2001 From: zhangxin Date: Fri, 13 May 2022 09:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/channel/ReleaseTask.go | 4 ++-- services/pln/implments/CustOrder.service.impl.go | 1 - services/pln/implments/CustOrderLogic.service.impl.go | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/models/channel/ReleaseTask.go b/models/channel/ReleaseTask.go index 5444082..e0d285a 100644 --- a/models/channel/ReleaseTask.go +++ b/models/channel/ReleaseTask.go @@ -14,7 +14,7 @@ type ReleaseTaskChannel struct { func NewReleaseChannel() *ReleaseTaskChannel { return &ReleaseTaskChannel{ - c: make(chan plnModel.CustOrder, 50), + c: make(chan plnModel.CustOrder, 100), } } @@ -48,11 +48,11 @@ func (c *ReleaseTaskChannel) Close() { func (c *ReleaseTaskChannel) Read() (data plnModel.CustOrder, ok bool, err error) { c.mutex.Lock() - defer c.mutex.Unlock() if c.closed { err = errors.New("管道已关闭") return } + c.mutex.Unlock() data, ok = <- c.c return } diff --git a/services/pln/implments/CustOrder.service.impl.go b/services/pln/implments/CustOrder.service.impl.go index fc24947..6f851fc 100644 --- a/services/pln/implments/CustOrder.service.impl.go +++ b/services/pln/implments/CustOrder.service.impl.go @@ -1815,7 +1815,6 @@ func (impl *CustOrderServiceImplement) AutoScheduler(user *global.User, session return nil, grmi.NewBusinessError("保存客户订单数量失败, 错误:" + err.Error()) } returnCustOrderLi = append(returnCustOrderLi, *custOrder) - } return returnCustOrderLi, nil } diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 8baa1a7..1e95e20 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -20,6 +20,7 @@ import ( model "LAPP_ACURA_MOM_BACKEND/models/pln" omSvr "LAPP_ACURA_MOM_BACKEND/services/om" "LAPP_ACURA_MOM_BACKEND/utils" + "fmt" "github.com/360EntSecGroup-Skylar/excelize/v2" uuid "github.com/iris-contrib/go.uuid" "sort" @@ -270,11 +271,13 @@ func (impl *CustOrderServiceImplement) AnalysisPlanFromExcel(user *global.User, plantNr := user.PlantNr channel, exist := common.ReleaseTaskChannel[plantNr] if !exist { + fmt.Println("通道不存在") return nil } for _, custOrder := range releaseCustOrderLi { err = channel.SendData(custOrder) if err != nil { + fmt.Println("发送数据出错:" + err.Error()) return nil } }