Authored by tanling

解决erpStatusStr为空的情况

... ... @@ -222,16 +222,15 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
*/
public String getErpStatusStr(Long orderCode, Integer status, Map<Long, QualityCheck> qualityCheckMap ){
if (MapUtils.isEmpty(qualityCheckMap)){
return "";
}
String erpStatusStr = StatusErpShow.convertOrderStatusStr(Objects.isNull(status)? null : status.byteValue());
QualityCheck qualityCheck = qualityCheckMap.get(orderCode);
if (Objects.isNull(qualityCheck)){
if (qualityCheckMap == null || Objects.isNull(qualityCheckMap.get(orderCode))){
return erpStatusStr;
}
QualityCheck qualityCheck = qualityCheckMap.get(orderCode);
if (status == StatusErpShow.BUYER_ORDER_STATUS_MINI_FAULT_WAITING.getByteVal()
&& EnumQualityCheckType.MINI_FAULT.getCode().equals(qualityCheck.getType())
&& EnumQualityCheckStatus.WAIT_CONFIRM.getCode().equals(qualityCheck.getStatus())){
... ...