leo
/
LAPP_Acura_MES_Backend
2
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 33 Wiki Activity
Browse Source

Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om

pull/197/head
zhangxin 2 years ago
parent
e060781b03 163062feab
commit
48f915f1bf
4 changed files with 61 additions and 43 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +21
    -15
      meta/base/ArtCheckRule.meta.go
  2. +17
    -14
      models/base/ArtCheckRule.model.go
  3. +17
    -14
      services/base/implments/ArtCheckRule.service.impl.go
  4. +6
    -0
      services/om/implments/SerialOrder.service.impl.go

+ 21
- 15
meta/base/ArtCheckRule.meta.go View File

@ -27,6 +27,9 @@ var ArtCheckRule_CheckStartPos = grmi.NewField("CheckStartPos", "[ArtCheckRule].
var ArtCheckRule_CheckLength = grmi.NewField("CheckLength", "[ArtCheckRule].CheckLength", "checklength", grmi.TypeInt)
var ArtCheckRule_CheckObject = grmi.NewField("CheckObject", "[ArtCheckRule].CheckObject", "checkobject", grmi.TypeString)
var ArtCheckRule_OnlyBarCodeFlag = grmi.NewField("OnlyBarCodeFlag", "[ArtCheckRule].OnlyBarCodeFlag", "onlybarcodeflag", grmi.TypeBool)
var ArtCheckRule_CodeType = grmi.NewField("CodeType", "[ArtCheckRule].CodeType", "codetype", grmi.TypeString)
var ArtCheckRule_CodeTypeCheckToggle = grmi.NewField("CodeTypeCheckToggle", "[ArtCheckRule].CodeTypeCheckToggle", "codetypechecktoggle", grmi.TypeBool)
var ArtCheckRule_CheckValue = grmi.NewField("CheckValue", "[ArtCheckRule].CheckValue", "checkvalue", grmi.TypeString)
var ArtCheckRule_LastModify = grmi.NewField("LastModify", "[ArtCheckRule].LastModify", "lastmodify", grmi.TypeDateTime)
var ArtCheckRule_LastUser = grmi.NewField("LastUser", "[ArtCheckRule].LastUser", "lastuser", grmi.TypeString)
var ArtCheckRule_CreateTime = grmi.NewField("CreateTime", "[ArtCheckRule].CreateTime", "createtime", grmi.TypeDateTime)
@ -44,20 +47,23 @@ var ArtCheckRule = grmi.NewEntity(
"ArtCheckRule",
func() interface{} { return &model.ArtCheckRule{} },
map[string]grmi.Field{
ArtCheckRule_PlantNr.Name: ArtCheckRule_PlantNr,
ArtCheckRule_AttriCode.Name: ArtCheckRule_AttriCode,
ArtCheckRule_WorkLineId.Name: ArtCheckRule_WorkLineId,
ArtCheckRule_ProjectId.Name: ArtCheckRule_ProjectId,
ArtCheckRule_SubObject.Name: ArtCheckRule_SubObject,
ArtCheckRule_AttriCodeDesc.Name: ArtCheckRule_AttriCodeDesc,
ArtCheckRule_CodeLength.Name: ArtCheckRule_CodeLength,
ArtCheckRule_CheckStartPos.Name: ArtCheckRule_CheckStartPos,
ArtCheckRule_CheckLength.Name: ArtCheckRule_CheckLength,
ArtCheckRule_CheckObject.Name: ArtCheckRule_CheckObject,
ArtCheckRule_OnlyBarCodeFlag.Name: ArtCheckRule_OnlyBarCodeFlag,
ArtCheckRule_LastModify.Name: ArtCheckRule_LastModify,
ArtCheckRule_LastUser.Name: ArtCheckRule_LastUser,
ArtCheckRule_CreateTime.Name: ArtCheckRule_CreateTime,
ArtCheckRule_PlantNr.Name: ArtCheckRule_PlantNr,
ArtCheckRule_AttriCode.Name: ArtCheckRule_AttriCode,
ArtCheckRule_WorkLineId.Name: ArtCheckRule_WorkLineId,
ArtCheckRule_ProjectId.Name: ArtCheckRule_ProjectId,
ArtCheckRule_SubObject.Name: ArtCheckRule_SubObject,
ArtCheckRule_AttriCodeDesc.Name: ArtCheckRule_AttriCodeDesc,
ArtCheckRule_CodeLength.Name: ArtCheckRule_CodeLength,
ArtCheckRule_CheckStartPos.Name: ArtCheckRule_CheckStartPos,
ArtCheckRule_CheckLength.Name: ArtCheckRule_CheckLength,
ArtCheckRule_CheckObject.Name: ArtCheckRule_CheckObject,
ArtCheckRule_OnlyBarCodeFlag.Name: ArtCheckRule_OnlyBarCodeFlag,
ArtCheckRule_CodeType.Name: ArtCheckRule_CodeType,
ArtCheckRule_CodeTypeCheckToggle.Name: ArtCheckRule_CodeTypeCheckToggle,
ArtCheckRule_CheckValue.Name: ArtCheckRule_CheckValue,
ArtCheckRule_LastModify.Name: ArtCheckRule_LastModify,
ArtCheckRule_LastUser.Name: ArtCheckRule_LastUser,
ArtCheckRule_CreateTime.Name: ArtCheckRule_CreateTime,
},
[]string{"PlantNr"},
[]string{"AttriCodeDesc", "CodeLength", "CheckStartPos", "CheckLength", "CheckObject", "OnlyBarCodeFlag", "LastUser"})
[]string{"AttriCodeDesc", "CodeLength", "CheckStartPos", "CheckLength", "CheckObject", "OnlyBarCodeFlag", "CodeType", "CodeTypeCheckToggle", "CheckValue", "LastUser"})

