diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 852f67c..23b1df7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -325,8 +325,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty")); materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id")); } - String material_id = String.valueOf(redisUtils.get(barcode)); - String ivt_qty = String.valueOf(redisUtils.get(barcode + "-ivt_qty")); + Object redis_material_id = redisUtils.get(barcode); + String material_id = ObjectUtil.isEmpty(redis_material_id) ? null : String.valueOf(redis_material_id); + Object redis_ivt_qty = redisUtils.get(barcode + "-ivt_qty"); + String ivt_qty = ObjectUtil.isEmpty(redis_ivt_qty) ? "0" : String.valueOf(redis_ivt_qty); Long materialId = null; String point_status = "2"; if (StrUtil.equals("0", barcode)) { @@ -334,7 +336,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } if (StrUtil.isNotEmpty(material_id)) { point_status = "3"; - materialId = Long.valueOf(materialId); + assert material_id != null; + materialId = Long.valueOf(material_id); } //根据工位去查对应的工位的信息 //将新的条码 物料等信息更新到到库存表中