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

meta/base/Snr.meta.go

@@ -29,6 +29,21 @@ var Snr_EndNr = grmi.NewField("EndNr", "[Snr].EndNr", "endnr", grmi.TypeInt)
 var Snr_Step = grmi.NewField("Step", "[Snr].Step", "step", grmi.TypeInt)
 var Snr_Length = grmi.NewField("Length", "[Snr].Length", "length", grmi.TypeInt)
 var Snr_NextNr = grmi.NewField("NextNr", "[Snr].NextNr", "nextnr", grmi.TypeInt)
+var Snr_Data1MappingToggle = grmi.NewField("Data1MappingToggle", "[Snr].Data1MappingToggle", "data1mappingtoggle", grmi.TypeBool)
+var Snr_Data1Mapper = grmi.NewField("Data1Mapper", "[Snr].Data1Mapper", "data1mapper", grmi.TypeString)
+
+var Snr_Data2MappingToggle = grmi.NewField("Data2MappingToggle", "[Snr].Data2MappingToggle", "data2mappingtoggle", grmi.TypeBool)
+var Snr_Data2Mapper = grmi.NewField("Data2Mapper", "[Snr].Data2Mapper", "data2mapper", grmi.TypeString)
+
+var Snr_Data3MappingToggle = grmi.NewField("Data3MappingToggle", "[Snr].Data3MappingToggle", "data3mappingtoggle", grmi.TypeBool)
+var Snr_Data3Mapper = grmi.NewField("Data3Mapper", "[Snr].Data3Mapper", "data3mapper", grmi.TypeString)
+
+var Snr_Data4MappingToggle = grmi.NewField("Data4MappingToggle", "[Snr].Data4MappingToggle", "data4mappingtoggle", grmi.TypeBool)
+var Snr_Data4Mapper = grmi.NewField("Data4Mapper", "[Snr].Data4Mapper", "data4mapper", grmi.TypeString)
+
+var Snr_Data5MappingToggle = grmi.NewField("Data5MappingToggle", "[Snr].Data5MappingToggle", "data5mappingtoggle", grmi.TypeBool)
+var Snr_Data5Mapper = grmi.NewField("Data5Mapper", "[Snr].Data5Mapper", "data5mapper", grmi.TypeString)
+
 var Snr_LastNrCreate = grmi.NewField("LastNrCreate", "[Snr].LastNrCreate", "lastnrcreate", grmi.TypeString)
 var Snr_ResetNrRule = grmi.NewField("ResetNrRule", "[Snr].ResetNrRule", "resetnrrule", grmi.TypeString)
 var Snr_OverflowHandling = grmi.NewField("OverflowHandling", "[Snr].OverflowHandling", "overflowhandling", grmi.TypeString)
