为Article增加了两个字段

dao/base/Article.dao.go

@@ -10,17 +10,17 @@ import (
 )
 
 /******************************************************************************
-*
-* @Interface Name           : ArticleDAO
-*-----------------------------------------------------------------------------
-*
-* @Description              : Article的数据访问对象接口
-*
-* @Author                   : 代码生成器创建
-*
-* @Date                     : 2021-03-24 09:53:49
-*
-******************************************************************************/
+ *
+ * @Interface Name           : ArticleDAO
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : Article的数据访问对象接口
+ *
+ * @Author                   : 代码生成器创建
+ *
+ * @Date                     : 2021-05-06 15:41:10
+ *
+ ******************************************************************************/
 type ArticleDAO interface {
 	/******************************************************************************
 	 *

meta/base/Article.meta.go

@@ -13,7 +13,7 @@ import (
  *
  * @Author                   : 代码生成器创建
  *
- * @Date                     : 2021-04-20 10:57:41
+ * @Date                     : 2021-05-06 15:41:10
  *
  ******************************************************************************/
 var Article_PlantNr = grmi.NewField("PlantNr", "Article.PlantNr", "plantnr", grmi.TypeInt)
@@ -44,6 +44,8 @@ var Article_ArtSpec3 = grmi.NewField("ArtSpec3", "Article.ArtSpec3", "artspec3",
 var Article_ArtSpec4 = grmi.NewField("ArtSpec4", "Article.ArtSpec4", "artspec4", grmi.TypeString)
 var Article_ArtSpec5 = grmi.NewField("ArtSpec5", "Article.ArtSpec5", "artspec5", grmi.TypeString)
 var Article_DefaultInspectPlanId = grmi.NewField("DefaultInspectPlanId", "Article.DefaultInspectPlanId", "defaultinspectplanid", grmi.TypeString)
+var Article_PlanResourceGroupId = grmi.NewField("PlanResourceGroupId", "Article.PlanResourceGroupId", "planresourcegroupid", grmi.TypeString)
+var Article_PlanResourceId = grmi.NewField("PlanResourceId", "Article.PlanResourceId", "planresourceid", grmi.TypeString)
 var Article_LastModify = grmi.NewField("LastModify", "Article.LastModify", "lastmodify", grmi.TypeDateTime)
 var Article_LastUser = grmi.NewField("LastUser", "Article.LastUser", "lastuser", grmi.TypeString)
 var Article_CreateTime = grmi.NewField("CreateTime", "Article.CreateTime", "createtime", grmi.TypeDateTime)
@@ -54,7 +56,7 @@ var Article_CreateTime = grmi.NewField("CreateTime", "Article.CreateTime", "crea
  *
  * @Author                   : 代码生成器创建
  *
- * @Date                     : 2021-04-20 10:57:41
+ * @Date                     : 2021-05-06 15:41:10
  *
  ******************************************************************************/
 var Article = grmi.NewEntity(
@@ -89,9 +91,11 @@ var Article = grmi.NewEntity(
 		Article_ArtSpec4.Name:              Article_ArtSpec4,
 		Article_ArtSpec5.Name:              Article_ArtSpec5,
 		Article_DefaultInspectPlanId.Name:  Article_DefaultInspectPlanId,
+		Article_PlanResourceGroupId.Name:   Article_PlanResourceGroupId,
+		Article_PlanResourceId.Name:        Article_PlanResourceId,
 		Article_LastModify.Name:            Article_LastModify,
 		Article_LastUser.Name:              Article_LastUser,
 		Article_CreateTime.Name:            Article_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"Descr1", "Descr2", "ArtTypeId", "ProjectId", "CustMaterialId", "AlternativeMaterialId", "UomId", "QuantityPerHour", "DeliveryBuffer", "Icon", "DisplayColor", "Document", "DefaultRoute", "LotSize", "ABCClass", "ArtSize1", "ArtSize2", "ArtSize3", "ArtSize4", "ArtSize5", "ArtSpec1", "ArtSpec2", "ArtSpec3", "ArtSpec4", "ArtSpec5", "DefaultInspectPlanId", "LastUser"})
+	[]string{"Descr1", "Descr2", "ArtTypeId", "ProjectId", "CustMaterialId", "AlternativeMaterialId", "UomId", "QuantityPerHour", "DeliveryBuffer", "Icon", "DisplayColor", "Document", "DefaultRoute", "LotSize", "ABCClass", "ArtSize1", "ArtSize2", "ArtSize3", "ArtSize4", "ArtSize5", "ArtSpec1", "ArtSpec2", "ArtSpec3", "ArtSpec4", "ArtSpec5", "DefaultInspectPlanId", "PlanResourceGroupId", "PlanResourceId", "LastUser"})

models/base/Article.model.go

@@ -16,7 +16,7 @@ import (
  *
  * @Author                   : 代码生成器创建
  *
- * @Date                     : 2021-03-23 17:06:57
+ * @Date                     : 2021-05-06 15:41:10
  *
  ******************************************************************************/
 type Article struct {
@@ -48,6 +48,8 @@ type Article struct {
 	ArtSpec4              string        `xorm:"nvarchar(100) 'ArtSpec4' not null" json:"Article-ArtSpec4"`
 	ArtSpec5              string        `xorm:"nvarchar(100) 'ArtSpec5' not null" json:"Article-ArtSpec5"`
 	DefaultInspectPlanId  string        `xorm:"nvarchar(40) 'DefaultInspectPlanId' not null" json:"Article-DefaultInspectPlanId"`
+	PlanResourceGroupId   string        `xorm:"nvarchar(40) 'PlanResourceGroupId' not null" json:"Article-PlanResourceGroupId"`
+	PlanResourceId        string        `xorm:"nvarchar(40) 'PlanResourceId' not null" json:"Article-PlanResourceId"`
 	LastModify            grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"Article-LastModify"`
 	LastUser              string        `xorm:"nvarchar(20) 'LastUser' not null" json:"Article-LastUser"`
 	CreateTime            grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"Article-CreateTime"`

services/base/Article.service.go

@@ -9,17 +9,17 @@ import (
 )
 
 /******************************************************************************
-*
-* @Interface Name           : ArticleService
-*-----------------------------------------------------------------------------
-*
-* @Description              : Article的服务接口
-*
-* @Author                   : 代码生成器创建
-*
-* @Date                     : 2021-03-18 23:20:31
-*
-******************************************************************************/
+ *
+ * @Interface Name           : ArticleService
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : Article的服务接口
+ *
+ * @Author                   : 代码生成器创建
+ *
+ * @Date                     : 2021-05-06 15:41:10
+ *
+ ******************************************************************************/
 type ArticleService interface {
 	/******************************************************************************
 	 *

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

@@ -18,7 +18,7 @@ import (
  *
  * @Author                   : 代码生成器创建
  *
- * @Date                     : 2021-03-23 10:43:27
+ * @Date                     : 2021-05-06 15:41:10
  *
  ******************************************************************************/
 var DefaultConditionOfArticle = grmi.NewCondition(
@@ -50,6 +50,8 @@ var DefaultConditionOfArticle = grmi.NewCondition(
 		meta.Article_ArtSpec4.UrlParameterName:              grmi.NewConditionItem(meta.Article_ArtSpec4, grmi.Equal, false),
 		meta.Article_ArtSpec5.UrlParameterName:              grmi.NewConditionItem(meta.Article_ArtSpec5, grmi.Equal, false),
 		meta.Article_DefaultInspectPlanId.UrlParameterName:  grmi.NewConditionItem(meta.Article_DefaultInspectPlanId, grmi.Equal, false),
+		meta.Article_PlanResourceGroupId.UrlParameterName:   grmi.NewConditionItem(meta.Article_PlanResourceGroupId, grmi.Equal, false),
+		meta.Article_PlanResourceId.UrlParameterName:        grmi.NewConditionItem(meta.Article_PlanResourceId, grmi.Equal, false),
 		meta.Article_LastModify.UrlParameterName:            grmi.NewConditionItem(meta.Article_LastModify, grmi.Approximate, false),
 		meta.Article_LastUser.UrlParameterName:              grmi.NewConditionItem(meta.Article_LastUser, grmi.Equal, false),
 		meta.Article_CreateTime.UrlParameterName:            grmi.NewConditionItem(meta.Article_CreateTime, grmi.Approximate, false),
@@ -72,17 +74,17 @@ var DefaultConditionOfArticleAndPaging = grmi.NewCondition(
 )
 
 /******************************************************************************
-*
-* @Struct Name              : ArticleServiceImplement
-*-----------------------------------------------------------------------------
-*
-* @Description              : Article的服务实现
-*
-* @Author                   : 代码生成器创建
-*
-* @Date                     : 2021-03-23 10:43:27
-*
-******************************************************************************/
+ *
+ * @Struct Name              : ArticleServiceImplement
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : Article的服务实现
+ *
+ * @Author                   : 代码生成器创建
+ *
+ * @Date                     : 2021-05-06 15:41:10
+ *
+ ******************************************************************************/
 type ArticleServiceImplement struct {
 }
 
@@ -219,13 +221,13 @@ func (impl *ArticleServiceImplement) SelectOne(user *models.Usertab, artId strin
 	if err != nil {
 		return nil, err
 	}
-	if utils.ValueIsEmpty(result){
+	if utils.ValueIsEmpty(result) {
 		return nil, err
 	}
 	//获取已分配的属性集合
 	var attrCodes []int
-	for _,v := range list{
-		attrCodes = append(attrCodes,v.AttrCode)
+	for _, v := range list {
+		attrCodes = append(attrCodes, v.AttrCode)
 	}
 	unlist, err := lstdao.SelectUnAllot(attrCodes)
 	if err != nil {