Merge pull request '查询条码' (#160) from fix_firstrepire into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/160

services/qm/implments/ReclinerReclst.service.impl.go

@@ -1628,7 +1628,6 @@ func (impl *ReclinerReclstServiceImplement) SelectSeriByAssembly(user *global.Us
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-
 	seriDao := omDal.NewSerialOrderDAO(session, user.PlantNr, user.UserId)
 	statusDao := omDal.NewSerialOrderStatusDAO(session, user.PlantNr, user.UserId)
 
@@ -1648,7 +1647,7 @@ func (impl *ReclinerReclstServiceImplement) SelectSeriByAssembly(user *global.Us
 		if assemblyInfo == nil {
 			return nil, grmi.NewBusinessError("没有找到总成条码信息!")
 		}
-		seriInfo, err = seriDao.SelectBySerialOrder(orderId)
+		seriInfo, err = seriDao.SelectBySerialOrder(assemblyInfo.SerialOrderId)
 		if err != nil {
 			return nil, err
 		}
@@ -1662,10 +1661,10 @@ func (impl *ReclinerReclstServiceImplement) SelectSeriByAssembly(user *global.Us
 		if err != nil {
 			return nil, err
 		}
-		if newSerialOrder == nil {
-			return nil, grmi.NewBusinessError("不存在指定记录!")
+		if newSerialOrder != nil {
+			seriInfo.SerialOrderId = newSerialOrder.SerialOrderId
 		}
-		seriInfo.SerialOrderId = newSerialOrder.SerialOrderId
+
 	}
 	serialOrderStatus, err := statusDao.SelectOne(seriInfo.SerialOrderId)