Merge pull request '返修条码进包装变更' (#449) from feature_barcode into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/449
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

dao/qm/ReclinerReclst.dao.go

@@ -284,6 +284,27 @@ type ReclinerReclstDAO interface {
 	 *
 	 ******************************************************************************/
 	UpdateUnPrint(recIds []int) error
+	/******************************************************************************
+	 *
+	 * @Function Name            : SelectRecOne
+	 *-----------------------------------------------------------------------------
+	 *
+	 * @Description              : 查找指定键的ReclinerReclst
+	 *
+	 * @Function Parameters      : 主键
+	 *
+	 * @Function Parameters      : 主键
+	 *
+	 * @Return Value             : 查找到的ReclinerReclst
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : 代码生成器创建
+	 *
+	 * @Date                     : 2021-07-12 14:05:20
+	 *
+	 ******************************************************************************/
+	SelectRecOne(string) (*model.ReclinerReclst, error)
 }
 
 /******************************************************************************

dao/qm/implments/ReclinerReclst.dao.impl.go

@@ -351,3 +351,20 @@ func (impl *ReclinerReclstDAOImplement) UpdateUnPrint(recIds []int) error {
 	}
 	return nil
 }
+
+/******************************************************************************
+ *
+ * @Reference LAPP_GAAS_GFrame_BACKEND/dao/qm/ReclinerReclstDAO.SelectRecOne
+ *
+ ******************************************************************************/
+func (impl *ReclinerReclstDAOImplement) SelectRecOne(orderId string) (*model.ReclinerReclst, error) {
+	var data model.ReclinerReclst
+	ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and ReclinerNr = ? and RecType = ?", impl.plantNr, orderId, model.QM_SERI_TYPE).Get(&data)
+	if err != nil {
+		return nil, grmi.NewDataBaseError(err)
+	}
+	if !ok {
+		return nil, nil
+	}
+	return &data, nil
+}

meta/log/PackOrderItemlst.meta.go

@@ -47,23 +47,23 @@ var PackOrderItemlst = grmi.NewEntity(
 	"LOG_PackOrderItemlst",
 	func() interface{} { return &model.PackOrderItemlst{} },
 	map[string]grmi.Field{
-		PackOrderItemlst_PlantNr.Name:       PackOrderItemlst_PlantNr,
-		PackOrderItemlst_PackOrderId.Name:   PackOrderItemlst_PackOrderId,
-		PackOrderItemlst_Pos.Name:           PackOrderItemlst_Pos,
-		PackOrderItemlst_PosCode.Name:       PackOrderItemlst_PosCode,
-		PackOrderItemlst_MaterialId.Name:    PackOrderItemlst_MaterialId,
-		PackOrderItemlst_SerialOrderId.Name: PackOrderItemlst_SerialOrderId,
-		PackOrderItemlst_PlanQty.Name:       PackOrderItemlst_PlanQty,
-		PackOrderItemlst_ActQty.Name:        PackOrderItemlst_ActQty,
-		PackOrderItemlst_Status.Name:        PackOrderItemlst_Status,
-		PackOrderItemlst_Seq.Name:           PackOrderItemlst_Seq,
-		PackOrderItemlst_PKOICustC1.Name:    PackOrderItemlst_PKOICustC1,
-		PackOrderItemlst_PKOICustC2.Name:    PackOrderItemlst_PKOICustC2,
-		PackOrderItemlst_PKOICustI1.Name:    PackOrderItemlst_PKOICustI1,
-		PackOrderItemlst_PKOICustI2.Name:    PackOrderItemlst_PKOICustI2,
-		PackOrderItemlst_LastModify.Name:    PackOrderItemlst_LastModify,
-		PackOrderItemlst_LastUser.Name:      PackOrderItemlst_LastUser,
-		PackOrderItemlst_CreateTime.Name:    PackOrderItemlst_CreateTime,
+		PackOrderItemlst_PlantNr.Name:             PackOrderItemlst_PlantNr,
+		PackOrderItemlst_PackOrderId.Name:         PackOrderItemlst_PackOrderId,
+		PackOrderItemlst_Pos.Name:                 PackOrderItemlst_Pos,
+		PackOrderItemlst_PosCode.Name:             PackOrderItemlst_PosCode,
+		PackOrderItemlst_MaterialId.Name:          PackOrderItemlst_MaterialId,
+		PackOrderItemlst_SerialOrderId.Name:       PackOrderItemlst_SerialOrderId,
+		PackOrderItemlst_PlanQty.Name:             PackOrderItemlst_PlanQty,
+		PackOrderItemlst_ActQty.Name:              PackOrderItemlst_ActQty,
+		PackOrderItemlst_Status.Name:              PackOrderItemlst_Status,
+		PackOrderItemlst_Seq.Name:                 PackOrderItemlst_Seq,
+		PackOrderItemlst_PKOICustC1.Name:          PackOrderItemlst_PKOICustC1,
+		PackOrderItemlst_PKOICustC2.Name:          PackOrderItemlst_PKOICustC2,
+		PackOrderItemlst_PKOICustI1.Name:          PackOrderItemlst_PKOICustI1,
+		PackOrderItemlst_PKOICustI2.Name:          PackOrderItemlst_PKOICustI2,
+		PackOrderItemlst_LastModify.Name:          PackOrderItemlst_LastModify,
+		PackOrderItemlst_LastUser.Name:            PackOrderItemlst_LastUser,
+		PackOrderItemlst_CreateTime.Name:          PackOrderItemlst_CreateTime,
 	},
 	[]string{"PlantNr"},
 	[]string{"PosCode", "MaterialId", "SerialOrderId", "PlanQty", "ActQty", "Status", "Seq", "PKOI_CustC1", "PKOI_CustC2", "PKOI_CustI1", "PKOI_CustI2", "LastUser"})

models/log/PackOrderItemlst.model.go

@@ -20,23 +20,23 @@ import (
  *
  ******************************************************************************/
 type PackOrderItemlst struct {
-	PlantNr       int           `xorm:"pk int 'PlantNr'" json:"LOG_PackOrderItemlst-PlantNr"`
-	PackOrderId   string        `xorm:"pk nvarchar(40) 'PackOrderId'" json:"LOG_PackOrderItemlst-PackOrderId"`
-	Pos           int           `xorm:"pk int 'Pos'" json:"LOG_PackOrderItemlst-Pos"`
-	PosCode       string        `xorm:"nvarchar(40) 'PosCode' not null" json:"LOG_PackOrderItemlst-PosCode"`
-	MaterialId    string        `xorm:"nvarchar(40) 'MaterialId' not null" json:"LOG_PackOrderItemlst-MaterialId"`
-	SerialOrderId string        `xorm:"nvarchar(40) 'SerialOrderId' not null" json:"LOG_PackOrderItemlst-SerialOrderId"`
-	PlanQty       float64       `xorm:"float 'PlanQty' not null" json:"LOG_PackOrderItemlst-PlanQty"`
-	ActQty        float64       `xorm:"float 'ActQty' not null" json:"LOG_PackOrderItemlst-ActQty"`
-	Status        int           `xorm:"int 'Status' not null" json:"LOG_PackOrderItemlst-Status"`
-	Seq           int           `xorm:"int 'Seq' not null" json:"LOG_PackOrderItemlst-Seq"`
-	PKOICustC1    string        `xorm:"nvarchar(40) 'PKOI_CustC1' not null" json:"LOG_PackOrderItemlst-PKOI_CustC1"`
-	PKOICustC2    string        `xorm:"nvarchar(40) 'PKOI_CustC2' not null" json:"LOG_PackOrderItemlst-PKOI_CustC2"`
-	PKOICustI1    int           `xorm:"int 'PKOI_CustI1' not null" json:"LOG_PackOrderItemlst-PKOI_CustI1"`
-	PKOICustI2    int           `xorm:"int 'PKOI_CustI2' not null" json:"LOG_PackOrderItemlst-PKOI_CustI2"`
-	LastModify    grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_PackOrderItemlst-LastModify"`
-	LastUser      string        `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_PackOrderItemlst-LastUser"`
-	CreateTime    grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_PackOrderItemlst-CreateTime"`
+	PlantNr             int           `xorm:"pk int 'PlantNr'" json:"LOG_PackOrderItemlst-PlantNr"`
+	PackOrderId         string        `xorm:"pk nvarchar(40) 'PackOrderId'" json:"LOG_PackOrderItemlst-PackOrderId"`
+	Pos                 int           `xorm:"pk int 'Pos'" json:"LOG_PackOrderItemlst-Pos"`
+	PosCode             string        `xorm:"nvarchar(40) 'PosCode' not null" json:"LOG_PackOrderItemlst-PosCode"`
+	MaterialId          string        `xorm:"nvarchar(40) 'MaterialId' not null" json:"LOG_PackOrderItemlst-MaterialId"`
+	SerialOrderId       string        `xorm:"nvarchar(40) 'SerialOrderId' not null" json:"LOG_PackOrderItemlst-SerialOrderId"`
+	PlanQty             float64       `xorm:"float 'PlanQty' not null" json:"LOG_PackOrderItemlst-PlanQty"`
+	ActQty              float64       `xorm:"float 'ActQty' not null" json:"LOG_PackOrderItemlst-ActQty"`
+	Status              int           `xorm:"int 'Status' not null" json:"LOG_PackOrderItemlst-Status"`
+	Seq                 int           `xorm:"int 'Seq' not null" json:"LOG_PackOrderItemlst-Seq"`
+	PKOICustC1          string        `xorm:"nvarchar(40) 'PKOI_CustC1' not null" json:"LOG_PackOrderItemlst-PKOI_CustC1"`
+	PKOICustC2          string        `xorm:"nvarchar(40) 'PKOI_CustC2' not null" json:"LOG_PackOrderItemlst-PKOI_CustC2"`
+	PKOICustI1          int           `xorm:"int 'PKOI_CustI1' not null" json:"LOG_PackOrderItemlst-PKOI_CustI1"`
+	PKOICustI2          int           `xorm:"int 'PKOI_CustI2' not null" json:"LOG_PackOrderItemlst-PKOI_CustI2"`
+	LastModify          grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_PackOrderItemlst-LastModify"`
+	LastUser            string        `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_PackOrderItemlst-LastUser"`
+	CreateTime          grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_PackOrderItemlst-CreateTime"`
 }
 
 /******************************************************************************

services/api/implments/ACCUNITID.service.impl.go

@@ -4,19 +4,16 @@ package implments
 
 import (
 	dal "LAPP_GAAS_GFrame_BACKEND/dao/api"
-	qmdal "LAPP_GAAS_GFrame_BACKEND/dao/qm"
 	basedal "LAPP_GAAS_GFrame_BACKEND/dao/base"
+	omDal "LAPP_GAAS_GFrame_BACKEND/dao/om"
+	qmdal "LAPP_GAAS_GFrame_BACKEND/dao/qm"
 	"LAPP_GAAS_GFrame_BACKEND/db"
 	"LAPP_GAAS_GFrame_BACKEND/grmi"
 	meta "LAPP_GAAS_GFrame_BACKEND/meta/api"
 	qmmeta "LAPP_GAAS_GFrame_BACKEND/meta/qm"
-	bmeta "LAPP_GAAS_GFrame_BACKEND/meta/base"
 	model "LAPP_GAAS_GFrame_BACKEND/models/api"
-	common "LAPP_GAAS_GFrame_BACKEND/models/base"
-	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"LAPP_GAAS_GFrame_BACKEND/web/models"
-	"fmt"
-	"strings"
+	"errors"
 )
 
 /******************************************************************************
@@ -191,10 +188,11 @@ func (impl *ACCUNITIDServiceImplement) SelectInfo(user *models.Usertab, recliner
 	dao := dal.NewACCUNITIDDAO(slavesession, user.Userid)
 	result, err := dao.SelectInfo(reclinerNr)
 	if err != nil {
-		fmt.Println(11)
 		return nil, err
 	}
-
+	if result == nil{
+		return nil, errors.New("未找到调角器相关信息")
+	}
 	orderId := result.UNITSN
 
 	//截取物料id
@@ -204,29 +202,23 @@ func (impl *ACCUNITIDServiceImplement) SelectInfo(user *models.Usertab, recliner
 	if err != nil {
 		return nil, err
 	}
-	var artId string
-	if utils.ValueIsEmpty(resultCode.Split) {
-		lstdao := basedal.NewLabelParserDetailLstDAO(session, user.Pid, user.Userid)
-		list, err := lstdao.Select([]grmi.Predicate{
-			bmeta.LabelParserDetailLst_ParserId.NewPredicate(grmi.Equal, "Barcode"),
-		}, nil)
-		if err != nil {
-			return nil, err
-		}
-		resultCode.Valst = list
-		if len(orderId) < resultCode.Length {
-			return nil, grmi.NewBusinessError("序列订单错误!")
-		}
-		codeInfos := common.ParseBarcode(orderId, resultCode.Valst)
-		artId = codeInfos["artId"]
-	} else {
-		artIds := strings.Split(orderId, resultCode.Split)
-		artId = artIds[0]
+	if resultCode == nil{
+		return nil, errors.New("未找到调角器相关信息")
+	}
+
+	//查询序列订单表
+	orderDao := omDal.NewSerialOrderDAO(session, user.Pid, user.Userid)
+	orderInfo, err := orderDao.SelectBySerialOrder(orderId)
+	if err != nil {
+		return nil, err
+	}
+	if orderInfo == nil {
+		return nil, grmi.NewBusinessError("序列订单订单不存在!")
 	}
 
 	// 获取Article
 	articleDAO := basedal.NewArticleDAO(session, user.Pid, user.Userid)
-	article, err := articleDAO.SelectOne(artId)
+	article, err := articleDAO.SelectOne(orderInfo.ArtId)
 	if err != nil {
 		return nil, err
 	}

services/log/implments/PackOrder.service.impl.go

@@ -677,9 +677,19 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 	session := engine.NewSession()
 	defer session.Close()
 
+	reworkSerialOrderId := ""
 	/****查询订单信息并且校验*********/
 	serialDao := omdal.NewSerialOrderDAO(session, user.Pid, user.Userid)
 	statusDao := omdal.NewSerialOrderStatusDAO(session, user.Pid, user.Userid)
+	recDao := qmdal.NewReclinerReclstDAO(session, user.Pid, user.Userid)
+	recData, err := recDao.SelectRecOne(orderId)
+	if err != nil {
+		return nil, err
+	}
+	if recData != nil {
+		orderId = recData.SerialOrderId
+		reworkSerialOrderId = recData.ReclinerNr
+	}
 	serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId)
 	if err != nil {
 		return nil, err
@@ -715,12 +725,11 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 	apiDao := api.NewACCUNITSTATUSDAO(slavesession, user.Userid)
 
 	//查询条码是否返工
-	recDao := qmdal.NewReclinerReclstDAO(session, user.Pid, user.Userid)
 	recInfo, err := recDao.SelectSeriOne(orderId)
 	if err != nil {
 		return nil, err
 	}
-	if recInfo == nil{
+	if recInfo == nil {
 		//根据唯一码查询信息
 		mesData, err := apiDao.SelectInfo(orderId)
 		if err != nil {
@@ -861,12 +870,15 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 		PackOrderItemlst.PackOrderId = packOrderId
 		PackOrderItemlst.Pos = infoPos.Pos
 		PackOrderItemlst.SerialOrderId = orderId
+		if reworkSerialOrderId != "" {
+			PackOrderItemlst.SerialOrderId = reworkSerialOrderId
+		}
 		PackOrderItemlst.ActQty = 1
 		PackOrderItemlst.Status = bmodel.PACK_STATUS_RUNNING
-		if recInfo !=nil{
+		if recInfo != nil {
 			PackOrderItemlst.PKOICustC1 = recInfo.ReclinerNr
 		}
-		columns := []string{"SerialOrderId", "Status", "ActQty","PKOICustC1"}
+		columns := []string{"SerialOrderId", "Status", "ActQty", "PKOICustC1"}
 		err = dao.UpdateWhere([]grmi.Predicate{
 			meta.PackOrderItemlst_PlantNr.NewPredicate(grmi.Equal, user.Pid),
 			meta.PackOrderItemlst_PackOrderId.NewPredicate(grmi.Equal, packOrderId),
@@ -968,6 +980,14 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
 	/****查询订单信息并且校验*********/
 	serialDao := omdal.NewSerialOrderDAO(session, user.Pid, user.Userid)
 	statusDao := omdal.NewSerialOrderStatusDAO(session, user.Pid, user.Userid)
+	recDao := qmdal.NewReclinerReclstDAO(session, user.Pid, user.Userid)
+	recData, err := recDao.SelectRecOne(orderId)
+	if err != nil {
+		return nil, err
+	}
+	if recData != nil {
+		orderId = recData.SerialOrderId
+	}
 	serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId)
 	if err != nil {
 		return nil, err
@@ -1180,9 +1200,19 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	reworkSerialOrderId := ""
 	/****查询订单信息并且校验*********/
 	serialDao := omdal.NewSerialOrderDAO(session, user.Pid, user.Userid)
 	statusDao := omdal.NewSerialOrderStatusDAO(session, user.Pid, user.Userid)
+	recDao := qmdal.NewReclinerReclstDAO(session, user.Pid, user.Userid)
+	recData, err := recDao.SelectRecOne(orderId)
+	if err != nil {
+		return "", err
+	}
+	if recData != nil {
+		orderId = recData.SerialOrderId
+		reworkSerialOrderId = recData.ReclinerNr
+	}
 	serialOrderInfo, err := serialDao.SelectBySerialOrder(orderId)
 	if err != nil {
 		return "", err
@@ -1205,12 +1235,11 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 	apiDao := api.NewACCUNITSTATUSDAO(slavesession, user.Userid)
 
 	//查询条码是否返工
-	recDao := qmdal.NewReclinerReclstDAO(session, user.Pid, user.Userid)
 	recInfo, err := recDao.SelectSeriOne(orderId)
 	if err != nil {
 		return "", err
 	}
-	if recInfo == nil{
+	if recInfo == nil {
 		//根据唯一码查询信息
 		mesData, err := apiDao.SelectInfo(orderId)
 		if err != nil {
@@ -1289,12 +1318,15 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 	PackOrderItemlst.PackOrderId = packOrderId
 	PackOrderItemlst.Pos = infoPos.Pos
 	PackOrderItemlst.SerialOrderId = orderId
+	if reworkSerialOrderId != "" {
+		PackOrderItemlst.SerialOrderId = reworkSerialOrderId
+	}
 	PackOrderItemlst.ActQty = 1
 	PackOrderItemlst.Status = bmodel.PACK_STATUS_RUNNING
-	if recInfo !=nil{
+	if recInfo != nil {
 		PackOrderItemlst.PKOICustC1 = recInfo.ReclinerNr
 	}
-	columns := []string{"SerialOrderId", "Status", "ActQty","PKOICustC1"}
+	columns := []string{"SerialOrderId", "Status", "ActQty", "PKOICustC1"}
 	err = dao.UpdateWhere([]grmi.Predicate{
 		meta.PackOrderItemlst_PlantNr.NewPredicate(grmi.Equal, user.Pid),
 		meta.PackOrderItemlst_PackOrderId.NewPredicate(grmi.Equal, packOrderId),

services/log/implments/PackOrderItemlst.service.impl.go

@@ -22,22 +22,22 @@ import (
  ******************************************************************************/
 var DefaultConditionOfPackOrderItemlst = grmi.NewCondition(
 	map[string]grmi.ConditionItem{
-		meta.PackOrderItemlst_PackOrderId.UrlParameterName:   grmi.NewConditionItem(meta.PackOrderItemlst_PackOrderId, grmi.Equal, true),
-		meta.PackOrderItemlst_Pos.UrlParameterName:           grmi.NewConditionItem(meta.PackOrderItemlst_Pos, grmi.Equal, true),
-		meta.PackOrderItemlst_PosCode.UrlParameterName:       grmi.NewConditionItem(meta.PackOrderItemlst_PosCode, grmi.Equal, false),
-		meta.PackOrderItemlst_MaterialId.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_MaterialId, grmi.Equal, false),
-		meta.PackOrderItemlst_SerialOrderId.UrlParameterName: grmi.NewConditionItem(meta.PackOrderItemlst_SerialOrderId, grmi.Equal, false),
-		meta.PackOrderItemlst_PlanQty.UrlParameterName:       grmi.NewConditionItem(meta.PackOrderItemlst_PlanQty, grmi.Equal, false),
-		meta.PackOrderItemlst_ActQty.UrlParameterName:        grmi.NewConditionItem(meta.PackOrderItemlst_ActQty, grmi.Equal, false),
-		meta.PackOrderItemlst_Status.UrlParameterName:        grmi.NewConditionItem(meta.PackOrderItemlst_Status, grmi.Equal, false),
-		meta.PackOrderItemlst_Seq.UrlParameterName:           grmi.NewConditionItem(meta.PackOrderItemlst_Seq, grmi.Equal, false),
-		meta.PackOrderItemlst_PKOICustC1.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustC1, grmi.Equal, false),
-		meta.PackOrderItemlst_PKOICustC2.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustC2, grmi.Equal, false),
-		meta.PackOrderItemlst_PKOICustI1.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustI1, grmi.Equal, false),
-		meta.PackOrderItemlst_PKOICustI2.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustI2, grmi.Equal, false),
-		meta.PackOrderItemlst_LastModify.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_LastModify, grmi.Approximate, false),
-		meta.PackOrderItemlst_LastUser.UrlParameterName:      grmi.NewConditionItem(meta.PackOrderItemlst_LastUser, grmi.Equal, false),
-		meta.PackOrderItemlst_CreateTime.UrlParameterName:    grmi.NewConditionItem(meta.PackOrderItemlst_CreateTime, grmi.Approximate, false),
+		meta.PackOrderItemlst_PackOrderId.UrlParameterName:         grmi.NewConditionItem(meta.PackOrderItemlst_PackOrderId, grmi.Equal, true),
+		meta.PackOrderItemlst_Pos.UrlParameterName:                 grmi.NewConditionItem(meta.PackOrderItemlst_Pos, grmi.Equal, true),
+		meta.PackOrderItemlst_PosCode.UrlParameterName:             grmi.NewConditionItem(meta.PackOrderItemlst_PosCode, grmi.Equal, false),
+		meta.PackOrderItemlst_MaterialId.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_MaterialId, grmi.Equal, false),
+		meta.PackOrderItemlst_SerialOrderId.UrlParameterName:       grmi.NewConditionItem(meta.PackOrderItemlst_SerialOrderId, grmi.Equal, false),
+		meta.PackOrderItemlst_PlanQty.UrlParameterName:             grmi.NewConditionItem(meta.PackOrderItemlst_PlanQty, grmi.Equal, false),
+		meta.PackOrderItemlst_ActQty.UrlParameterName:              grmi.NewConditionItem(meta.PackOrderItemlst_ActQty, grmi.Equal, false),
+		meta.PackOrderItemlst_Status.UrlParameterName:              grmi.NewConditionItem(meta.PackOrderItemlst_Status, grmi.Equal, false),
+		meta.PackOrderItemlst_Seq.UrlParameterName:                 grmi.NewConditionItem(meta.PackOrderItemlst_Seq, grmi.Equal, false),
+		meta.PackOrderItemlst_PKOICustC1.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustC1, grmi.Equal, false),
+		meta.PackOrderItemlst_PKOICustC2.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustC2, grmi.Equal, false),
+		meta.PackOrderItemlst_PKOICustI1.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustI1, grmi.Equal, false),
+		meta.PackOrderItemlst_PKOICustI2.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_PKOICustI2, grmi.Equal, false),
+		meta.PackOrderItemlst_LastModify.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_LastModify, grmi.Approximate, false),
+		meta.PackOrderItemlst_LastUser.UrlParameterName:            grmi.NewConditionItem(meta.PackOrderItemlst_LastUser, grmi.Equal, false),
+		meta.PackOrderItemlst_CreateTime.UrlParameterName:          grmi.NewConditionItem(meta.PackOrderItemlst_CreateTime, grmi.Approximate, false),
 	},
 	nil,
 )

services/qm/implments/ReclinerReclst.service.impl.go

@@ -322,7 +322,7 @@ func (impl *ReclinerReclstServiceImplement) AddPrinterInfo(user *models.Usertab,
 		detail.VariableName = v.LabelItemValue
 		//映射值
 		if detail.VariableName == "$SN$" {
-			detail.VariableValue = entity.SerialOrderId
+			detail.VariableValue = entity.ReclinerNr
 		} else if detail.VariableName == "$DATE$" {
 			dateStr := utils.TimeFormat(orderInfo.PlanStartTime.Restore(), "yyyy/MM/dd")
 			detail.VariableValue = dateStr
@@ -423,7 +423,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 		detail.VariableName = v.LabelItemValue
 		//映射值
 		if detail.VariableName == "$SN$" {
-			detail.VariableValue = entity.SerialOrderId
+			detail.VariableValue = entity.ReclinerNr
 		} else if detail.VariableName == "$DATE$" {
 			dateStr := utils.TimeFormat(orderInfo.PlanStartTime.Restore(), "yyyy/MM/dd")
 			detail.VariableValue = dateStr