ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 5934a5d02f5dc3cc60754bbb59cacf96aee7d557 1 parent 4d3da4b4

解决erpStatusStr为空的情况

Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
@@ -222,16 +222,15 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements @@ -222,16 +222,15 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
222 */ 222 */
223 public String getErpStatusStr(Long orderCode, Integer status, Map<Long, QualityCheck> qualityCheckMap ){ 223 public String getErpStatusStr(Long orderCode, Integer status, Map<Long, QualityCheck> qualityCheckMap ){
224 224
225 - if (MapUtils.isEmpty(qualityCheckMap)){  
226 - return "";  
227 - } 225 +
228 String erpStatusStr = StatusErpShow.convertOrderStatusStr(Objects.isNull(status)? null : status.byteValue()); 226 String erpStatusStr = StatusErpShow.convertOrderStatusStr(Objects.isNull(status)? null : status.byteValue());
229 - QualityCheck qualityCheck = qualityCheckMap.get(orderCode);  
230 227
231 - if (Objects.isNull(qualityCheck)){ 228 + if (qualityCheckMap == null || Objects.isNull(qualityCheckMap.get(orderCode))){
232 return erpStatusStr; 229 return erpStatusStr;
233 } 230 }
234 231
  232 + QualityCheck qualityCheck = qualityCheckMap.get(orderCode);
  233 +
235 if (status == StatusErpShow.BUYER_ORDER_STATUS_MINI_FAULT_WAITING.getByteVal() 234 if (status == StatusErpShow.BUYER_ORDER_STATUS_MINI_FAULT_WAITING.getByteVal()
236 && EnumQualityCheckType.MINI_FAULT.getCode().equals(qualityCheck.getType()) 235 && EnumQualityCheckType.MINI_FAULT.getCode().equals(qualityCheck.getType())
237 && EnumQualityCheckStatus.WAIT_CONFIRM.getCode().equals(qualityCheck.getStatus())){ 236 && EnumQualityCheckStatus.WAIT_CONFIRM.getCode().equals(qualityCheck.getStatus())){