From 8479aad26f73211cefaa493b416ab7eca80334d6 Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Thu, 7 Apr 2022 17:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E5=A5=97=E5=A4=A7=E5=B1=8F=E6=94=B9?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/pln/implments/CustOrder.service.impl.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/pln/implments/CustOrder.service.impl.go b/services/pln/implments/CustOrder.service.impl.go index db434b7..7e76717 100644 --- a/services/pln/implments/CustOrder.service.impl.go +++ b/services/pln/implments/CustOrder.service.impl.go @@ -2881,7 +2881,10 @@ func (impl *CustOrderServiceImplement) CountTarget(user *global.User) (model.Tar today := now.Format(grmi.DateOutFormat) start := today + " " + "00:00:00" end := today + " " + "23:59:59" - custOrderLi, err := custOrderDao.SelectCustOrderByPlan(start, end) + custOrderLi, err := custOrderDao.JoinSelect([]grmi.Predicate{ + meta.CustOrder_PlanStartTime.NewPredicate(grmi.GreaterOrEqual, start), + meta.CustOrder_PlanStartTime.NewPredicate(grmi.LessThen, end), + }, []grmi.Field{meta.CustOrder_PlanStartTime}) if err != nil { return result, err } @@ -2891,9 +2894,9 @@ func (impl *CustOrderServiceImplement) CountTarget(user *global.User) (model.Tar return result, nil } for _, custOrderData := range custOrderLi { - result.Current += custOrderData.CustOrderQty.PlanQty - custOrderData.CustOrderQty.CancelQty + result.Target += custOrderData.OrderQty.PlanQty - custOrderData.OrderQty.CancelQty //查询工单对应的派生工单状态！=98的是否都已经进入包装 - serialList, err := serialOrderDao.SelectSerialOrderByCustOrder(custOrderData.CustOrder.CustOrderId) + serialList, err := serialOrderDao.SelectSerialOrderByCustOrder(custOrderData.OrderQty.CustOrderId) if err != nil { return result, err } @@ -2934,7 +2937,7 @@ func (impl *CustOrderServiceImplement) CountTarget(user *global.User) (model.Tar } } if isPack { - result.Target += 1 + result.Current += 1 } }