+ 17
- 14
models/base/ArtCheckRule.model.go View File

@ -20,20 +20,23 @@ import (
*
******************************************************************************/
type ArtCheckRule struct {
PlantNr int `xorm:"pk int 'PlantNr'" json:"ArtCheckRule-PlantNr"`
AttriCode int `xorm:"pk int 'AttriCode'" json:"ArtCheckRule-AttriCode"`
WorkLineId string `xorm:"pk nvarchar(40) 'WorkLineId'" json:"ArtCheckRule-WorkLineId"`
ProjectId string `xorm:"pk nvarchar(40) 'ProjectId'" json:"ArtCheckRule-ProjectId"`
SubObject string `xorm:"pk nvarchar(40) 'SubObject'" json:"ArtCheckRule-SubObject"`
AttriCodeDesc string `xorm:"nvarchar(100) 'AttriCodeDesc' not null" json:"ArtCheckRule-AttriCodeDesc"`
CodeLength string `xorm:"nvarchar(200) 'CodeLength' not null" json:"ArtCheckRule-CodeLength"`
CheckStartPos int `xorm:"int 'CheckStartPos' not null" json:"ArtCheckRule-CheckStartPos"`
CheckLength int `xorm:"int 'CheckLength' not null" json:"ArtCheckRule-CheckLength"`
CheckObject string `xorm:"nvarchar(40) 'CheckObject' not null" json:"ArtCheckRule-CheckObject"`
OnlyBarCodeFlag bool `xorm:"bit 'OnlyBarCodeFlag' not null" json:"ArtCheckRule-OnlyBarCodeFlag"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ArtCheckRule-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ArtCheckRule-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ArtCheckRule-CreateTime"`
PlantNr int `xorm:"pk int 'PlantNr'" json:"ArtCheckRule-PlantNr"`
AttriCode int `xorm:"pk int 'AttriCode'" json:"ArtCheckRule-AttriCode"`
WorkLineId string `xorm:"pk nvarchar(40) 'WorkLineId'" json:"ArtCheckRule-WorkLineId"`
ProjectId string `xorm:"pk nvarchar(40) 'ProjectId'" json:"ArtCheckRule-ProjectId"`
SubObject string `xorm:"pk nvarchar(40) 'SubObject'" json:"ArtCheckRule-SubObject"`
AttriCodeDesc string `xorm:"nvarchar(100) 'AttriCodeDesc' not null" json:"ArtCheckRule-AttriCodeDesc"`
CodeLength string `xorm:"nvarchar(200) 'CodeLength' not null" json:"ArtCheckRule-CodeLength"`
CheckStartPos int `xorm:"int 'CheckStartPos' not null" json:"ArtCheckRule-CheckStartPos"`
CheckLength int `xorm:"int 'CheckLength' not null" json:"ArtCheckRule-CheckLength"`
CheckObject string `xorm:"nvarchar(40) 'CheckObject' not null" json:"ArtCheckRule-CheckObject"`
OnlyBarCodeFlag bool `xorm:"bit 'OnlyBarCodeFlag' not null" json:"ArtCheckRule-OnlyBarCodeFlag"`
CodeType string `xorm:"nvarchar(40) 'CodeType' not null" json:"ArtCheckRule-CodeType"`
CodeTypeCheckToggle bool `xorm:"bit 'CodeTypeCheckToggle' not null" json:"ArtCheckRule-CodeTypeCheckToggle"`
CheckValue string `xorm:"nvarchar(255) 'CheckValue' not null" json:"ArtCheckRule-CheckValue"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ArtCheckRule-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ArtCheckRule-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ArtCheckRule-CreateTime"`
}
/******************************************************************************


+ 17
- 14
services/base/implments/ArtCheckRule.service.impl.go View File

@ -22,19 +22,22 @@ import (
******************************************************************************/
var DefaultConditionOfArtCheckRule = grmi.NewCondition(
map[string]grmi.ConditionItem{
meta.ArtCheckRule_AttriCode.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_AttriCode, grmi.Equal, true),
meta.ArtCheckRule_WorkLineId.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_WorkLineId, grmi.Equal, true),
meta.ArtCheckRule_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_ProjectId, grmi.Equal, true),
meta.ArtCheckRule_SubObject.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_SubObject, grmi.Equal, true),
meta.ArtCheckRule_AttriCodeDesc.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_AttriCodeDesc, grmi.Equal, false),
meta.ArtCheckRule_CodeLength.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CodeLength, grmi.Equal, false),
meta.ArtCheckRule_CheckStartPos.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckStartPos, grmi.Equal, false),
meta.ArtCheckRule_CheckLength.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckLength, grmi.Equal, false),
meta.ArtCheckRule_CheckObject.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckObject, grmi.Equal, false),
meta.ArtCheckRule_OnlyBarCodeFlag.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_OnlyBarCodeFlag, grmi.Equal, false),
meta.ArtCheckRule_LastModify.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_LastModify, grmi.Approximate, false),
meta.ArtCheckRule_LastUser.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_LastUser, grmi.Equal, false),
meta.ArtCheckRule_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CreateTime, grmi.Approximate, false),
meta.ArtCheckRule_AttriCode.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_AttriCode, grmi.Equal, true),
meta.ArtCheckRule_WorkLineId.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_WorkLineId, grmi.Equal, true),
meta.ArtCheckRule_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_ProjectId, grmi.Equal, true),
meta.ArtCheckRule_SubObject.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_SubObject, grmi.Equal, true),
meta.ArtCheckRule_AttriCodeDesc.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_AttriCodeDesc, grmi.Equal, false),
meta.ArtCheckRule_CodeLength.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CodeLength, grmi.Equal, false),
meta.ArtCheckRule_CheckStartPos.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckStartPos, grmi.Equal, false),
meta.ArtCheckRule_CheckLength.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckLength, grmi.Equal, false),
meta.ArtCheckRule_CheckObject.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckObject, grmi.Equal, false),
meta.ArtCheckRule_OnlyBarCodeFlag.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_OnlyBarCodeFlag, grmi.Equal, false),
meta.ArtCheckRule_CodeType.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CodeType, grmi.Equal, false),
meta.ArtCheckRule_CodeTypeCheckToggle.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CodeTypeCheckToggle, grmi.Equal, false),
meta.ArtCheckRule_CheckValue.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CheckValue, grmi.Equal, false),
meta.ArtCheckRule_LastModify.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_LastModify, grmi.Approximate, false),
meta.ArtCheckRule_LastUser.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_LastUser, grmi.Equal, false),
meta.ArtCheckRule_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.ArtCheckRule_CreateTime, grmi.Approximate, false),
},
nil,
)
@ -387,4 +390,4 @@ func (impl *ArtCheckRuleServiceImplement) SelectByArt(user *global.User, artId s
result, err := dao.SelectByArtId(artId, projectId, attrCodeLi)
return result, err
}
}

+ 6
- 0
services/om/implments/SerialOrder.service.impl.go View File

@ -1271,12 +1271,18 @@ func (impl *SerialOrderServiceImplement) ScanCodeCheck(user *global.User, sessio
CharPara3: rule.CodeLength,
// 扫码校验 CheckObject
CharPara4: rule.CheckObject,
// 条码类型
CharPara5: rule.CodeType,
// 条码类型校验的期望值
CharPara6: rule.CheckValue,
// 扫码校验 CheckStartPos
IntPara1: rule.CheckStartPos,
// 扫码校验 CheckLength
IntPara2: rule.CheckLength,
// 扫码校验 OnlyBarCodeFlag
FlagPara1: rule.OnlyBarCodeFlag,
// 条码类型的校验开关
FlagPara2: rule.CodeTypeCheckToggle,
BKFlag: bkFlag,
}
pos++


Write Preview
Loading…
Cancel
Save