@@ -53,29 +68,39 @@ var Snr = grmi.NewEntity(
 	"Snr",
 	func() interface{} { return &model.Snr{} },
 	map[string]grmi.Field{
-		Snr_PlantNr.Name:          Snr_PlantNr,
-		Snr_SnrId.Name:            Snr_SnrId,
-		Snr_Descr.Name:            Snr_Descr,
-		Snr_ValidFrom.Name:        Snr_ValidFrom,
-		Snr_ValidTo.Name:          Snr_ValidTo,
-		Snr_Prefix.Name:           Snr_Prefix,
-		Snr_Infix.Name:            Snr_Infix,
-		Snr_Postfix.Name:          Snr_Postfix,
-		Snr_StartNr.Name:          Snr_StartNr,
-		Snr_EndNr.Name:            Snr_EndNr,
-		Snr_Step.Name:             Snr_Step,
-		Snr_Length.Name:           Snr_Length,
-		Snr_NextNr.Name:           Snr_NextNr,
-		Snr_LastNrCreate.Name:     Snr_LastNrCreate,
-		Snr_ResetNrRule.Name:      Snr_ResetNrRule,
-		Snr_OverflowHandling.Name: Snr_OverflowHandling,
-		Snr_IdentifierFormat.Name: Snr_IdentifierFormat,
-		Snr_DateVariable.Name:     Snr_DateVariable,
-		Snr_DateFormat.Name:       Snr_DateFormat,
-		Snr_Identifierlayout.Name: Snr_Identifierlayout,
-		Snr_LastModify.Name:       Snr_LastModify,
-		Snr_LastUser.Name:         Snr_LastUser,
-		Snr_CreateTime.Name:       Snr_CreateTime,
+		Snr_PlantNr.Name:            Snr_PlantNr,
+		Snr_SnrId.Name:              Snr_SnrId,
+		Snr_Descr.Name:              Snr_Descr,
+		Snr_ValidFrom.Name:          Snr_ValidFrom,
+		Snr_ValidTo.Name:            Snr_ValidTo,
+		Snr_Prefix.Name:             Snr_Prefix,
+		Snr_Infix.Name:              Snr_Infix,
+		Snr_Postfix.Name:            Snr_Postfix,
+		Snr_StartNr.Name:            Snr_StartNr,
+		Snr_EndNr.Name:              Snr_EndNr,
+		Snr_Step.Name:               Snr_Step,
+		Snr_Length.Name:             Snr_Length,
+		Snr_NextNr.Name:             Snr_NextNr,
+		Snr_Data1MappingToggle.Name: Snr_Data1MappingToggle,
+		Snr_Data1Mapper.Name:        Snr_Data1Mapper,
+		Snr_Data2MappingToggle.Name: Snr_Data2MappingToggle,
+		Snr_Data2Mapper.Name:        Snr_Data2Mapper,
+		Snr_Data3MappingToggle.Name: Snr_Data3MappingToggle,
+		Snr_Data3Mapper.Name:        Snr_Data3Mapper,
+		Snr_Data4MappingToggle.Name: Snr_Data4MappingToggle,
+		Snr_Data4Mapper.Name:        Snr_Data4Mapper,
+		Snr_Data5MappingToggle.Name: Snr_Data5MappingToggle,
+		Snr_Data5Mapper.Name:        Snr_Data5Mapper,
+		Snr_LastNrCreate.Name:       Snr_LastNrCreate,
+		Snr_ResetNrRule.Name:        Snr_ResetNrRule,
+		Snr_OverflowHandling.Name:   Snr_OverflowHandling,
+		Snr_IdentifierFormat.Name:   Snr_IdentifierFormat,
+		Snr_DateVariable.Name:       Snr_DateVariable,
+		Snr_DateFormat.Name:         Snr_DateFormat,
+		Snr_Identifierlayout.Name:   Snr_Identifierlayout,
+		Snr_LastModify.Name:         Snr_LastModify,
+		Snr_LastUser.Name:           Snr_LastUser,
+		Snr_CreateTime.Name:         Snr_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"Descr", "ValidFrom", "ValidTo", "Prefix", "Infix", "Postfix", "StartNr", "EndNr", "Step", "Length", "NextNr", "LastNrCreate", "ResetNrRule", "OverflowHandling", "IdentifierFormat", "DateVariable", "DateFormat", "Identifierlayout", "LastUser"})
+	[]string{"Descr", "ValidFrom", "ValidTo", "Prefix", "Infix", "Postfix", "StartNr", "EndNr", "Step", "Length", "NextNr", "Data1MappingToggle", "Data1Mapper", "Data2MappingToggle", "Data2Mapper", "Data3MappingToggle", "Data3Mapper", "Data4MappingToggle", "Data4Mapper", "Data5MappingToggle", "Data5Mapper", "LastNrCreate", "ResetNrRule", "OverflowHandling", "IdentifierFormat", "DateVariable", "DateFormat", "Identifierlayout", "LastUser"})

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

