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

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

@@ -930,6 +930,7 @@ func (impl *PackOrderServiceImplement) ReadPLCBackFlushData(user *global.User) {
 			}
 			return
 		}
+		return
 	}
 	if len(packOrderLi) > 1 {
 		log.Error("该RFID绑定多个包装单, RFID:"+seatStr, "任务ID:"+taskId)
@@ -985,6 +986,7 @@ func (impl *PackOrderServiceImplement) ReadPLCBackFlushData(user *global.User) {
 			}
 			return
 		}
+		return
 	}
 	packOrder := packOrderLi[0]
 	packOrderStatus, err := packOrderStatusDao.SelectOne(packOrder.PackOrderId)

services/pln/implments/ToyotaCalloff.service.impl.go

@@ -628,23 +628,21 @@ func (impl *ToyotaCalloffServiceImplement) ParseCallOffData(user *global.User, p
 			log.Error("解析CallOff数据,删除已存在的错误数据失败, error:" + err.Error())
 			return
 		}
-		if callOffData.CheckSequence != needParseSeq {
-			if callOffData.CheckSequence != needParseSeq+1 || (needParseSeq == 999 && callOffData.CheckSequence != 0) {
-				callOffError := model.ToyotaCallOffErrorLst{
-					DemandId:    callOffData.DemandId,
-					Pos:         1,
-					ErrorType:   model.ERROR_TYPE_HINT,
-					ErrorInfo:   "连番号不连续，当前需要解析连番号为:" + strconv.Itoa(needParseSeq) + ", 该连番号为:" + strconv.Itoa(callOffData.CheckSequence),
-					ErrorStatus: model.ERROR_STATUS_ON,
-				}
-				err = callOffErrDao.InsertOne(&callOffError)
-				if err != nil {
-					_ = session.Rollback()
-					log.Error("解析CallOff数据, 写入错误信息失败, error:" + err.Error())
-					return
-				}
-				break
+		if callOffData.CheckSequence != needParseSeq && needParseSeq != -1 {
+			callOffError := model.ToyotaCallOffErrorLst{
+				DemandId:    callOffData.DemandId,
+				Pos:         1,
+				ErrorType:   model.ERROR_TYPE_HINT,
+				ErrorInfo:   "连番号不连续，当前需要解析连番号为:" + strconv.Itoa(needParseSeq) + ", 该连番号为:" + strconv.Itoa(callOffData.CheckSequence),
+				ErrorStatus: model.ERROR_STATUS_ON,
 			}
+			err = callOffErrDao.InsertOne(&callOffError)
+			if err != nil {
+				_ = session.Rollback()
+				log.Error("解析CallOff数据, 写入错误信息失败, error:" + err.Error())
+				return
+			}
+			break
 		}
 
 		needParseSeq = callOffData.CheckSequence + 1