删除了产线作为扫码规则的校验条件

dao/base/ArtCheckRule.dao.go

@@ -297,7 +297,7 @@ type ArtCheckRuleDAO interface {
 	 * @Date                     : 2022-02-08
 	 *
 	 ******************************************************************************/
-	SelectOperationCheckRule(artId string, attrCode int, projectId string, workLineId string) ([]model.ArtCheckRule, error)
+	SelectOperationCheckRule(artId string, attrCode int, projectId string) ([]model.ArtCheckRule, error)
 }
 
 /******************************************************************************

dao/base/implments/ArtCheckRule.dao.impl.go

@@ -364,14 +364,13 @@ func (impl *ArtCheckRuleDAOImplement) SelectByArtId(artId string, projectId stri
  * @Reference LAPP_ACURA_MOM_BACKEND/dao/base/ArtCheckRuleDAO.SelectByArtId
  *
  ******************************************************************************/
-func (impl *ArtCheckRuleDAOImplement) SelectOperationCheckRule(artId string, attrCode int, projectId string, workLineId string) ([]model.ArtCheckRule, error) {
+func (impl *ArtCheckRuleDAOImplement) SelectOperationCheckRule(artId string, attrCode int, projectId string) ([]model.ArtCheckRule, error) {
 	result := make([]model.ArtCheckRule, 0)
-	parameters := []interface{}{impl.plantNr, attrCode, projectId, workLineId, model.MES_MATCH_ALL, artId}
-	where := fmt.Sprintf("%s = ? and %s = ? and %s = ? and %s = ? and ( %s = ? or %s = ? )",
+	parameters := []interface{}{impl.plantNr, attrCode, projectId, model.MES_MATCH_ALL, artId}
+	where := fmt.Sprintf("%s = ? and %s = ? and %s = ? and ( %s = ? or %s = ? )",
 		meta.ArtCheckRule_PlantNr.ColumnName,
 		meta.ArtCheckRule_AttriCode.ColumnName,
 		meta.ArtCheckRule_ProjectId.ColumnName,
-		meta.ArtCheckRule_WorkLineId.ColumnName,
 		meta.ArtCheckRule_SubObject.ColumnName,
 		meta.ArtCheckRule_SubObject.ColumnName)
 	err := impl.session.Table(impl.meta.TableName).Where(where, parameters...).OrderBy(meta.ArtCheckRule_AttriCode.SortColumnName).Find(&result)

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

@@ -750,7 +750,8 @@ func (impl *OperationServiceImplement) SelectOperationByArtId(user *global.User,
 					if article != nil {
 						artDesc = article.Descr1
 					}
-					checkRuleLi, err := artCheckRuleDao.SelectOperationCheckRule(artId, attrCode, projectId, workLineId)
+					// TODO 删除了产线作为条件
+					checkRuleLi, err := artCheckRuleDao.SelectOperationCheckRule(artId, attrCode, projectId)
 					if err != nil {
 						return nil, grmi.NewBusinessError("查询零件校验规则失败, error:" + err.Error())
 					}