From e360f2c55227ba6b44867d399163bd55030fae47 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Fri, 8 Jul 2022 16:06:42 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=89=93=E5=8D=B0=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3e8828c3b2792604516ee55494f1e907deb68ccf. --- dao/base/implments/Snr.dao.impl.go | 12 ++++-------- meta/base/PrintBasicRuleInfo.meta.go | 6 ++---- models/base/PrintBasicRuleInfo.model.go | 1 - .../implments/PrintBasicRuleInfo.service.impl.go | 1 - 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dao/base/implments/Snr.dao.impl.go b/dao/base/implments/Snr.dao.impl.go index e7eb2d3..7df41da 100644 --- a/dao/base/implments/Snr.dao.impl.go +++ b/dao/base/implments/Snr.dao.impl.go @@ -918,13 +918,10 @@ func (impl *SnrDAOImplement) UpdateSnrCache(snrId, rule string, year, month, wee SnrWeek: week, NextNr: nextSnr, } - count, err := impl.session.Table(meta.SnrCache.TableName).Insert(&snrCache) + _, err = impl.session.Table(meta.SnrCache.TableName).Insert(&snrCache) if err != nil { return grmi.NewDataBaseError(err) } - if count == 0 { - return grmi.NewBusinessError("保存流水号缓存数据失败") - } return nil } else { data.SnrDate = grmi.Date(date) @@ -935,13 +932,10 @@ func (impl *SnrDAOImplement) UpdateSnrCache(snrId, rule string, year, month, wee data.SnrMonth = month data.SnrDay = date.Day() data.SnrWeek = week - count, err := impl.session.Table(meta.SnrCache.TableName).Cols(meta.SnrCache.UpdatingMembers...).ID(data.GetKey()).Update(&data) + _, err = impl.session.Table(meta.SnrCache.TableName).Cols(meta.SnrCache.UpdatingMembers...).ID(data.GetKey()).Update(&data) if err != nil { return grmi.NewDataBaseError(err) } - if count == 0 { - return grmi.NewBusinessError("更新流水号缓存数据失败") - } return nil } } @@ -1058,12 +1052,14 @@ func (impl *SnrDAOImplement) GetNextSnrWithTime(snr string, t time.Time) (return } case "4": //流水号 + var nextnum string if snrData.IdentifierFormat == "CHAR" { nextnum = utils.ConvInt2FormatString(nextSnr, snrData.Length) } else { nextnum = strconv.Itoa(nextSnr) } + //判断是否开通了映射 if snrData.Data4MappingToggle { //查询对应的key Map diff --git a/meta/base/PrintBasicRuleInfo.meta.go b/meta/base/PrintBasicRuleInfo.meta.go index 5cb8cc8..ccd9caa 100644 --- a/meta/base/PrintBasicRuleInfo.meta.go +++ b/meta/base/PrintBasicRuleInfo.meta.go @@ -40,7 +40,6 @@ var PrintBasicRuleInfo_CollectScanBarcode = grmi.NewField("CollectScanBarcode", var PrintBasicRuleInfo_ScanOperationId = grmi.NewField("ScanOperationId", "[PrintBasicRuleInfo].ScanOperationId", "scanoperationid", grmi.TypeInt) var PrintBasicRuleInfo_LabelDetailPos = grmi.NewField("LabelDetailPos", "[PrintBasicRuleInfo].LabelDetailPos", "labeldetailpos", grmi.TypeString) var PrintBasicRuleInfo_ScanPo = grmi.NewField("ScanPo", "[PrintBasicRuleInfo].ScanPo", "scanpo", grmi.TypeString) -var PrintBasicRuleInfo_Category = grmi.NewField("Category", "[PrintBasicRuleInfo].Category", "category", grmi.TypeString) 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) @@ -79,13 +78,12 @@ var PrintBasicRuleInfo = grmi.NewEntity( PrintBasicRuleInfo_TemplateType.Name: PrintBasicRuleInfo_TemplateType, PrintBasicRuleInfo_Qty.Name: PrintBasicRuleInfo_Qty, PrintBasicRuleInfo_CollectScanBarcode.Name: PrintBasicRuleInfo_CollectScanBarcode, - PrintBasicRuleInfo_ScanOperationId.Name: PrintBasicRuleInfo_ScanOperationId, + PrintBasicRuleInfo_ScanOperationId.Name: PrintBasicRuleInfo_ScanOperationId, PrintBasicRuleInfo_LabelDetailPos.Name: PrintBasicRuleInfo_LabelDetailPos, PrintBasicRuleInfo_ScanPo.Name: PrintBasicRuleInfo_ScanPo, - PrintBasicRuleInfo_Category.Name: PrintBasicRuleInfo_Category, 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", "TemplateId", "TemplateType", "Qty", "CollectScanBarcode", "ScanOperationId", "ScanPo", "LabelDetailPos", "Category", "LastUser"}) + []string{"PO", "StepNo", "StepDesc", "ProjectId", "TemplateChooseModel", "DependPO", "DependStepNo", "DependRuleId", "DependValue", "Action", "WhetherCheckContent", "PrinterId", "TemplateId", "TemplateType", "Qty", "CollectScanBarcode", "ScanOperationId", "ScanPo", "LabelDetailPos", "LastUser"}) diff --git a/models/base/PrintBasicRuleInfo.model.go b/models/base/PrintBasicRuleInfo.model.go index d83af92..0108a1e 100644 --- a/models/base/PrintBasicRuleInfo.model.go +++ b/models/base/PrintBasicRuleInfo.model.go @@ -44,7 +44,6 @@ type PrintBasicRuleInfo struct { ScanOperationId int `xorm:"int 'ScanOperationId'" json:"PrintBasicRuleInfo-ScanOperationId"` LabelDetailPos string `xorm:"nvarchar(255) 'LabelDetailPos'" json:"PrintBasicRuleInfo-LabelDetailPos"` ScanPo string `xorm:"nvarchar(40) 'ScanPo'" json:"PrintBasicRuleInfo-ScanPo"` - Category string `xorm:"nvarchar(40) 'Category'" json:"PrintBasicRuleInfo-Category"` 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"` diff --git a/services/base/implments/PrintBasicRuleInfo.service.impl.go b/services/base/implments/PrintBasicRuleInfo.service.impl.go index 7633aaa..964748b 100644 --- a/services/base/implments/PrintBasicRuleInfo.service.impl.go +++ b/services/base/implments/PrintBasicRuleInfo.service.impl.go @@ -46,7 +46,6 @@ var DefaultConditionOfPrintBasicRuleInfo = grmi.NewCondition( meta.PrintBasicRuleInfo_ScanOperationId.UrlParameterName: grmi.NewConditionItem(meta.PrintBasicRuleInfo_ScanOperationId, grmi.Equal, false), meta.PrintBasicRuleInfo_LabelDetailPos.UrlParameterName: grmi.NewConditionItem(meta.PrintBasicRuleInfo_LabelDetailPos, grmi.Equal, false), meta.PrintBasicRuleInfo_ScanPo.UrlParameterName: grmi.NewConditionItem(meta.PrintBasicRuleInfo_ScanPo, grmi.Equal, false), - meta.PrintBasicRuleInfo_Category.UrlParameterName: grmi.NewConditionItem(meta.PrintBasicRuleInfo_Category, 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),