不再根据需求的工单状态进行过滤

dao/log/implments/ArtDemandHead.dao.impl.go

@@ -244,7 +244,7 @@ func (impl *ArtDemandHeadDAOImplement) Select(predicates []grmi.Predicate, order
 			session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
 		}
 	}
-	session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
+	//session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
 	session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName)
 	if orderByFields != nil {
 		for _, field := range orderByFields {
@@ -283,7 +283,7 @@ func (impl *ArtDemandHeadDAOImplement) SelectUnByUser(predicates []grmi.Predicat
 	//if impl.userid != "admin" {
 	//	session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
 	//}
-	session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
+	//session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
 	session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName)
 	if orderByFields != nil {
 		for _, field := range orderByFields {
@@ -332,9 +332,9 @@ func (impl *ArtDemandHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, pred
 			session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
 		}
 	}
-	where += fmt.Sprintf(" and (( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? )) ")
+	//where += fmt.Sprintf(" and (( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? )) ")
 	parameters = append(parameters, baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
-	session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
+	//session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
 	count, err := session.Count(impl.meta.Indicator)
 	if err != nil {
 		return grmi.EmptyPagingResult, err

dao/log/implments/ArtDemandLst.dao.impl.go

@@ -242,7 +242,7 @@ func (impl *ArtDemandLstDAOImplement) Select(predicates []grmi.Predicate, orderB
 			session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
 		}
 	}
-	session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
+	//session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
 	session = session.OrderBy(meta.ArtDemandLst_PlantNr.ColumnName)
 	if orderByFields != nil {
 		for _, field := range orderByFields {
@@ -281,7 +281,7 @@ func (impl *ArtDemandLstDAOImplement) SelectUnByUser(predicates []grmi.Predicate
 	//if impl.userid != "admin" {
 	//	session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
 	//}
-	session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
+	//session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
 	session = session.OrderBy(meta.ArtDemandLst_PlantNr.ColumnName)
 	if orderByFields != nil {
 		for _, field := range orderByFields {
@@ -331,9 +331,9 @@ func (impl *ArtDemandLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi
 		}
 
 	}
-	where += fmt.Sprintf(" and (( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? )) ")
+	//where += fmt.Sprintf(" and (( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? )) ")
 	parameters = append(parameters, baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
-	session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
+	//session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
 	count, err := session.Count(impl.meta.Indicator)
 	if err != nil {
 		return grmi.EmptyPagingResult, err