Explorar o código

修改物料查询明细,添加SUK名称,及码类型

liguosong %!s(int64=4) %!d(string=hai) anos
pai
achega
98ab726cb5

+ 2 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ReportServiceImpl.java

@@ -229,7 +229,7 @@ public class ReportServiceImpl implements ReportService {
      * @param map
      */
     private Map FillParam(ReportReq reportReq,Map<String,LocalDateTime> map) {
-        if(null != reportReq.getValue() && null == reportReq.getEndTime() && null == reportReq.getBeginTime()){
+        if(!ObjectUtils.isEmpty(reportReq) && null != reportReq.getValue() && null == reportReq.getEndTime() && null == reportReq.getBeginTime()){
             setQueryTime(reportReq);
             reportReq.setBeginTime(reportReq.getBeginTime());
             reportReq.setEndTime(reportReq.getEndTime());
@@ -261,7 +261,7 @@ public class ReportServiceImpl implements ReportService {
                 res.setCreateCapNumber(createList.get(i).getQrNumber());//盖码
             }
         }
-        if (null !=reportReq.getValue()) {
+        if (!ObjectUtils.isEmpty(reportReq) && null !=reportReq.getValue()) {
             //获取往期总数
             long before=0;
             if(!ObjectUtils.isEmpty(vo)){