From 10b793f3696e7742298c3ec3928095836ce8640a Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Thu, 28 Oct 2021 13:01:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8D=95=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E8=BF=9B=E5=8F=91=E8=BF=90=E8=BD=A6=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/log/implments/PackOrder.dao.impl.go | 4 +-- meta/base/Printer.meta.go | 28 +++++++++++-------- models/base/Printer.model.go | 19 +++++++------ .../base/implments/Printer.service.impl.go | 11 +++++--- .../log/implments/PackOrder.service.impl.go | 17 +++++++++-- 5 files changed, 51 insertions(+), 28 deletions(-) diff --git a/dao/log/implments/PackOrder.dao.impl.go b/dao/log/implments/PackOrder.dao.impl.go index 01cce24..b2f1e25 100644 --- a/dao/log/implments/PackOrder.dao.impl.go +++ b/dao/log/implments/PackOrder.dao.impl.go @@ -343,8 +343,8 @@ func (impl *PackOrderDAOImplement) SelectUnPrint(num int) ([]model.PackOrder, er ******************************************************************************/ func (impl *PackOrderDAOImplement) UpdateUnPrint(packIds []string) error { entity := new(model.PackOrder) - entity.Status = 1 - session := impl.session.Table(impl.meta.TableName).Select("Status").In("PackOrderId", packIds).Where("PlantNr = ? and Status = ?", impl.plantNr, common.PACK_STATUS_CLOSED) + entity.PrinterStatus = common.ARTICLE_STATUS_USED + session := impl.session.Table(impl.meta.TableName).Select("PrinterStatus").In("PackOrderId", packIds).Where("PlantNr = ? and Status = ?", impl.plantNr, common.PACK_STATUS_CLOSED) _, err := session.Update(entity) if err != nil { return grmi.NewDataBaseError(err) diff --git a/meta/base/Printer.meta.go b/meta/base/Printer.meta.go index d294d36..c4b90dd 100644 --- a/meta/base/Printer.meta.go +++ b/meta/base/Printer.meta.go @@ -13,20 +13,23 @@ import ( * * @Author : 代码生成器创建 * - * @Date : 2021-10-25 11:26:18 + * @Date : 2021-10-28 11:35:56 * ******************************************************************************/ var Printer_PlantNr = grmi.NewField("PlantNr", "Printer.PlantNr", "plantnr", grmi.TypeInt) var Printer_PrinterId = grmi.NewField("PrinterId", "Printer.PrinterId", "printerid", grmi.TypeString) var Printer_Descr = grmi.NewField("Descr", "Printer.Descr", "descr", grmi.TypeString) var Printer_PrinterType = grmi.NewField("PrinterType", "Printer.PrinterType", "printertype", grmi.TypeString) -var Printer_PrinterName = grmi.NewField("PrinterName", "Printer.PrinterName", "printername", grmi.TypeString) -var Printer_IpAddress = grmi.NewField("IpAddress", "Printer.IpAddress", "ipaddress", grmi.TypeString) -var Printer_Active = grmi.NewField("Active", "Printer.Active", "active", grmi.TypeInt) +var Printer_PrintMode = grmi.NewField("PrintMode", "Printer.PrintMode", "printmode", grmi.TypeString) var Printer_PrinterSpec = grmi.NewField("PrinterSpec", "Printer.PrinterSpec", "printerspec", grmi.TypeString) -var Printer_PageSize = grmi.NewField("PageSize", "Printer.PageSize", "pagesize", grmi.TypeString) +var Printer_PrinterName = grmi.NewField("PrinterName", "Printer.PrinterName", "printername", grmi.TypeString) var Printer_Port = grmi.NewField("Port", "Printer.Port", "port", grmi.TypeInt) var Printer_PrintInterval = grmi.NewField("PrintInterval", "Printer.PrintInterval", "printinterval", grmi.TypeInt) +var Printer_IP = grmi.NewField("IP", "Printer.IP", "ip", grmi.TypeString) +var Printer_PrinterPara1 = grmi.NewField("PrinterPara1", "Printer.PrinterPara1", "printerpara1", grmi.TypeInt) +var Printer_PrinterPara2 = grmi.NewField("PrinterPara2", "Printer.PrinterPara2", "printerpara2", grmi.TypeInt) +var Printer_PrinterSpec1 = grmi.NewField("PrinterSpec1", "Printer.PrinterSpec1", "printerspec1", grmi.TypeString) +var Printer_PrinterSpec2 = grmi.NewField("PrinterSpec2", "Printer.PrinterSpec2", "printerspec2", grmi.TypeString) var Printer_LastModify = grmi.NewField("LastModify", "Printer.LastModify", "lastmodify", grmi.TypeDateTime) var Printer_LastUser = grmi.NewField("LastUser", "Printer.LastUser", "lastuser", grmi.TypeString) var Printer_CreateTime = grmi.NewField("CreateTime", "Printer.CreateTime", "createtime", grmi.TypeDateTime) @@ -37,7 +40,7 @@ var Printer_CreateTime = grmi.NewField("CreateTime", "Printer.CreateTime", "crea * * @Author : 代码生成器创建 * - * @Date : 2021-10-25 11:26:18 + * @Date : 2021-10-28 11:35:56 * ******************************************************************************/ var Printer = grmi.NewEntity( @@ -48,16 +51,19 @@ var Printer = grmi.NewEntity( Printer_PrinterId.Name: Printer_PrinterId, Printer_Descr.Name: Printer_Descr, Printer_PrinterType.Name: Printer_PrinterType, - Printer_PrinterName.Name: Printer_PrinterName, - Printer_IpAddress.Name: Printer_IpAddress, - Printer_Active.Name: Printer_Active, + Printer_PrintMode.Name: Printer_PrintMode, Printer_PrinterSpec.Name: Printer_PrinterSpec, - Printer_PageSize.Name: Printer_PageSize, + Printer_PrinterName.Name: Printer_PrinterName, Printer_Port.Name: Printer_Port, Printer_PrintInterval.Name: Printer_PrintInterval, + Printer_IP.Name: Printer_IP, + Printer_PrinterPara1.Name: Printer_PrinterPara1, + Printer_PrinterPara2.Name: Printer_PrinterPara2, + Printer_PrinterSpec1.Name: Printer_PrinterSpec1, + Printer_PrinterSpec2.Name: Printer_PrinterSpec2, Printer_LastModify.Name: Printer_LastModify, Printer_LastUser.Name: Printer_LastUser, Printer_CreateTime.Name: Printer_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "PrinterType", "PrinterName", "IpAddress", "Active", "PrinterSpec", "PageSize", "Port", "PrintInterval", "LastUser"}) + []string{"Descr", "PrinterType", "PrintMode", "PrinterSpec", "PrinterName", "Port", "PrintInterval", "IP", "PrinterPara1", "PrinterPara2", "PrinterSpec1", "PrinterSpec2", "LastUser"}) diff --git a/models/base/Printer.model.go b/models/base/Printer.model.go index d7247e4..b6bba82 100644 --- a/models/base/Printer.model.go +++ b/models/base/Printer.model.go @@ -21,16 +21,19 @@ import ( ******************************************************************************/ type Printer struct { PlantNr int `xorm:"pk int 'PlantNr'" json:"Printer-PlantNr"` - PrinterId string `xorm:"pk varchar(18) 'PrinterId'" json:"Printer-PrinterId"` - Descr string `xorm:"varchar(30) 'Descr' not null" json:"Printer-Descr"` - PrinterType string `xorm:"varchar(1) 'PrinterType' not null" json:"Printer-PrinterType"` - PrinterName string `xorm:"varchar(100) 'PrinterName' not null" json:"Printer-PrinterName"` - IpAddress string `xorm:"varchar(15) 'IpAddress' not null" json:"Printer-IpAddress"` - Active int `xorm:"smallint 'Active' not null" json:"Printer-Active"` - PrinterSpec string `xorm:"varchar(30) 'PrinterSpec' not null" json:"Printer-PrinterSpec"` - PageSize string `xorm:"varchar(18) 'PageSize' not null" json:"Printer-PageSize"` + PrinterId string `xorm:"pk nvarchar(40) 'PrinterId'" json:"Printer-PrinterId"` + Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"Printer-Descr"` + PrinterType string `xorm:"nvarchar(10) 'PrinterType' not null" json:"Printer-PrinterType"` + PrintMode string `xorm:"nvarchar(10) 'PrintMode' not null" json:"Printer-PrintMode"` + PrinterSpec string `xorm:"nvarchar(40) 'PrinterSpec' not null" json:"Printer-PrinterSpec"` + PrinterName string `xorm:"nvarchar(40) 'PrinterName' not null" json:"Printer-PrinterName"` Port int `xorm:"int 'Port' not null" json:"Printer-Port"` PrintInterval int `xorm:"int 'PrintInterval' not null" json:"Printer-PrintInterval"` + IP string `xorm:"nvarchar(40) 'IP' not null" json:"Printer-IP"` + PrinterPara1 int `xorm:"int 'PrinterPara1' not null" json:"Printer-PrinterPara1"` + PrinterPara2 int `xorm:"int 'PrinterPara2' not null" json:"Printer-PrinterPara2"` + PrinterSpec1 string `xorm:"nvarchar(100) 'PrinterSpec1' not null" json:"Printer-PrinterSpec1"` + PrinterSpec2 string `xorm:"nvarchar(100) 'PrinterSpec2' not null" json:"Printer-PrinterSpec2"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"Printer-LastModify"` LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"Printer-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"Printer-CreateTime"` diff --git a/services/base/implments/Printer.service.impl.go b/services/base/implments/Printer.service.impl.go index 54ae56d..67531fd 100644 --- a/services/base/implments/Printer.service.impl.go +++ b/services/base/implments/Printer.service.impl.go @@ -25,13 +25,16 @@ var DefaultConditionOfPrinter = grmi.NewCondition( meta.Printer_PrinterId.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterId, grmi.Equal, true), meta.Printer_Descr.UrlParameterName: grmi.NewConditionItem(meta.Printer_Descr, grmi.Equal, false), meta.Printer_PrinterType.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterType, grmi.Equal, false), - meta.Printer_PrinterName.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterName, grmi.Equal, false), - meta.Printer_IpAddress.UrlParameterName: grmi.NewConditionItem(meta.Printer_IpAddress, grmi.Equal, false), - meta.Printer_Active.UrlParameterName: grmi.NewConditionItem(meta.Printer_Active, grmi.Equal, false), + meta.Printer_PrintMode.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrintMode, grmi.Equal, false), meta.Printer_PrinterSpec.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterSpec, grmi.Equal, false), - meta.Printer_PageSize.UrlParameterName: grmi.NewConditionItem(meta.Printer_PageSize, grmi.Equal, false), + meta.Printer_PrinterName.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterName, grmi.Equal, false), meta.Printer_Port.UrlParameterName: grmi.NewConditionItem(meta.Printer_Port, grmi.Equal, false), meta.Printer_PrintInterval.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrintInterval, grmi.Equal, false), + meta.Printer_IP.UrlParameterName: grmi.NewConditionItem(meta.Printer_IP, grmi.Equal, false), + meta.Printer_PrinterPara1.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterPara1, grmi.Equal, false), + meta.Printer_PrinterPara2.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterPara2, grmi.Equal, false), + meta.Printer_PrinterSpec1.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterSpec1, grmi.Equal, false), + meta.Printer_PrinterSpec2.UrlParameterName: grmi.NewConditionItem(meta.Printer_PrinterSpec2, grmi.Equal, false), meta.Printer_LastModify.UrlParameterName: grmi.NewConditionItem(meta.Printer_LastModify, grmi.Approximate, false), meta.Printer_LastUser.UrlParameterName: grmi.NewConditionItem(meta.Printer_LastUser, grmi.Equal, false), meta.Printer_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.Printer_CreateTime, grmi.Approximate, false), diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index acfce09..df927b2 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -8,6 +8,7 @@ import ( "LAPP_GAAS_GFrame_BACKEND/dao/base" basedal "LAPP_GAAS_GFrame_BACKEND/dao/base" omdal "LAPP_GAAS_GFrame_BACKEND/dao/om" + bmeta "LAPP_GAAS_GFrame_BACKEND/meta/base" "LAPP_GAAS_GFrame_BACKEND/utils" "fmt" //medal "LAPP_GAAS_GFrame_BACKEND/dao/me" @@ -523,7 +524,7 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC return nil, err } if serialOrderStatus == nil || serialOrderStatus.Status != bmodel.WO_STATUS_FINISHED { - return nil, grmi.NewBusinessError("工单状态不正确!") + return nil, grmi.NewBusinessError("工单状态未完成!") } packTemplateDAO := dal.NewPackTemplateDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) predicates, err := ConditionOfItemsOfPackOrderTemplate.BuildPredicates(map[string]string{}) @@ -570,7 +571,7 @@ func (self *PackOrderServiceImplement) OpenPackOrderWithTemplate(context *contai return err } if serialOrderStatus == nil || serialOrderStatus.Status != bmodel.WO_STATUS_FINISHED { - return grmi.NewBusinessError("工单状态不正确!") + return grmi.NewBusinessError("工单状态未完成!") } packTemplateDAO := dal.NewPackTemplateDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) packTemplate, err := packTemplateDAO.SelectOne(packTemplateId) @@ -688,7 +689,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o return nil,err } if serialOrderStatus == nil || serialOrderStatus.Status != bmodel.WO_STATUS_FINISHED { - return nil,grmi.NewBusinessError("工单状态不正确!") + return nil,grmi.NewBusinessError("工单状态未完成!") } //判断条码是否已经生成过包装 @@ -1577,6 +1578,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model. headDao := basedal.NewLabelHeadDAO(session, bmodel.PlantNr, "taskPrint") detailDao := basedal.NewLabelDetailDAO(session, bmodel.PlantNr, "taskPrint") temPackDao := dal.NewPackTemplateDAO(session, bmodel.PlantNr, "taskPrint") + lstdao := basedal.NewLabelTemplateDetailDAO(session, bmodel.PlantNr, "taskPrint") //打印标签 //1)根据打印模板Id查询对应的规则信息 @@ -1590,6 +1592,14 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model. session.Rollback() return grmi.NewBusinessError("打印模板不存在!") } + list, err := lstdao.Select([]grmi.Predicate{ + bmeta.LabelTemplateDetail_LabelTemplateId.NewPredicate(grmi.Equal, printerTem.LabelTemplateId), + }, nil) + if err != nil { + session.Rollback() + return grmi.NewBusinessError("打印模板配置不存在!") + } + printerTem.LabelTemplateDetail = list //2)查询对应的信息集合，构建出map集合 artInfo, err := artDao.SelectOne(packOrder.MaterialId) if err != nil || printerTem == nil { @@ -1633,6 +1643,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model. for _, v := range printerTem.LabelTemplateDetail { if v.ValueParseToggle { baseDetailInfo := new(bmodel.LabelDetail) + baseDetailInfo.LabelId = labelId baseDetailInfo.PlantNr = v.PlantNr baseDetailInfo.Pos = (num + 1) baseDetailInfo.VariableName = v.LabelItemValue From adf7ae9ece383a0ecb704474f3d02e8d7ea2a08c Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Thu, 28 Oct 2021 13:50:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/implments/PackOrder.service.impl.go | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index df927b2..33e156f 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -512,14 +512,14 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC /****查询订单信息并且校验*********/ serialDao := omdal.NewSerialOrderDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) statusDao := omdal.NewSerialOrderStatusDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) - serialOrderInfo,err := serialDao.SelectBySerialOrder(orderId) + serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId) if err != nil { return nil, err } if serialOrderInfo == nil { return nil, grmi.NewBusinessError("工单信息不存在!") } - serialOrderStatus,err := statusDao.SelectOne(orderId) + serialOrderStatus, err := statusDao.SelectOne(orderId) if err != nil { return nil, err } @@ -559,14 +559,14 @@ func (self *PackOrderServiceImplement) OpenPackOrderWithTemplate(context *contai /****查询订单信息并且校验*********/ serialDao := omdal.NewSerialOrderDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) statusDao := omdal.NewSerialOrderStatusDAO(context.Session(), self.session.User().Pid, self.session.User().Userid) - serialOrderInfo,err := serialDao.SelectBySerialOrder(orderId) + serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId) if err != nil { return err } if serialOrderInfo == nil { return grmi.NewBusinessError("工单信息不存在!") } - serialOrderStatus,err := statusDao.SelectOne(orderId) + serialOrderStatus, err := statusDao.SelectOne(orderId) if err != nil { return err } @@ -677,19 +677,19 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o /****查询订单信息并且校验*********/ serialDao := omdal.NewSerialOrderDAO(session, user.Pid, user.Userid) statusDao := omdal.NewSerialOrderStatusDAO(session, user.Pid, user.Userid) - serialOrderInfo,err := serialDao.SelectBySerialOrder(orderId) + serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId) if err != nil { - return nil,err + return nil, err } if serialOrderInfo == nil { - return nil,grmi.NewBusinessError("工单信息不存在!") + return nil, grmi.NewBusinessError("工单信息不存在!") } - serialOrderStatus,err := statusDao.SelectOne(orderId) + serialOrderStatus, err := statusDao.SelectOne(orderId) if err != nil { - return nil,err + return nil, err } if serialOrderStatus == nil || serialOrderStatus.Status != bmodel.WO_STATUS_FINISHED { - return nil,grmi.NewBusinessError("工单状态未完成!") + return nil, grmi.NewBusinessError("工单状态未完成!") } //判断条码是否已经生成过包装 @@ -779,7 +779,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o packTemplate := packTemplants[0] snr := new(models.Snrtab) snr.Finr = user.Pid - packOrderId, err := snr.GetNextSnr("PackOrder") + packOrderId, err := snr.GetNextSnr(packTemplate.PackOrderSn) if err != nil { packsession.Rollback() return nil, grmi.NewBusinessError("生成包装流水号失败!") @@ -946,19 +946,19 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord /****查询订单信息并且校验*********/ serialDao := omdal.NewSerialOrderDAO(session, user.Pid, user.Userid) statusDao := omdal.NewSerialOrderStatusDAO(session, user.Pid, user.Userid) - serialOrderInfo,err := serialDao.SelectBySerialOrder(orderId) + serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId) if err != nil { - return nil,err + return nil, err } if serialOrderInfo == nil { - return nil,grmi.NewBusinessError("工单信息不存在!") + return nil, grmi.NewBusinessError("工单信息不存在!") } - serialOrderStatus,err := statusDao.SelectOne(orderId) + serialOrderStatus, err := statusDao.SelectOne(orderId) if err != nil { - return nil,err + return nil, err } if serialOrderStatus == nil || serialOrderStatus.Status != bmodel.WO_STATUS_FINISHED { - return nil,grmi.NewBusinessError("工单状态不正确!") + return nil, grmi.NewBusinessError("工单状态不正确!") } temdao := dal.NewPackTemplateDAO(session, user.Pid, user.Userid) @@ -981,7 +981,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord packTemplate := packTemplants[0] snr := new(models.Snrtab) snr.Finr = user.Pid - packOrderId, err := snr.GetNextSnr("PackOrder") + packOrderId, err := snr.GetNextSnr(packTemplate.PackOrderSn) if err != nil { packsession.Rollback() return nil, grmi.NewBusinessError("生成包装流水号失败!") @@ -1089,7 +1089,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *models.Us //生成流水号 snr := new(models.Snrtab) snr.Finr = user.Pid - packOrderId, err := snr.GetNextSnr("PackOrder") + packOrderId, err := snr.GetNextSnr((packTemplate.PackOrderSn)) if err != nil { return grmi.NewBusinessError("生成包装流水号失败!") } @@ -1160,16 +1160,16 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab, /****查询订单信息并且校验*********/ serialDao := omdal.NewSerialOrderDAO(session, user.Pid, user.Userid) statusDao := omdal.NewSerialOrderStatusDAO(session, user.Pid, user.Userid) - serialOrderInfo,err := serialDao.SelectBySerialOrder(orderId) + serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId) if err != nil { return "", err } if serialOrderInfo == nil { return "", grmi.NewBusinessError("工单信息不存在!") } - serialOrderStatus,err := statusDao.SelectOne(orderId) + serialOrderStatus, err := statusDao.SelectOne(orderId) if err != nil { - return "" ,err + return "", err } if serialOrderStatus == nil || serialOrderStatus.Status != bmodel.WO_STATUS_FINISHED { return "", grmi.NewBusinessError("工单状态不正确!") @@ -1613,7 +1613,8 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model. lableMap["$Article-Descr1$"] = artInfo.Descr1 lableMap["$Article-CarModel$"] = artInfo.CarModel lableMap["$LOG_PackOrder-PackOrderId$"] = packOrder.PackOrderId - lableMap["$LOG_PackOrder-ActQty$"] = packOrder.ActQty + lableMap["$LOG_PackOrder-PackOrderCode$"] = packOrder.PackOrderId + lableMap["$LOG_PackOrder-ActQty$"] = utils.ValueToInt(packOrder.ActQty, 0) lableMap["$LOG_PackOrder-CloseTime$"] = utils.TimeFormat(packOrder.CloseTime.Restore(), "yyyy-MM-dd") //3)插入模板表里 baseHeadInfo := new(bmodel.LabelHead)