Merge pull request '首件返修+校验是否是预装工单' (#147) from feature_firstPare into develop

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

models/base/Const.go

@@ -138,7 +138,7 @@ const (
 
 	//目检质量结果
 	QualityCheck_STATUS_OK   = "OK"
-	QualityCheck_STATUS_FAIL = "FAIL"
+	QualityCheck_STATUS_FAIL = "ER"
 
 	// shipable au 条码规则
 	BARCODE_RULE_ACURA_PRE = "ACURA_PRE"

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

@@ -267,6 +267,9 @@ func (impl *DefectRecordServiceImplement) Insert(user *global.User, entities mod
 	if result == nil {
 		return grmi.NewBusinessError("序列订单不存在!")
 	}
+	if result.OrderType == common.ORDER_TYPE_PRE{
+		return grmi.NewBusinessError("该订单是预装工单!")
+	}
 	artId := result.ArtId
 
 	orderStatusDAO := omdal.NewSerialOrderStatusDAO(session, user.PlantNr, user.UserId)
@@ -302,6 +305,7 @@ func (impl *DefectRecordServiceImplement) Insert(user *global.User, entities mod
 			}
 			//更新目检质量状态
 			result.QualityCheck = common.QualityCheck_STATUS_FAIL
+			result.QualityCheckTime = grmi.DateTime(time.Now())
 			err = omDao.UpdateOne(result)
 			if err != nil {
 				return err
@@ -341,6 +345,7 @@ func (impl *DefectRecordServiceImplement) Insert(user *global.User, entities mod
 			}
 			//更新目检质量状态
 			result.QualityCheck = common.QualityCheck_STATUS_OK
+			result.QualityCheckTime = grmi.DateTime(time.Now())
 			err = omDao.UpdateOne(result)
 			if err != nil {
 				return err
@@ -448,7 +453,13 @@ func (impl *DefectRecordServiceImplement) Insert(user *global.User, entities mod
 		entity.Inspector = user.UserId
 		DefectRecord = append(DefectRecord, entity)
 	}
-
+	//更新目检质量状态
+	result.QualityCheck = common.QualityCheck_STATUS_FAIL
+	result.QualityCheckTime = grmi.DateTime(time.Now())
+	err = omDao.UpdateOne(result)
+	if err != nil {
+		return err
+	}
 	err = dao.Insert(&DefectRecord)
 	if err != nil {
 		return err

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

@@ -571,6 +571,8 @@ func (impl *ReclinerReclstServiceImplement) InsertSeriOne(user *global.User, ent
 	insertSeriOrder.OrderType = bmodel.ODER_TYPE_REODER
 	insertSeriOrder.GenerateFlag = false
 	insertSeriOrder.RepairFlag = false
+	insertSeriOrder.QualityCheck = bmodel.QualityCheck_STATUS_OK
+	insertSeriOrder.QualityCheckTime = grmi.DateTime(time.Now())
 	err = seriDao.InsertOne(insertSeriOrder)
 	if err != nil {
 		session.Rollback()
@@ -853,7 +855,7 @@ func (impl *ReclinerReclstServiceImplement) UpdateUnPrint(recIds []int) error {
  ******************************************************************************/
 func (impl *ReclinerReclstServiceImplement) FirstPartRepair(user *global.User, entity *model.ReclinerReclst) error {
 	grmi.Log(user, "/services/qm/implments/ReclinerReclst.service.impl.go", "FirstPartRepair", "首件返修")
-	var nextNumberStr string
+
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
@@ -861,7 +863,6 @@ func (impl *ReclinerReclstServiceImplement) FirstPartRepair(user *global.User, e
 	if err != nil {
 		return err
 	}
-	dao := dal.NewReclinerReclstDAO(session, user.PlantNr, user.UserId)
 	seriDao := omDal.NewSerialOrderDAO(session, user.PlantNr, user.UserId)
 	statusDao := omDal.NewSerialOrderStatusDAO(session, user.PlantNr, user.UserId)
 	seriInfo, err := seriDao.SelectBySerialOrder(entity.SerialOrderId)
@@ -888,70 +889,6 @@ func (impl *ReclinerReclstServiceImplement) FirstPartRepair(user *global.User, e
 		session.Rollback()
 		return grmi.NewBusinessError("条码状态不需要首件校验!")
 	}
-
-	orderId := entity.SerialOrderId
-
-	if len(orderId) < 11 {
-		session.Rollback()
-		return grmi.NewBusinessError("订单号长度不合法!")
-	}
-	//获取机器码
-	machineCode := orderId[0:4]
-	ColorValue := orderId[10:11]
-	now := time.Now()
-	year := now.Year()
-	month := int(now.Month())
-	day := now.Day()
-	yearStr := bmodel.YEAR_MAP[year]
-	monthStr := bmodel.MONTH_MAP[month]
-	dayStr := bmodel.DAY_MAP[day]
-	temOrderId := machineCode + yearStr + monthStr + dayStr
-	//计算map反转
-	seriMap := make(map[int]string)
-	for k, v := range bmodel.ReworkMap {
-		key := v
-		val := k
-		seriMap[key] = val
-	}
-	//查询当天的机器码对应的返修流水号
-	reworkData, err := dao.SelectOneRework(temOrderId)
-	if reworkData != nil {
-		lastOrderId := reworkData.ReclinerNr
-		serialNumber := lastOrderId[7:9]
-
-		nowNumber, ok := bmodel.ReworkMap[serialNumber]
-		nextNumber := utils.ValueToInt((nowNumber + 1), 0)
-		if ok {
-			if nextNumber <= 102 {
-				nextNumberStr, ok = seriMap[nextNumber]
-				if !ok {
-					session.Rollback()
-					return grmi.NewBusinessError("流水号生成超出范围!")
-				}
-			} else {
-				session.Rollback()
-				return grmi.NewBusinessError("流水号生成超出范围!")
-			}
-		}
-	} else {
-		nextNumberStr = seriMap[1]
-	}
-	if len(nextNumberStr) != 2 {
-		session.Rollback()
-		return grmi.NewBusinessError("流水号生成错误!")
-	}
-	serialOrderId := machineCode + yearStr + monthStr + dayStr + nextNumberStr + "0" + ColorValue
-
-	entity.ReclinerNr = serialOrderId
-	entity.ArtId = seriInfo.ArtId
-	entity.Line = seriInfo.PlanResourceId
-	entity.RecType = model.QM_SERI_TYPE
-	entity.Status = "N"
-	err = dao.InsertOne(entity)
-	if err != nil {
-		session.Rollback()
-		return err
-	}
 	//更新seriorder订单表
 	serialOrderStatus.Status = bmodel.WO_STATUS_FINISHED
 	err = statusDao.UpdateOne(serialOrderStatus)