添加字段Enable 添加product的类型定义

meta/me/ProductFamily.meta.go

@@ -29,6 +29,7 @@ var ProductFamily_Jph = grmi.NewField("Jph", "[ME_ProductFamily].Jph", "jph", gr
 var ProductFamily_WorkLineId = grmi.NewField("WorkLineId", "[ME_ProductFamily].WorkLineId", "worklineid", grmi.TypeString)
 var ProductFamily_PackTypeId = grmi.NewField("PackTypeId", "[ME_ProductFamily].PackTypeId", "packtypeid", grmi.TypeString)
 var ProductFamily_CheckSyncKey = grmi.NewField("CheckSyncKey", "[ME_ProductFamily].CheckSyncKey", "checksynckey", grmi.TypeBool)
+var ProductFamily_Enable = grmi.NewField("Enable", "[ME_ProductFamily].Enable", "enable", grmi.TypeBool)
 var ProductFamily_CtrlPara1 = grmi.NewField("CtrlPara1", "[ME_ProductFamily].CtrlPara1", "ctrlpara1", grmi.TypeInt)
 var ProductFamily_CtrlPara2 = grmi.NewField("CtrlPara2", "[ME_ProductFamily].CtrlPara2", "ctrlpara2", grmi.TypeInt)
 var ProductFamily_CtrlStr1 = grmi.NewField("CtrlStr1", "[ME_ProductFamily].CtrlStr1", "ctrlstr1", grmi.TypeString)
@@ -63,8 +64,9 @@ var ProductFamily = grmi.NewEntity(
 		ProductFamily_AutoGenPackToggle.Name: ProductFamily_AutoGenPackToggle,
 		ProductFamily_Jph.Name:               ProductFamily_Jph,
 		ProductFamily_WorkLineId.Name:        ProductFamily_WorkLineId,
-		ProductFamily_PackTypeId.Name: ProductFamily_PackTypeId,
-		ProductFamily_CheckSyncKey.Name: ProductFamily_CheckSyncKey,
+		ProductFamily_PackTypeId.Name:        ProductFamily_PackTypeId,
+		ProductFamily_CheckSyncKey.Name:      ProductFamily_CheckSyncKey,
+		ProductFamily_Enable.Name:            ProductFamily_Enable,
 		ProductFamily_CtrlPara1.Name:         ProductFamily_CtrlPara1,
 		ProductFamily_CtrlPara2.Name:         ProductFamily_CtrlPara2,
 		ProductFamily_CtrlStr1.Name:          ProductFamily_CtrlStr1,
@@ -76,4 +78,4 @@ var ProductFamily = grmi.NewEntity(
 		ProductFamily_CreateTime.Name:        ProductFamily_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"Descr", "ProjectId", "ConfigValue", "ModelValue", "ColorValue", "BroadcastPoint", "AutoGenPackToggle", "Jph", "WorkLineId", "PackTypeId", "CheckSyncKey", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})
+	[]string{"Descr", "ProjectId", "ConfigValue", "ModelValue", "ColorValue", "BroadcastPoint", "AutoGenPackToggle", "Jph", "WorkLineId", "PackTypeId", "CheckSyncKey", "Enable", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})

models/me/ProductFamily.model.go

@@ -33,6 +33,7 @@ type ProductFamily struct {
 	WorkLineId        string                `xorm:"nvarchar(40) 'WorkLineId' not null" json:"ME_ProductFamily-WorkLineId"`
 	PackTypeId        string                `xorm:"nvarchar(40) 'PackTypeId' not null" json:"ME_ProductFamily-PackTypeId"`
 	CheckSyncKey      bool                  `xorm:"bit 'CheckSyncKey' not null" json:"ME_ProductFamily-CheckSyncKey"`
+	Enable            bool                  `xorm:"bit 'Enable' not null" json:"ME_ProductFamily-Enable"`
 	CtrlPara1         int                   `xorm:"int 'CtrlPara1' not null" json:"ME_ProductFamily-CtrlPara1"`
 	CtrlPara2         int                   `xorm:"int 'CtrlPara2' not null" json:"ME_ProductFamily-CtrlPara2"`
 	CtrlStr1          string                `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"ME_ProductFamily-CtrlStr1"`

models/me/const.go

@@ -1 +1,9 @@
 package me
+
+const (
+	PRODUCT_TYPE_MS = "MS" // 主驾
+	PRODUCT_TYPE_PS = "PS" // 副驾
+	PRODUCT_TYPE_40 = "40%" // 40%
+	PRODUCT_TYPE_60 = "60%" // 60%
+	PRODUCT_TYPE_CUSHION = "CUSHION" // 坐垫
+)

services/me/implments/ProductFamily.service.impl.go

@@ -40,6 +40,7 @@ var DefaultConditionOfProductFamily = grmi.NewCondition(
 		meta.ProductFamily_WorkLineId.UrlParameterName:        grmi.NewConditionItem(meta.ProductFamily_WorkLineId, grmi.Equal, false),
 		meta.ProductFamily_PackTypeId.UrlParameterName:        grmi.NewConditionItem(meta.ProductFamily_PackTypeId, grmi.Equal, false),
 		meta.ProductFamily_CheckSyncKey.UrlParameterName:      grmi.NewConditionItem(meta.ProductFamily_CheckSyncKey, grmi.Equal, false),
+		meta.ProductFamily_Enable.UrlParameterName:            grmi.NewConditionItem(meta.ProductFamily_Enable, grmi.Equal, false),
 		meta.ProductFamily_CtrlPara1.UrlParameterName:         grmi.NewConditionItem(meta.ProductFamily_CtrlPara1, grmi.Equal, false),
 		meta.ProductFamily_CtrlPara2.UrlParameterName:         grmi.NewConditionItem(meta.ProductFamily_CtrlPara2, grmi.Equal, false),
 		meta.ProductFamily_CtrlStr1.UrlParameterName:          grmi.NewConditionItem(meta.ProductFamily_CtrlStr1, grmi.Equal, false),
@@ -167,7 +168,7 @@ func (impl *ProductFamilyServiceImplement) Association(user *global.User, entity
 			ProjectId:       record.ProjectId,
 			ProductDescr:    v.Descr,
 			Count:           v.Count,
-			Pos:             k+1,
+			Pos:             k + 1,
 		})
 	}
 	if len(relateData) == 0 {
@@ -612,7 +613,7 @@ func (impl *ProductFamilyServiceImplement) ImportFromExcel(user *global.User, fi
 	fmt.Println("productFamilyLi:", productFamilyLi)
 	tempProductFamilyLi := make([]model.ProductFamily, 0, 20)
 	for index, productFamily := range productFamilyLi {
-		if index != 0 && index % 20 == 0 {
+		if index != 0 && index%20 == 0 {
 			err = daoProductFamily.Insert(&tempProductFamilyLi)
 			if err != nil {
 				_ = session.Rollback()