diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql index e0f4cc4ce..a786972e4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql @@ -41,7 +41,7 @@ IF 输入.flag = "1" QUERY SELECT - SUM( ivt.ivt_qty ) AS num, + SUM( ivt.ivt_qty ) / 1000 AS num, attr.stor_id FROM st_ivt_structivt ivt @@ -58,7 +58,7 @@ IF 输入.flag = "2" QUERY SELECT - SUM( ivt.ivt_qty ) AS num, + SUM( ivt.ivt_qty ) / 1000 AS num, attr.stor_id FROM st_ivt_structivt ivt @@ -78,7 +78,7 @@ IF 输入.flag = "3" QUERY SELECT - SUM( ivt.ivt_qty ) AS num, + SUM( ivt.ivt_qty ) / 1000 AS num, attr.stor_id FROM st_ivt_structivt ivt @@ -99,7 +99,7 @@ IF 输入.flag = "4" QUERY SELECT - SUM( ivt.ivt_qty ) AS num, + SUM( ivt.ivt_qty ) / 1000 AS num, attr.stor_id FROM st_ivt_structivt ivt @@ -119,7 +119,7 @@ IF 输入.flag = "5" QUERY SELECT - SUM( ivt.ivt_qty ) AS num, + SUM( ivt.ivt_qty ) / 1000 AS num, attr.stor_id FROM st_ivt_structivt ivt @@ -142,7 +142,7 @@ IF 输入.flag = "6" QUERY SELECT - SUM( ivt.ivt_qty ) AS num, + SUM( ivt.ivt_qty ) / 1000 AS num, attr.stor_id FROM st_ivt_structivt ivt @@ -165,7 +165,7 @@ IF 输入.flag = "7" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, sub.customer_name FROM st_ivt_iostorinvdis dis @@ -186,7 +186,7 @@ IF 输入.flag = "8" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, sub.customer_name FROM st_ivt_iostorinvdis dis @@ -207,7 +207,7 @@ IF 输入.flag = "9" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, sub.customer_name FROM st_ivt_iostorinvdis dis @@ -229,7 +229,7 @@ IF 输入.flag = "10" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, sub.customer_name FROM st_ivt_iostorinvdis dis @@ -251,7 +251,7 @@ IF 输入.flag = "11" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code FROM st_ivt_iostorinvdis dis @@ -272,7 +272,7 @@ IF 输入.flag = "12" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code FROM st_ivt_iostorinvdis dis @@ -293,7 +293,7 @@ IF 输入.flag = "13" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code, sub.customer_name FROM @@ -315,7 +315,7 @@ IF 输入.flag = "14" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code, sub.customer_name FROM @@ -337,7 +337,7 @@ IF 输入.flag = "15" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code FROM st_ivt_iostorinvdis dis @@ -359,7 +359,7 @@ IF 输入.flag = "16" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code FROM st_ivt_iostorinvdis dis @@ -381,7 +381,7 @@ IF 输入.flag = "17" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code, sub.customer_name FROM @@ -404,7 +404,7 @@ IF 输入.flag = "18" QUERY SELECT - SUM( dis.plan_qty ) AS num, + SUM( dis.plan_qty ) / 1000 AS num, LEFT(dis.pcsn,2) AS region_code, sub.customer_name FROM diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java index d490e1dde..d25b86208 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java @@ -51,8 +51,6 @@ public class AutoQueryProudDayData { param.put("Code", "ctp_AAVwgNuQOtO0"); param.put("card", data()); - System.out.println(param.toString()); - // 调用接口 lmsToMesService.proudDayData(param); @@ -70,7 +68,7 @@ public class AutoQueryProudDayData { String custC = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("CUST_C").getValue(); JSONObject result = new JSONObject(); // 全部数据 - result.put("Title", DateUtil.today()+"成品数据"); + result.put("Title", DateUtil.today()+"成品数据(单位:T)"); /* * 查询各仓库库存 @@ -99,25 +97,25 @@ public class AutoQueryProudDayData { List collect = allIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("TotalInventory", collect.isEmpty() ? "0KG" : NumberUtil.round(collect.get(0).getString("num"), 3)+"KG"); + json.put("TotalInventory", collect.isEmpty() ? "0" : NumberUtil.round(collect.get(0).getString("num"), 2)+""); // 超期库存 List collect2 = sidIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("OverdueInventory", collect2.isEmpty() ? "0KG" : NumberUtil.round(collect2.get(0).getString("num"),3)+"KG"); + json.put("OverdueInventory", collect2.isEmpty() ? "0" : NumberUtil.round(collect2.get(0).getString("num"),2)+""); // 临期库存 List collect3 = faceIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("InterimInventory", collect3.isEmpty() ? "0KG" : NumberUtil.round(collect3.get(0).getString("num"),3)+"KG"); + json.put("InterimInventory", collect3.isEmpty() ? "0" : NumberUtil.round(collect3.get(0).getString("num"),2)+""); // 正常库存 List collect4 = regIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("NormalStockAge", collect4.isEmpty() ? "0KG" : NumberUtil.round(collect4.get(0).getString("num"),3)+"KG"); + json.put("NormalStockAge", collect4.isEmpty() ? "0" : NumberUtil.round(collect4.get(0).getString("num"),2)+""); Arrayobject1.add(json); } @@ -125,10 +123,10 @@ public class AutoQueryProudDayData { // 计算全部 JSONObject allIvt = new JSONObject(); allIvt.put("local", "全部"); - allIvt.put("TotalInventory", NumberUtil.round(allIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); - allIvt.put("OverdueInventory", NumberUtil.round(sidIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); - allIvt.put("InterimInventory", NumberUtil.round(faceIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); - allIvt.put("NormalStockAge", NumberUtil.round(regIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + allIvt.put("TotalInventory", NumberUtil.round(allIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + allIvt.put("OverdueInventory", NumberUtil.round(sidIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + allIvt.put("InterimInventory", NumberUtil.round(faceIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + allIvt.put("NormalStockAge", NumberUtil.round(regIvtList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); Arrayobject1.add(allIvt); result.put("Arrayobject1",Arrayobject1); @@ -181,19 +179,19 @@ public class AutoQueryProudDayData { List collectB = custIvtBList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("Customernventory1", collectB.isEmpty() ? "0KG" : NumberUtil.round(collectB.get(0).getString("num"), 3)+"KG"); + json.put("Customernventory1", collectB.isEmpty() ? "0" : NumberUtil.round(collectB.get(0).getString("num"), 2)+""); // C库存 List collectC = custIvtCList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("Customernventory2", collectC.isEmpty() ? "0KG" : NumberUtil.round(collectC.get(0).getString("num"), 3)+"KG"); + json.put("Customernventory2", collectC.isEmpty() ? "0" : NumberUtil.round(collectC.get(0).getString("num"), 2)+""); // 其他库存 List collectOthen = custIvtOtherList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("Customernventory3", collectOthen.isEmpty() ? "0KG" : NumberUtil.round(collectOthen.get(0).getString("num"), 3)+"KG"); + json.put("Customernventory3", collectOthen.isEmpty() ? "0" : NumberUtil.round(collectOthen.get(0).getString("num"), 2)+""); Arrayobject2.add(json); } @@ -201,9 +199,9 @@ public class AutoQueryProudDayData { // 计算全部 JSONObject allCustIvt = new JSONObject(); allCustIvt.put("Local", "全部"); - allCustIvt.put("Customernventory1", NumberUtil.round(custIvtBList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); - allCustIvt.put("Customernventory2", NumberUtil.round(custIvtCList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); - allCustIvt.put("Customernventory3", NumberUtil.round(custIvtOtherList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + allCustIvt.put("Customernventory1", NumberUtil.round(custIvtBList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + allCustIvt.put("Customernventory2", NumberUtil.round(custIvtCList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + allCustIvt.put("Customernventory3", NumberUtil.round(custIvtOtherList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); Arrayobject2.add(allCustIvt); result.put("Arrayobject2", Arrayobject2); @@ -255,16 +253,16 @@ public class AutoQueryProudDayData { List custBList = yesterdayInList.stream() .filter(row -> custB.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - yesterdayIn.put("Customerqty1", NumberUtil.round(custBList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + yesterdayIn.put("Customerqty1", NumberUtil.round(custBList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2) +""); // C客户 List custCList = yesterdayInList.stream() .filter(row -> custC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - yesterdayIn.put("Customerqty2", NumberUtil.round(custCList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + yesterdayIn.put("Customerqty2", NumberUtil.round(custCList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // 汇总 - yesterdayIn.put("Customerqty3", NumberUtil.round(yesterdayInList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + yesterdayIn.put("Customerqty3", NumberUtil.round(yesterdayInList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); Arrayobject4.add(yesterdayIn); // ---- 昨日出库量 ---- @@ -275,16 +273,16 @@ public class AutoQueryProudDayData { List custBList2 = yesterdayOutList.stream() .filter(row -> custB.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - yesterdayOut.put("Customerqty1", NumberUtil.round(custBList2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + yesterdayOut.put("Customerqty1", NumberUtil.round(custBList2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // C客户 List custCList2 = yesterdayOutList.stream() .filter(row -> custC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - yesterdayOut.put("Customerqty2", NumberUtil.round(custCList2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + yesterdayOut.put("Customerqty2", NumberUtil.round(custCList2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // 汇总 - yesterdayOut.put("Customerqty3", NumberUtil.round(yesterdayOutList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + yesterdayOut.put("Customerqty3", NumberUtil.round(yesterdayOutList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); Arrayobject4.add(yesterdayOut); // ---- 当月入库量 ---- @@ -295,16 +293,16 @@ public class AutoQueryProudDayData { List custBList3 = monthInList.stream() .filter(row -> custB.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - monthdayIn.put("Customerqty1", NumberUtil.round(custBList3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + monthdayIn.put("Customerqty1", NumberUtil.round(custBList3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // C客户 List custCList3 = monthInList.stream() .filter(row -> custC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - monthdayIn.put("Customerqty2", NumberUtil.round(custCList3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + monthdayIn.put("Customerqty2", NumberUtil.round(custCList3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // 汇总 - monthdayIn.put("Customerqty3", NumberUtil.round(monthInList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + monthdayIn.put("Customerqty3", NumberUtil.round(monthInList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); Arrayobject4.add(monthdayIn); // ---- 当月出库量 ---- @@ -315,16 +313,16 @@ public class AutoQueryProudDayData { List custBList4 = monthOutList.stream() .filter(row -> custB.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - monthdayOut.put("Customerqty1", NumberUtil.round(custBList4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + monthdayOut.put("Customerqty1", NumberUtil.round(custBList4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // C客户 List custCList4 = monthOutList.stream() .filter(row -> custC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - monthdayOut.put("Customerqty2", NumberUtil.round(custCList4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + monthdayOut.put("Customerqty2", NumberUtil.round(custCList4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); // 汇总 - monthdayOut.put("Customerqty3",NumberUtil.round( monthOutList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3)+"KG"); + monthdayOut.put("Customerqty3",NumberUtil.round( monthOutList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); Arrayobject4.add(monthdayOut); result.put("Arrayobject4",Arrayobject4); @@ -442,16 +440,16 @@ public class AutoQueryProudDayData { .collect(Collectors.groupingBy(row -> row.getString("region_code"))); if (paramMap.isEmpty()) { - result.put("Areaqty1","0KG"); - result.put("Areaqty2","0KG"); - result.put("Areaqty3","0KG"); - result.put("Areaqty4","0KG"); + result.put("Areaqty1","0"); + result.put("Areaqty2","0"); + result.put("Areaqty3","0"); + result.put("Areaqty4","0"); } for (String region_code : paramMap.keySet()) { List list = paramMap.get(region_code); - String num = NumberUtil.round(list.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3) + "KG"; + String num = NumberUtil.round(list.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2) + ""; switch (region_code) { case "A1": result.put("Areaqty1", num); break; @@ -461,10 +459,10 @@ public class AutoQueryProudDayData { } } - if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) result.put("Areaqty1","0KG"); - if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) result.put("Areaqty2","0KG"); - if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) result.put("Areaqty3","0KG"); - if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) result.put("Areaqty4","0KG"); + if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) result.put("Areaqty1","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) result.put("Areaqty2","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) result.put("Areaqty3","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) result.put("Areaqty4","0"); return result; } @@ -485,10 +483,10 @@ public class AutoQueryProudDayData { .collect(Collectors.groupingBy(row -> row.getString("region_code"))); if (paramMap.isEmpty()) { - result.put("Areaqty1","0KG"); - result.put("Areaqty2","0KG"); - result.put("Areaqty3","0KG"); - result.put("Areaqty4","0KG"); + result.put("Areaqty1","0"); + result.put("Areaqty2","0"); + result.put("Areaqty3","0"); + result.put("Areaqty4","0"); } for (String region_code : paramMap.keySet()) { @@ -498,7 +496,7 @@ public class AutoQueryProudDayData { .filter(row -> customer.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - String num = NumberUtil.round(custList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 3) + "KG"; + String num = NumberUtil.round(custList.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2) + ""; switch (region_code) { @@ -509,10 +507,10 @@ public class AutoQueryProudDayData { } } - if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) result.put("Areaqty1","0KG"); - if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) result.put("Areaqty2","0KG"); - if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) result.put("Areaqty3","0KG"); - if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) result.put("Areaqty4","0KG"); + if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) result.put("Areaqty1","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) result.put("Areaqty2","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) result.put("Areaqty3","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) result.put("Areaqty4","0"); return result; }