添加打印规则配置数量 同时生成opdetail时把数量携带到intPara1

meta/base/PrintBasicRuleInfo.meta.go

@@ -35,6 +35,7 @@ var PrintBasicRuleInfo_WhetherCheckContent = grmi.NewField("WhetherCheckContent"
 var PrintBasicRuleInfo_PrinterId = grmi.NewField("PrinterId", "[PrintBasicRuleInfo].PrinterId", "printerid", grmi.TypeString)
 var PrintBasicRuleInfo_TemplateId = grmi.NewField("TemplateId", "[PrintBasicRuleInfo].TemplateId", "templateid", grmi.TypeString)
 var PrintBasicRuleInfo_TemplateType = grmi.NewField("TemplateType", "[PrintBasicRuleInfo].TemplateType", "templatetype", grmi.TypeString)
+var PrintBasicRuleInfo_Qty = grmi.NewField("Qty", "[PrintBasicRuleInfo].Qty", "qty", grmi.TypeInt)
 var PrintBasicRuleInfo_LastModify = grmi.NewField("LastModify", "[PrintBasicRuleInfo].LastModify", "lastmodify", grmi.TypeDateTime)
 var PrintBasicRuleInfo_LastUser = grmi.NewField("LastUser", "[PrintBasicRuleInfo].LastUser", "lastuser", grmi.TypeString)
 var PrintBasicRuleInfo_CreateTime = grmi.NewField("CreateTime", "[PrintBasicRuleInfo].CreateTime", "createtime", grmi.TypeDateTime)
@@ -71,9 +72,10 @@ var PrintBasicRuleInfo = grmi.NewEntity(
 		PrintBasicRuleInfo_PrinterId.Name:           PrintBasicRuleInfo_PrinterId,
 		PrintBasicRuleInfo_TemplateType.Name:        PrintBasicRuleInfo_TemplateType,
 		PrintBasicRuleInfo_TemplateId.Name:          PrintBasicRuleInfo_TemplateId,
+		PrintBasicRuleInfo_Qty.Name:                 PrintBasicRuleInfo_Qty,
 		PrintBasicRuleInfo_LastModify.Name:          PrintBasicRuleInfo_LastModify,
 		PrintBasicRuleInfo_LastUser.Name:            PrintBasicRuleInfo_LastUser,
 		PrintBasicRuleInfo_CreateTime.Name:          PrintBasicRuleInfo_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"PO", "StepNo", "StepDesc", "ProjectId", "TemplateChooseModel", "DependPO", "DependStepNo", "DependRuleId", "DependValue", "Action", "WhetherCheckContent", "PrinterId", "TemplateType", "TemplateId", "LastUser"})
+	[]string{"PO", "StepNo", "StepDesc", "ProjectId", "TemplateChooseModel", "DependPO", "DependStepNo", "DependRuleId", "DependValue", "Action", "WhetherCheckContent", "PrinterId", "TemplateType", "TemplateId", "Qty", "LastUser"})

models/base/PrintBasicRuleInfo.model.go

