diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index 5836938..3cb96a5 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -722,15 +722,6 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o return nil, grmi.NewBusinessError("该唯一码不存在!") } if mesData.LINE == "LaserWelding" { - //校验 - if mesData.OP != "017" { - return nil, grmi.NewBusinessError("OP状态值不是017!") - } - //if mesData.STATUS != "2" { - // return nil, grmi.NewBusinessError("该唯一码状态不为2!") - //} - } else if mesData.LINE == "G-Frame Assy" { - //查询目检 //判断该条码是否是合格产品 sdao := qmdal.NewSerialOrderRutingDAO(session, user.Pid, user.Userid) OrderInfo, err := sdao.SelectOne(orderId) @@ -740,6 +731,14 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o if OrderInfo == nil || OrderInfo.Status != bmodel.CHECK_STATUS_CLOSED { return nil, grmi.NewBusinessError("该序列订单已经检测!") } + } else if mesData.LINE == "G-Frame Assy" { + //校验 + if mesData.OP != "017" { + return nil, grmi.NewBusinessError("OP状态值不是017!") + } + if mesData.STATUS != "2" { + return nil, grmi.NewBusinessError("该唯一码状态不为2!") + } } else { return nil, grmi.NewBusinessError("产线信息有误!") } @@ -1137,15 +1136,6 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab, return "", grmi.NewBusinessError("该唯一码不存在!") } if mesData.LINE == "LaserWelding" { - //校验 - if mesData.OP != "017" { - return "", grmi.NewBusinessError("OP状态值不是017!") - } - if mesData.STATUS != "2" { - return "", grmi.NewBusinessError("该唯一码状态不为2!") - } - } else if mesData.LINE == "G-Frame Assy" { - //查询目检 //判断该条码是否是合格产品 sdao := qmdal.NewSerialOrderRutingDAO(session, user.Pid, user.Userid) OrderInfo, err := sdao.SelectOne(orderId) @@ -1155,6 +1145,14 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab, if OrderInfo == nil || OrderInfo.Status != bmodel.CHECK_STATUS_CLOSED { return "", grmi.NewBusinessError("该序列订单已经检测!") } + } else if mesData.LINE == "G-Frame Assy" { + //校验 + if mesData.OP != "017" { + return "", grmi.NewBusinessError("OP状态值不是017!") + } + if mesData.STATUS != "2" { + return "", grmi.NewBusinessError("该唯一码状态不为2!") + } } else { return "", grmi.NewBusinessError("产线信息有误!") } diff --git a/services/qm/implments/View.service.impl.go b/services/qm/implments/View.service.impl.go index eec805b..dfdcb1f 100644 --- a/services/qm/implments/View.service.impl.go +++ b/services/qm/implments/View.service.impl.go @@ -628,10 +628,6 @@ func (impl *ViewServiceImplement) ViewsOfArticle(context *container.RequestConte if mesData == nil{ return nil,grmi.NewBusinessError("该唯一码不存在!") } - //校验 - if mesData.OP != "017" { - return nil, grmi.NewBusinessError("OP状态值不是017!") - } if mesData.STATUS != "2"{ return nil,grmi.NewBusinessError("该唯一码状态不为2!") }