diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryStructattrNum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryStructattrNum.java index 739ee54fa..4ed55fc47 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryStructattrNum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryStructattrNum.java @@ -48,35 +48,32 @@ public class AutoQueryStructattrNum { List haveList = WQL.getWO("AUTO002").addParam("flag", "2") .process().getResultJSONArray(0).toJavaList(JSONObject.class); - // 获取系统参数 - String download_attr_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("download_attr_num").getValue(); - // 需要插入的集合 List daoList = new ArrayList<>(); for (int i = 0; i < empList.size(); i++) { JSONObject json = empList.get(i); - if (json.getDoubleValue("num") <= Double.parseDouble(download_attr_num)) { - - // 已用仓位 - double aDouble = haveList.stream() - .filter(row -> row.getString("layer_num").equals(json.getString("layer_num"))) - .map(row -> row.getDoubleValue("num")) - .reduce(Double::sum).orElse(0.00); + // 已用仓位 + double aDouble = haveList.stream() + .filter(row -> row.getString("layer_num").equals(json.getString("layer_num"))) + .map(row -> row.getDoubleValue("num")) + .reduce(Double::sum).orElse(0.00); - // 计算主存区和 - double add = NumberUtil.add(json.getDoubleValue("num"), aDouble); + // 计算主存区和 + double add = NumberUtil.add(json.getDoubleValue("num"), aDouble); - // 空位占比 - double emp_pro = NumberUtil.round(NumberUtil.div(json.getDoubleValue("num"), add) * 100, 2).doubleValue(); - // 有货占比 - double have_pro = NumberUtil.round(NumberUtil.div(aDouble, add) * 100, 2).doubleValue(); + // 空位占比 + double emp_pro = NumberUtil.round(NumberUtil.div(json.getDoubleValue("num"), add) * 100, 2).doubleValue(); + // 有货占比 + double have_pro = NumberUtil.round(NumberUtil.div(aDouble, add) * 100, 2).doubleValue(); + // 有货占比大于70%则报警 + if (have_pro >= 70) { // 内容 - String notice_title = "立库"+json.getString("layer_num")+ "层主存区仓位不足"+download_attr_num+"个!可用仓位:" - +json.getString("num")+ "个 占比:"+emp_pro+"% ,已用仓位:"+NumberUtil.round(aDouble, 0) +"个 占比:"+have_pro+"%"; + String notice_title = "立库" + json.getString("layer_num") + "层主存区可用仓位不足30%!可用仓位:" + + json.getString("num") + "个 占比:" + emp_pro + "% ,已用仓位:" + NumberUtil.round(aDouble, 0) + "个 占比:" + have_pro + "%"; SysNotice dao = SysNotice.builder() .notice_id(IdUtil.getStringId())