Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om

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
 			}
 
 		}