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

services/pln/implments/CustOrder.Dashborad.iimpl.go

@@ -699,6 +699,10 @@ func (impl *CustOrderServiceImplement) SelectDefectNumber(user *global.User, day
 				delete(serialOrderMap, serialOrderId)
 				continue
 			}
+			if serialOrder.OrderType == baseModel.ORDER_TYPE_PRE {
+				delete(serialOrderMap, serialOrderId)
+				continue
+			}
 			custOrder, exist := custOrderMap[serialOrder.CustOrderId]
 			if !exist {
 				custOrder, err = custOrderDao.SelectOne(serialOrder.CustOrderId)

services/pln/implments/CustOrder.service.impl.go

@@ -1709,7 +1709,7 @@ func (impl *CustOrderServiceImplement) QuickSortProductData(values []model.HourP
 	head, tail := 0, len(values)-1
 	for head < tail {
 		iTime := values[i].LastDoneTime
-		if iTime.Before(midTime) {
+		if iTime.After(midTime) {
 			values[i], values[tail] = values[tail], values[i]
 			tail--
 		} else {