@@ -22,28 +22,38 @@ import (
  ******************************************************************************/
 var DefaultConditionOfSnr = grmi.NewCondition(
 	map[string]grmi.ConditionItem{
-		meta.Snr_SnrId.UrlParameterName:            grmi.NewConditionItem(meta.Snr_SnrId, grmi.Equal, true),
-		meta.Snr_Descr.UrlParameterName:            grmi.NewConditionItem(meta.Snr_Descr, grmi.Equal, false),
-		meta.Snr_ValidFrom.UrlParameterName:        grmi.NewConditionItem(meta.Snr_ValidFrom, grmi.Equal, false),
-		meta.Snr_ValidTo.UrlParameterName:          grmi.NewConditionItem(meta.Snr_ValidTo, grmi.Equal, false),
-		meta.Snr_Prefix.UrlParameterName:           grmi.NewConditionItem(meta.Snr_Prefix, grmi.Equal, false),
-		meta.Snr_Infix.UrlParameterName:            grmi.NewConditionItem(meta.Snr_Infix, grmi.Equal, false),
-		meta.Snr_Postfix.UrlParameterName:          grmi.NewConditionItem(meta.Snr_Postfix, grmi.Equal, false),
-		meta.Snr_StartNr.UrlParameterName:          grmi.NewConditionItem(meta.Snr_StartNr, grmi.Equal, false),
-		meta.Snr_EndNr.UrlParameterName:            grmi.NewConditionItem(meta.Snr_EndNr, grmi.Equal, false),
-		meta.Snr_Step.UrlParameterName:             grmi.NewConditionItem(meta.Snr_Step, grmi.Equal, false),
-		meta.Snr_Length.UrlParameterName:           grmi.NewConditionItem(meta.Snr_Length, grmi.Equal, false),
-		meta.Snr_NextNr.UrlParameterName:           grmi.NewConditionItem(meta.Snr_NextNr, grmi.Equal, false),
-		meta.Snr_LastNrCreate.UrlParameterName:     grmi.NewConditionItem(meta.Snr_LastNrCreate, grmi.Equal, false),
-		meta.Snr_ResetNrRule.UrlParameterName:      grmi.NewConditionItem(meta.Snr_ResetNrRule, grmi.Equal, false),
-		meta.Snr_OverflowHandling.UrlParameterName: grmi.NewConditionItem(meta.Snr_OverflowHandling, grmi.Equal, false),
-		meta.Snr_IdentifierFormat.UrlParameterName: grmi.NewConditionItem(meta.Snr_IdentifierFormat, grmi.Equal, false),
-		meta.Snr_DateVariable.UrlParameterName:     grmi.NewConditionItem(meta.Snr_DateVariable, grmi.Equal, false),
-		meta.Snr_DateFormat.UrlParameterName:       grmi.NewConditionItem(meta.Snr_DateFormat, grmi.Equal, false),
-		meta.Snr_Identifierlayout.UrlParameterName: grmi.NewConditionItem(meta.Snr_Identifierlayout, grmi.Equal, false),
-		meta.Snr_LastModify.UrlParameterName:       grmi.NewConditionItem(meta.Snr_LastModify, grmi.Approximate, false),
-		meta.Snr_LastUser.UrlParameterName:         grmi.NewConditionItem(meta.Snr_LastUser, grmi.Equal, false),
-		meta.Snr_CreateTime.UrlParameterName:       grmi.NewConditionItem(meta.Snr_CreateTime, grmi.Approximate, false),
+		meta.Snr_SnrId.UrlParameterName:              grmi.NewConditionItem(meta.Snr_SnrId, grmi.Equal, true),
+		meta.Snr_Descr.UrlParameterName:              grmi.NewConditionItem(meta.Snr_Descr, grmi.Equal, false),
+		meta.Snr_ValidFrom.UrlParameterName:          grmi.NewConditionItem(meta.Snr_ValidFrom, grmi.Equal, false),
+		meta.Snr_ValidTo.UrlParameterName:            grmi.NewConditionItem(meta.Snr_ValidTo, grmi.Equal, false),
+		meta.Snr_Prefix.UrlParameterName:             grmi.NewConditionItem(meta.Snr_Prefix, grmi.Equal, false),
+		meta.Snr_Infix.UrlParameterName:              grmi.NewConditionItem(meta.Snr_Infix, grmi.Equal, false),
+		meta.Snr_Postfix.UrlParameterName:            grmi.NewConditionItem(meta.Snr_Postfix, grmi.Equal, false),
+		meta.Snr_StartNr.UrlParameterName:            grmi.NewConditionItem(meta.Snr_StartNr, grmi.Equal, false),
+		meta.Snr_EndNr.UrlParameterName:              grmi.NewConditionItem(meta.Snr_EndNr, grmi.Equal, false),
+		meta.Snr_Step.UrlParameterName:               grmi.NewConditionItem(meta.Snr_Step, grmi.Equal, false),
+		meta.Snr_Length.UrlParameterName:             grmi.NewConditionItem(meta.Snr_Length, grmi.Equal, false),
+		meta.Snr_NextNr.UrlParameterName:             grmi.NewConditionItem(meta.Snr_NextNr, grmi.Equal, false),
+		meta.Snr_Data1MappingToggle.UrlParameterName: grmi.NewConditionItem(meta.Snr_Data1MappingToggle, grmi.Equal, false),
+		meta.Snr_Data1Mapper.UrlParameterName:        grmi.NewConditionItem(meta.Snr_Data1Mapper, grmi.Equal, false),
+		meta.Snr_Data2MappingToggle.UrlParameterName: grmi.NewConditionItem(meta.Snr_Data2MappingToggle, grmi.Equal, false),
+		meta.Snr_Data2Mapper.UrlParameterName:        grmi.NewConditionItem(meta.Snr_Data2Mapper, grmi.Equal, false),
+		meta.Snr_Data3MappingToggle.UrlParameterName: grmi.NewConditionItem(meta.Snr_Data3MappingToggle, grmi.Equal, false),
+		meta.Snr_Data3Mapper.UrlParameterName:        grmi.NewConditionItem(meta.Snr_Data3Mapper, grmi.Equal, false),
+		meta.Snr_Data4MappingToggle.UrlParameterName: grmi.NewConditionItem(meta.Snr_Data4MappingToggle, grmi.Equal, false),
+		meta.Snr_Data4Mapper.UrlParameterName:        grmi.NewConditionItem(meta.Snr_Data4Mapper, grmi.Equal, false),
+		meta.Snr_Data5MappingToggle.UrlParameterName: grmi.NewConditionItem(meta.Snr_Data5MappingToggle, grmi.Equal, false),
+		meta.Snr_Data5Mapper.UrlParameterName:        grmi.NewConditionItem(meta.Snr_Data5Mapper, grmi.Equal, false),
+		meta.Snr_LastNrCreate.UrlParameterName:       grmi.NewConditionItem(meta.Snr_LastNrCreate, grmi.Equal, false),
+		meta.Snr_ResetNrRule.UrlParameterName:        grmi.NewConditionItem(meta.Snr_ResetNrRule, grmi.Equal, false),
+		meta.Snr_OverflowHandling.UrlParameterName:   grmi.NewConditionItem(meta.Snr_OverflowHandling, grmi.Equal, false),
+		meta.Snr_IdentifierFormat.UrlParameterName:   grmi.NewConditionItem(meta.Snr_IdentifierFormat, grmi.Equal, false),
+		meta.Snr_DateVariable.UrlParameterName:       grmi.NewConditionItem(meta.Snr_DateVariable, grmi.Equal, false),
+		meta.Snr_DateFormat.UrlParameterName:         grmi.NewConditionItem(meta.Snr_DateFormat, grmi.Equal, false),
+		meta.Snr_Identifierlayout.UrlParameterName:   grmi.NewConditionItem(meta.Snr_Identifierlayout, grmi.Equal, false),
+		meta.Snr_LastModify.UrlParameterName:         grmi.NewConditionItem(meta.Snr_LastModify, grmi.Approximate, false),
+		meta.Snr_LastUser.UrlParameterName:           grmi.NewConditionItem(meta.Snr_LastUser, grmi.Equal, false),
+		meta.Snr_CreateTime.UrlParameterName:         grmi.NewConditionItem(meta.Snr_CreateTime, grmi.Approximate, false),
 	},
 	nil,
 )

services/om/implments/SerialOrder.service.impl.go

@@ -195,7 +195,7 @@ func (impl *SerialOrderServiceImplement) InsertOne(user *global.User, entity *mo
 		_ = session.Rollback()
 		return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error())
 	}
