diff --git a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java index 10f0454..166a7bc 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java @@ -326,7 +326,7 @@ public class WmsTaskServiceImplements implements IWmsTaskService { .apply("goods_related ->> '$.remainNum' > 0") .last("limit 1")); if (stock == null) { - // 没有库存, + // 没有库存 outsideVehicle.setRemainNum(BigDecimal.ZERO); outsideVehiclesService.updateById(outsideVehicle); } else { diff --git a/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java b/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java index aeadd20..d3b0d58 100644 --- a/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java +++ b/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java @@ -139,10 +139,12 @@ public class TaskRecordExcelVo { recordExcelVo.setCreateTime(recordPo.getCreateTime()); recordExcelVo.setFinishTime(recordPo.getFinishTime()); recordExcelVo.setUserName(recordPo.getUserName()); - recordExcelVo.setGoodsId(recordPo.getGoodsRelated().getGoodsId()); - recordExcelVo.setGoodsName(recordPo.getGoodsRelated().getGoodsName()); - recordExcelVo.setOpNum(recordPo.getGoodsRelated().getOpNum()); - recordExcelVo.setOriginNum(recordPo.getGoodsRelated().getOriginNum()); + if (recordPo.getGoodsRelated() != null) { + recordExcelVo.setGoodsId(recordPo.getGoodsRelated().getGoodsId()); + recordExcelVo.setGoodsName(recordPo.getGoodsRelated().getGoodsName()); + recordExcelVo.setOpNum(recordPo.getGoodsRelated().getOpNum()); + recordExcelVo.setOriginNum(recordPo.getGoodsRelated().getOriginNum()); + } recordExcelVo.setPreTask(recordPo.getPreTask()); recordExcelVo.setIsPicking(recordPo.getIsPicking()); recordExcelVo.setPickStand(recordPo.getPickStand());