|
@ -517,9 +517,9 @@ func (impl *PackOrderServiceImplement) ScanBarcode(user *global.User, barcode st |
|
|
} |
|
|
} |
|
|
serialOrder := serialOrderLi[0] |
|
|
serialOrder := serialOrderLi[0] |
|
|
if serialOrderStatus == baseModel.WO_STATUS_FINISHED || serialOrderStatus == baseModel.WO_STATUS_UNCHECKED { |
|
|
if serialOrderStatus == baseModel.WO_STATUS_FINISHED || serialOrderStatus == baseModel.WO_STATUS_UNCHECKED { |
|
|
//if serialOrder.QualityCheck != baseModel.QualityCheck_STATUS_OK && serialOrder.QualityCheck != baseModel.QualityCheck_STATUS_FAIL {
|
|
|
|
|
|
// return nil, grmi.NewBusinessError("工单未进行目检")
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
if serialOrder.QualityCheck != baseModel.QualityCheck_STATUS_OK && serialOrder.QualityCheck != baseModel.QualityCheck_STATUS_FAIL { |
|
|
|
|
|
return nil, grmi.NewBusinessError("工单未进行目检") |
|
|
|
|
|
} |
|
|
if serialOrderStatus != baseModel.WO_STATUS_FINISHED || serialOrder.QualityCheck != baseModel.QualityCheck_STATUS_OK { |
|
|
if serialOrderStatus != baseModel.WO_STATUS_FINISHED || serialOrder.QualityCheck != baseModel.QualityCheck_STATUS_OK { |
|
|
currentSerialOrderStatus = false |
|
|
currentSerialOrderStatus = false |
|
|
} |
|
|
} |
|
|