Merge pull request 'productFamily添加字段packTypeId 同时生成包装模板进行映射' (#37) from feature_me into develop

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

meta/me/ProductFamily.meta.go

@@ -27,6 +27,7 @@ var ProductFamily_BroadcastPoint = grmi.NewField("BroadcastPoint", "[ME_ProductF
 var ProductFamily_AutoGenPackToggle = grmi.NewField("AutoGenPackToggle", "[ME_ProductFamily].AutoGenPackToggle", "autogenpacktoggle", grmi.TypeBool)
 var ProductFamily_Jph = grmi.NewField("Jph", "[ME_ProductFamily].Jph", "jph", grmi.TypeFloat64)
 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_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)
@@ -61,6 +62,7 @@ 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_CtrlPara1.Name:         ProductFamily_CtrlPara1,
 		ProductFamily_CtrlPara2.Name:         ProductFamily_CtrlPara2,
 		ProductFamily_CtrlStr1.Name:          ProductFamily_CtrlStr1,
@@ -72,4 +74,4 @@ var ProductFamily = grmi.NewEntity(
 		ProductFamily_CreateTime.Name:        ProductFamily_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"Descr", "ProjectId", "ConfigValue", "ModelValue", "ColorValue", "BroadcastPoint", "AutoGenPackToggle", "Jph", "WorkLineId", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})
+	[]string{"Descr", "ProjectId", "ConfigValue", "ModelValue", "ColorValue", "BroadcastPoint", "AutoGenPackToggle", "Jph", "WorkLineId", "PackTypeId", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})

models/me/ProductFamily.model.go

@@ -31,6 +31,7 @@ type ProductFamily struct {
 	AutoGenPackToggle bool                  `xorm:"bit 'AutoGenPackToggle' not null" json:"ME_ProductFamily-AutoGenPackToggle"`
 	Jph               float64               `xorm:"float 'Jph' not null" json:"ME_ProductFamily-Jph"`
 	WorkLineId        string                `xorm:"nvarchar(40) 'WorkLineId' not null" json:"ME_ProductFamily-WorkLineId"`
+	PackTypeId        string                `xorm:"nvarchar(40) 'PackTypeId' not null" json:"ME_ProductFamily-PackTypeId"`
 	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"`

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

@@ -35,6 +35,7 @@ var DefaultConditionOfProductFamily = grmi.NewCondition(
 		meta.ProductFamily_AutoGenPackToggle.UrlParameterName: grmi.NewConditionItem(meta.ProductFamily_AutoGenPackToggle, grmi.Equal, false),
 		meta.ProductFamily_Jph.UrlParameterName:               grmi.NewConditionItem(meta.ProductFamily_Jph, grmi.Equal, false),
 		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_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),
@@ -484,7 +485,7 @@ func (impl *ProductFamilyServiceImplement) GeneratePackTemplate(user *global.Use
 		EnabledToggle:  true,
 		Descr:          productFamily.Descr,
 		ProjectId:      productFamily.ProjectId,
-		PackTypeId:     productFamilyId,
+		PackTypeId:     productFamily.PackTypeId,
 		PlanQty:        packTotalQty,
 	}
 	err = templateDao.InsertOne(&packTemplate)