diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java index 35a6134..6c6dd6b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java @@ -1,7 +1,10 @@ package org.nl.wms.cockpit.service.dao; +import cn.hutool.core.util.ObjectUtil; +import jodd.util.StringUtil; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -13,4 +16,20 @@ public class SortingLineRes { private List rgSortingLine; private String rgPlanQty; private String rgRealQty; + + public List getSortingLines() { + return ObjectUtil.isEmpty(sortingLines) ? new ArrayList<>() : sortingLines; + } + + public List getRgSortingLine() { + return ObjectUtil.isEmpty(rgSortingLine) ? new ArrayList<>() : rgSortingLine; + } + + public String getRgPlanQty() { + return StringUtil.isEmpty(rgPlanQty) ? "0" : rgPlanQty; + } + + public String getRgRealQty() { + return StringUtil.isEmpty(rgRealQty) ? "0" : rgRealQty; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 0c9f3e8..9ec7902 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -120,8 +120,10 @@ public class CockpitServiceImpl implements CockpitService { List sortingLine = cockPitMapper.getSortingLine(); List rgSortingLine = cockPitMapper.getRgSortingLineVo(); SortingLineRes sortCount = cockPitMapper.selectRgSortCount(); - res.setRgRealQty(sortCount.getRgRealQty()); - res.setRgPlanQty(sortCount.getRgPlanQty()); + if (null != sortCount) { + res.setRgRealQty(sortCount.getRgRealQty()); + res.setRgPlanQty(sortCount.getRgPlanQty()); + } res.setRgSortingLine(rgSortingLine); res.setSortingLines(sortingLine); return res;