@@ -39,6 +39,7 @@ type PrintBasicRuleInfo struct {
 	PrinterId           string        `xorm:"nvarchar(40) 'PrinterId' not null" json:"PrintBasicRuleInfo-PrinterId"`
 	TemplateType        string        `xorm:"nvarchar(10) 'TemplateType' " json:"PrintBasicRuleInfo-TemplateType"`
 	TemplateId          string        `xorm:"nvarchar(40) 'TemplateId' " json:"PrintBasicRuleInfo-TemplateId"`
+	Qty                 int           `xorm:"int 'Qty' not null" json:"PrintBasicRuleInfo-Qty"`
 	LastModify          grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"PrintBasicRuleInfo-LastModify"`
 	LastUser            string        `xorm:"nvarchar(20) 'LastUser' not null" json:"PrintBasicRuleInfo-LastUser"`
 	CreateTime          grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"PrintBasicRuleInfo-CreateTime"`

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

@@ -41,6 +41,7 @@ var DefaultConditionOfPrintBasicRuleInfo = grmi.NewCondition(
 		meta.PrintBasicRuleInfo_PrinterId.UrlParameterName:           grmi.NewConditionItem(meta.PrintBasicRuleInfo_PrinterId, grmi.Equal, false),
 		meta.PrintBasicRuleInfo_TemplateType.UrlParameterName:        grmi.NewConditionItem(meta.PrintBasicRuleInfo_TemplateType, grmi.Equal, false),
 		meta.PrintBasicRuleInfo_TemplateId.UrlParameterName:          grmi.NewConditionItem(meta.PrintBasicRuleInfo_TemplateId, grmi.Equal, false),
+		meta.PrintBasicRuleInfo_Qty.UrlParameterName:                 grmi.NewConditionItem(meta.PrintBasicRuleInfo_Qty, grmi.Equal, false),
 		meta.PrintBasicRuleInfo_LastModify.UrlParameterName:          grmi.NewConditionItem(meta.PrintBasicRuleInfo_LastModify, grmi.Approximate, false),
 		meta.PrintBasicRuleInfo_LastUser.UrlParameterName:            grmi.NewConditionItem(meta.PrintBasicRuleInfo_LastUser, grmi.Equal, false),
 		meta.PrintBasicRuleInfo_CreateTime.UrlParameterName:          grmi.NewConditionItem(meta.PrintBasicRuleInfo_CreateTime, grmi.Approximate, false),
@@ -103,7 +104,9 @@ func NewPrintBasicRuleInfoServiceImplement() *PrintBasicRuleInfoServiceImplement
 func (impl *PrintBasicRuleInfoServiceImplement) InsertOne(user *global.User, entity *model.PrintBasicRuleInfo) error {
 
 	grmi.Log(user, "/services/base/implments/PrintBasicRuleInfo.service.impl.go", "InsertOnePrintBasicRuleInfo", "插入一个PrintBasicRuleInfo")
-
+	if entity.Qty <= 0 {
+		return grmi.NewBusinessError("打印数量小于或等于0")
+	}
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
@@ -228,7 +231,9 @@ func (impl *PrintBasicRuleInfoServiceImplement) SelectOne(user *global.User, ope
 func (impl *PrintBasicRuleInfoServiceImplement) UpdateOne(user *global.User, entity *model.PrintBasicRuleInfo) error {
 
 	grmi.Log(user, "/services/base/implments/PrintBasicRuleInfo.service.impl.go", "UpdateOnePrintBasicRuleInfo", "修改一个PrintBasicRuleInfo")
-
+	if entity.Qty <= 0 {
+		return grmi.NewBusinessError("打印数量小于或等于0")
+	}
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()

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

@@ -1285,6 +1285,10 @@ func (impl *SerialOrderServiceImplement) PrintRuleInfo(user *global.User, sessio
 	labelHeadDao := baseDal.NewLabelHeadDAO(session, user.PlantNr, user.UserId)
 	labelDetailDao := baseDal.NewLabelDetailDAO(session, user.PlantNr, user.UserId)
 	serialOrderDetailDao := dal.NewSerialOrderOPDetailDAO(session, user.PlantNr, user.UserId)
+	var qty = 1
+	if rule != nil {
+		qty = rule.Qty
+	}
 	// 生成打印规则
 	op := model.SerialOrderOPDetail{
 		SerialOrderId: serialOrderStep.SerialOrderId,
@@ -1296,6 +1300,7 @@ func (impl *SerialOrderServiceImplement) PrintRuleInfo(user *global.User, sessio
 		Status:        baseModel.WO_STATUS_RELEASED,
 		StepNo:        serialOrderStep.StepNo,
 		BKFlag:        bkFlag,
+		IntPara1:      qty,
 	}
 	err = serialOrderDetailDao.InsertOne(&op)
 	if err != nil {