-	serialOrderId := product.MachineCode + serialNumber + product.ColorValue
+	serialOrderId := product.MachineCode + serialNumber + product.ProductType + product.ColorValue
 	entity.SerialOrderId = serialOrderId
 	err = dao.InsertOne(entity)
 	if err != nil {

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

@@ -631,7 +631,7 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde
 				}
 				//machineCode := product.MachineCode
 				//serialOrderId := machineCode + yearStr + monthStr + dayStr + firstStr + secondStr + "0" + product.ColorValue
-				serialOrderId := product.MachineCode + serialNumber + product.ColorValue
+				serialOrderId := product.MachineCode + serialNumber + product.ProductType + product.ColorValue
 				schedKeyStr, err := snrDao.GetNextSnr(workLine.SchedKeySnr)
 				if err != nil {
 					_ = session.Rollback()
@@ -875,7 +875,7 @@ func (impl *CustOrderServiceImplement) LockCustOrderForGantt(user *global.User,
 				}
 				//machineCode := product.MachineCode
 				//serialOrderId := machineCode + yearStr + monthStr + dayStr + firstStr + secondStr + "0" + product.ColorValue
-				serialOrderId := product.MachineCode + serialNumber + product.ColorValue
+				serialOrderId := product.MachineCode + serialNumber + product.ProductType + product.ColorValue
 				schedKeyStr, err := snrDao.GetNextSnr(workLine.SchedKeySnr)
 				if err != nil {
 					_ = session.Rollback()