条码打印- 零件号处理

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

@@ -560,16 +560,16 @@ func (impl *ReclinerReclstServiceImplement) InsertSeriOne(user *global.User, ent
 	insertSeriOrder = seriInfo
 	insertSeriOrder.SerialOrderId = serialOrderId
 	insertSeriOrder.LinkSerialOrderId = seriInfo.SerialOrderId
-	if seriInfo.OrderType == bmodel.ODER_TYPE_REODER{
+	if seriInfo.OrderType == bmodel.ODER_TYPE_REODER {
 		insertSeriOrder.OriginSerialOrderId = seriInfo.OriginSerialOrderId
-	}else{
-		insertSeriOrder.OriginSerialOrderId =  seriInfo.SerialOrderId
+	} else {
+		insertSeriOrder.OriginSerialOrderId = seriInfo.SerialOrderId
 	}
 	insertSeriOrder.OrderType = bmodel.ODER_TYPE_REODER
 	insertSeriOrder.GenerateFlag = false
 	insertSeriOrder.RepairFlag = false
 	err = seriDao.InsertOne(insertSeriOrder)
-	if err != nil{
+	if err != nil {
 		session.Rollback()
 		return err
 	}
@@ -578,7 +578,7 @@ func (impl *ReclinerReclstServiceImplement) InsertSeriOne(user *global.User, ent
 	insertSeriOrderStatus.SerialOrderId = insertSeriOrder.SerialOrderId
 	insertSeriOrderStatus.Status = bmodel.WO_STATUS_FINISHED
 	err = statusDao.InsertOne(insertSeriOrderStatus)
-	if err != nil{
+	if err != nil {
 		session.Rollback()
 		return err
 	}
@@ -772,15 +772,28 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 		detail.Pos = (k + 1)
 		detail.VariableName = v.LabelItemValue
 		//映射值
-		if detail.VariableName == "$SN$" {
+		if detail.VariableName == "$SerialOrderId$" {
 			detail.VariableValue = entity.ReclinerNr
-		} else if detail.VariableName == "$DATE$" {
+		} else if detail.VariableName == "$date$" {
 			dateStr := utils.TimeFormat(orderInfo.PlanStartTime.Restore(), "yyyy/MM/dd")
 			detail.VariableValue = dateStr
-		} else if detail.VariableName == "$CUSTID$" {
+		} else if detail.VariableName == "$AlternativeArtId$" {
 			detail.VariableValue = artInfo.AlternativeArtId
 		} else if detail.VariableName == "$ORDERID$" {
 			detail.VariableValue = entity.ReclinerNr
+		} else if detail.VariableName == "$Descr2$" {
+			detail.VariableValue = artInfo.Descr2
+		} else if detail.VariableName == "$Descr1$" {
+			detail.VariableValue = artInfo.Descr1
+		} else if detail.VariableName == "$CustArtId$" {
+			detail.VariableValue = artInfo.CustArtId
+		} else if detail.VariableName == "*$SerialOrderId$*" {
+			detail.VariableValue = "*" + entity.ReclinerNr + "*"
+		} else if detail.VariableName == "$ArtId$" {
+			if len(artInfo.ArtId) < 7 {
+				continue
+			}
+			detail.VariableValue = artInfo.ArtId[:7]
 		}
 		err = detailDao.InsertOne(detail)
 		if err != nil {
@@ -1025,8 +1038,8 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 	}
 	serialOrderStatusRec := omModel.SerialOrderStatusRecLst{
 		SerialOrderId: serialOrderId,
-		PrevStatus: serialOrderStatus.Status,
-		Status: bmodel.WO_STATUS_STOP,
+		PrevStatus:    serialOrderStatus.Status,
+		Status:        bmodel.WO_STATUS_STOP,
 	}
 	err = serialOrderStatusRecDao.InsertOne(&serialOrderStatusRec)
 	if err != nil {
@@ -1056,10 +1069,10 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 		}
 		serialOrderPoRec := omModel.SerialOrderPOStatusRecLst{
 			SerialOrderId: serialOrderId,
-			PO: po,
-			Pos: maxPos+1,
-			PrevStatus: serialOrderPo.Status,
-			Status: bmodel.WO_STATUS_STOP,
+			PO:            po,
+			Pos:           maxPos + 1,
+			PrevStatus:    serialOrderPo.Status,
+			Status:        bmodel.WO_STATUS_STOP,
 		}
 		stepLi, err := serialOrderStepDao.Select([]grmi.Predicate{omMeta.SerialOrderStepLst_SerialOrderId.NewPredicate(grmi.Equal, serialOrderId),
 			omMeta.SerialOrderStepLst_PO.NewPredicate(grmi.Equal, po)}, []grmi.Field{omMeta.SerialOrderStepLst_StepNo})
@@ -1109,12 +1122,12 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 		for index, step := range stepLi {
 			stepStatusRec := omModel.SerialOrderStepStatusRecLst{
 				SerialOrderId: serialOrderId,
-				OperationId: step.OperationId,
-				Pos: stepStatusMaxPos + 1 + index,
-				PO: po,
-				StepNo: step.StepNo,
-				PrevStatus: step.Status,
-				Status: bmodel.WO_STATUS_STOP,
+				OperationId:   step.OperationId,
+				Pos:           stepStatusMaxPos + 1 + index,
+				PO:            po,
+				StepNo:        step.StepNo,
+				PrevStatus:    step.Status,
+				Status:        bmodel.WO_STATUS_STOP,
 			}
 			stepStatusRecLi = append(stepStatusRecLi, stepStatusRec)
 			step.Status = bmodel.WO_STATUS_STOP
@@ -1126,7 +1139,7 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 		}
 		tempStepStatusRecLi := make([]omModel.SerialOrderStepStatusRecLst, 0, 20)
 		for index, statusRec := range stepStatusRecLi {
-			if index != 0 && index % 20 == 0 {
+			if index != 0 && index%20 == 0 {
 				err = serialOrderStepRecDao.Insert(&tempStepStatusRecLi)
 				if err != nil {
 					_ = session.Rollback()
@@ -1147,16 +1160,16 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 		opDetailStatusRecLi := make([]omModel.SerialOrderOPDetailStatusRecLst, 0, len(opDetailLi))
 		for index, opDetail := range opDetailLi {
 			opDetailStatusRec := omModel.SerialOrderOPDetailStatusRecLst{
-				DetailId: opDetail.DetailId,
-				Pos: opDetailMaxPos + 1 + index,
+				DetailId:      opDetail.DetailId,
+				Pos:           opDetailMaxPos + 1 + index,
 				SerialOrderId: serialOrderId,
-				PO: po,
-				SubArtId: opDetail.SubArtId,
-				StepNo: opDetail.StepNo,
-				OriginPos: opDetail.Pos,
-				StepType: opDetail.StepType,
-				PrevStatus: opDetail.Status,
-				Status: bmodel.WO_STATUS_STOP,
+				PO:            po,
+				SubArtId:      opDetail.SubArtId,
+				StepNo:        opDetail.StepNo,
+				OriginPos:     opDetail.Pos,
+				StepType:      opDetail.StepType,
+				PrevStatus:    opDetail.Status,
+				Status:        bmodel.WO_STATUS_STOP,
 			}
 			opDetailStatusRecLi = append(opDetailStatusRecLi, opDetailStatusRec)
 			opDetail.Status = bmodel.WO_STATUS_STOP
@@ -1168,7 +1181,7 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 		}
 		tempOpdetailStatusRecLi := make([]omModel.SerialOrderOPDetailStatusRecLst, 0, 20)
 		for index, statusRec := range opDetailStatusRecLi {
-			if index != 0 && index % 20 == 0 {
+			if index != 0 && index%20 == 0 {
 				err = opDetailRecDao.Insert(&tempOpdetailStatusRecLi)
 				if err != nil {
 					_ = session.Rollback()
@@ -1187,15 +1200,15 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 		}
 		// 写入repair info
 		repairInfo := bmodel.RepairInfo{
-			WorkLineId: serialOrder.UsedResourceId,
-			PO: po,
+			WorkLineId:    serialOrder.UsedResourceId,
+			PO:            po,
 			SerialOrderId: serialOrderId,
-			RepairReason: "线上返修",
-			Status: bmodel.WO_STATUS_STOP,
-			IsActive: 1,
-			LastModify: grmi.DateTime(time.Now()),
-			LastUser: user.UserId,
-			CreateTime: grmi.DateTime(time.Now()),
+			RepairReason:  "线上返修",
+			Status:        bmodel.WO_STATUS_STOP,
+			IsActive:      1,
+			LastModify:    grmi.DateTime(time.Now()),
+			LastUser:      user.UserId,
+			CreateTime:    grmi.DateTime(time.Now()),
 		}
 		_, err = session.Table("RepairInfo").InsertOne(&repairInfo)
 		if err != nil {
@@ -1205,4 +1218,4 @@ func (impl *ReclinerReclstServiceImplement) BackOnline(user *global.User, serial
 	}
 	_ = session.Commit()
 	return nil
-}
+}

task/printer.go

@@ -3,6 +3,7 @@ package task
 import (
 	qmsvr "LAPP_ACURA_MOM_BACKEND/services/qm"
 	qmmodel "LAPP_ACURA_MOM_BACKEND/models/qm"
+	"LAPP_ACURA_MOM_BACKEND/web/middleware/glog"
 	"context"
 	"time"
 )
@@ -27,6 +28,7 @@ func CreateRecPrintTask() {
 
 		data, err := serviceOfRec.SelectUnPrint(printNum)
 		if err != nil {
+			glog.InfoExtln("返修打印错误日志","err:",err)
 			return
 		}
 		//锁定
@@ -35,6 +37,7 @@ func CreateRecPrintTask() {
 		}
 		err = serviceOfRec.UpdateUnPrint(recList)
 		if err != nil {
+			glog.InfoExtln("返修打印错误日志","err:",err)
 			time.Sleep(1 * time.Second)
 			continue
 		}
@@ -61,6 +64,7 @@ func doTaskPrintRec(ctx context.Context) {
 			var serviceOfRec = qmsvr.NewReclinerReclstService()
 			err := serviceOfRec.CreateRecPrintInfo(task)
 			if err !=nil{
+				glog.InfoExtln("返修打印错误日志","err:",err)
 				continue
 			}
 		}