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

dao/base/ArticleAtcodLst.dao.go

@@ -247,7 +247,7 @@ type ArticleAtcodLstDAO interface {
 	 * @Date                     : 2021-04-19 09:53:49
 	 *
 	 ******************************************************************************/
-	SelectAllot(artId string) ([]model.Attribute, error)
+	SelectAllot(artId string, projectId string) ([]model.Attribute, error)
 	/******************************************************************************
 	 *
 	 * @Function Name            : SelectUnAllot

dao/base/implments/ArticleAtcodLst.dao.impl.go

@@ -308,11 +308,11 @@ func (impl *ArticleAtcodLstDAOImplement) UpdateWhere(predicates []grmi.Predicate
  * @Reference LAPP_ACURA_MOM_BACKEND/dao/base/ArticleAtcodLstDAO.SelectAllot
  *
  ******************************************************************************/
-func (impl *ArticleAtcodLstDAOImplement) SelectAllot(artId string) ([]model.Attribute, error) {
+func (impl *ArticleAtcodLstDAOImplement) SelectAllot(artId string, projectId string) ([]model.Attribute, error) {
 
 	data := make([]model.ArtData, 0)
 	datalist := make([]model.Attribute, 0)
-	session := impl.session.Table(meta.Attribute.TableName).Join("LEFT", meta.ArticleAtcodLst.TableName, "ArticleAtcodLst.PlantNr = Attribute.PlantNr and ArticleAtcodLst.AttrCode = Attribute.AttrCode").Where("ArticleAtcodLst.PlantNr = ? and ArticleAtcodLst.ArtId = ?", impl.plantNr, artId)
+	session := impl.session.Table(meta.Attribute.TableName).Join("LEFT", meta.ArticleAtcodLst.TableName, "ArticleAtcodLst.PlantNr = Attribute.PlantNr and ArticleAtcodLst.AttrCode = Attribute.AttrCode").Where("ArticleAtcodLst.PlantNr = ? and ArticleAtcodLst.ArtId = ? and ArticleAtcodLst.ProjectId = ?", impl.plantNr, artId, projectId)
 
 	err := session.Find(&data)
 	for _, v := range data {

main.go

@@ -144,7 +144,7 @@ func imain() {
 	//开启定时任务,生产维护工单
 	go task.CreateTask()
 	//返修打印
-	go task.CreateRecPrintTask()
+	go task.CreateRecPrintTaskTick()
 	//启动监听端口
 	app.Run(iris.Addr(":9005"), iris.WithConfiguration(conf.C))
 	//app.Run(iris.Addr(":8097"), iris.WithConfiguration(conf.C))

services/base/implments/Article.service.impl.go

@@ -255,7 +255,7 @@ func (impl *ArticleServiceImplement) SelectOne(user *global.User, artId string,
 		return nil, err
 	}
 	lstdao := dal.NewArticleAtcodLstDAO(session, user.PlantNr, user.UserId)
-	list, err := lstdao.SelectAllot(artId)
+	list, err := lstdao.SelectAllot(artId, projectId)
 	if err != nil {
 		return nil, err
 	}
@@ -326,6 +326,7 @@ func (impl *ArticleServiceImplement) UpdateOne(user *global.User, entity *model.
 	lstdao := dal.NewArticleAtcodLstDAO(session, user.PlantNr, user.UserId)
 	err = lstdao.DeleteWhere([]grmi.Predicate{
 		meta.ArticleAtcodLst_ArtId.NewPredicate(grmi.Equal, entity.ArtId),
+		meta.ArticleAtcodLst_ProjectId.NewPredicate(grmi.Equal, entity.ProjectId),
 	})
 	if err != nil {
 		_ = session.Rollback()

task/printer.go

@@ -13,40 +13,50 @@ var recChan = make(chan qmmodel.ReclinerReclst, 100) //定义一个调度任务
 
 var printNum = 50
 
+func CreateRecPrintTaskTick() {
+	tick := time.Tick(1 * time.Second)
+	for {
+		select {
+		case <-tick:
+			CreateRecPrintTask()
+		}
+	}
+}
+
 /****查询要打印的任务**********/
 func CreateRecPrintTask() {
-	for {
-		//创建继承Baxkground的子节点Context
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-		go doTaskPrintRec(ctx)
 
-		data := make([]qmmodel.ReclinerReclst, 0)
-		recList := make([]int, 0)
-		//第一步，查询要打印的数据
-		var serviceOfRec = qmsvr.NewReclinerReclstService()
+	//创建继承Baxkground的子节点Context
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	go doTaskPrintRec(ctx)
 
-		data, err := serviceOfRec.SelectUnPrint(printNum)
-		if err != nil {
-			glog.InfoExtln("返修打印错误日志","err:",err)
-			return
-		}
-		//锁定
-		for _, v := range data {
-			recList = append(recList, v.RecNr)
-		}
-		err = serviceOfRec.UpdateUnPrint(recList)
-		if err != nil {
-			glog.InfoExtln("返修打印错误日志","err:",err)
-			time.Sleep(1 * time.Second)
-			continue
-		}
-		//第二步，把所有的服务调度放到channel
-		for _, v := range data {
-			recChan <- v
-		}
-		time.Sleep(1 * time.Second)
+	data := make([]qmmodel.ReclinerReclst, 0)
+	recList := make([]int, 0)
+	//第一步，查询要打印的数据
+	var serviceOfRec = qmsvr.NewReclinerReclstService()
+	data, err := serviceOfRec.SelectUnPrint(printNum)
+	if err != nil {
+		glog.InfoExtln("返修错误", "err:", err)
+		return
+	}
+	if len(data) == 0 {
+		return
 	}
+	//锁定
+	for _, v := range data {
+		recList = append(recList, v.RecNr)
+	}
+	err = serviceOfRec.UpdateUnPrint(recList)
+	if err != nil {
+		glog.InfoExtln("返修错误", "err:", err)
+		return
+	}
+	//第二步，把所有的服务调度放到channel
+	for _, v := range data {
+		recChan <- v
+	}
+
 }
 
 /********打印逻辑************/