Merge remote-tracking branch 'origin/develop' into develop

dao/base/AndonInfo.dao.go

@@ -248,7 +248,7 @@ type AndonInfoDAO interface {
 	 * @Date                     : 2022-01-06 14:56:42
 	 *
 	 ******************************************************************************/
-	SumAndonInfo(startTime, endTime string) (int, error)
+	SumAndonInfo(GroupLineId, startTime, endTime string) (int, error)
 }
 
 /******************************************************************************

dao/base/implments/AndonInfo.dao.impl.go

@@ -330,10 +330,10 @@ func (impl *AndonInfoDAOImplement) UpdateWhere(predicates []grmi.Predicate, enti
 }
 
 //统计安灯时间
-func (impl *AndonInfoDAOImplement) SumAndonInfo(startTime, endTime string) (int, error) {
+func (impl *AndonInfoDAOImplement) SumAndonInfo(GroupLineId, startTime, endTime string) (int, error) {
 	entity := view.AndonInfoView{}
 
-	_, err := impl.session.Table("AndonInfoView").Select("SUM(AndonTimes) as AndonTimes").Where("PlantNr = ? and CreateTime > ? and CreateTime <= ?", impl.plantNr, startTime, endTime).Get(&entity)
+	_, err := impl.session.Table("AndonInfoView").Select("SUM(AndonTimes) as AndonTimes").Where("PlantNr = ? and GroupLineId = ? and CreateTime > ? and CreateTime <= ?", impl.plantNr, GroupLineId, startTime, endTime).Get(&entity)
 	if err != nil {
 		return 0, grmi.NewDataBaseError(err)
 	}

models/view/AndonInfoView.go

@@ -5,6 +5,7 @@ import "LAPP_ACURA_MOM_BACKEND/grmi"
 type AndonInfoView struct {
 	PlantNr     string        `xorm:"nvarchar(40) 'PlantNr' not null" json:"AndonInfoView-PlantNr"`
 	WorkLineId  string        `xorm:"nvarchar(40) 'WorkLineId' not null" json:"AndonInfoView-WorkLineId"`
+	GroupLineId string        `xorm:"nvarchar(40) 'GroupLineId' not null" json:"AndonInfoView-GroupLineId"`
 	PO          string        `xorm:"nvarchar(40) 'PO' not null" json:"AndonInfoView-PO"`
 	WorkPlaceId string        `xorm:"nvarchar(40) 'WorkPlaceId' not null" json:"AndonInfoView-WorkPlaceId"`
 	WorkPlaceNr int           `xorm:"int 'WorkPlaceNr' not null" json:"AndonInfoView-WorkPlaceNr"`

services/jit/implments/ShipOrder.service.impl.go

@@ -2443,9 +2443,6 @@ func (impl *ShipOrderServiceImplement) NewExportShipOrder(user *global.User, ent
 	}
 	pos := 0
 	for rowIndex, row := range output[0] {
-		if len(row) < 2 {
-			return fmt.Errorf("文件格式无法解析")
-		}
 		if rowIndex == 0 {
 			entity.ShipOrderId = row[0]
 		}

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

@@ -1459,7 +1459,7 @@ func (impl *CustOrderServiceImplement) SelectOee(user *global.User, dayModel *ba
 		meta.DownTimeRecord_OpenTime.NewPredicate(grmi.LessOrEqual, endTime.Format(grmi.DateTimeOutFormat)),
 	}, nil)
 
-	andonTimes, err := andInfoDao.SumAndonInfo(startTime.Format(grmi.DateTimeOutFormat), endTime.Format(grmi.DateTimeOutFormat))
+	andonTimes, err := andInfoDao.SumAndonInfo(workLineId, startTime.Format(grmi.DateTimeOutFormat), endTime.Format(grmi.DateTimeOutFormat))
 	if err != nil {
 		glog.InfoExtln("dashboard记录", "err.Error():", err.Error())
 		return result, grmi.NewBusinessError("查询打包数据失败, 错误:" + err.Error())