包装单扫描进发运车逻辑修改

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)

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"})

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"`

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),

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