From 3bbc5dfef387440595a1c90a8225f58f7ba40a7a Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 28 Dec 2023 11:07:28 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=B8=B4=E6=9C=9F=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch/manage/AUTOQUERYBILLINFO.wql | 5 +- .../wms/sch/manage/AutoQueryProudDayData.java | 90 +++++++++---------- .../service/impl/CheckOutBillServiceImpl.java | 12 ++- .../src/views/wms/st/outbill/index.vue | 9 +- .../src/views/wms/stat/pastivt/index.vue | 3 +- 5 files changed, 62 insertions(+), 57 deletions(-) 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 00ca3fcaa..f17cab80e 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 @@ -64,10 +64,9 @@ FROM st_ivt_structivt ivt LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = attr.storagevehicle_code - AND ivt.pcsn = sub.container_name + LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name WHERE - DATEDIFF( NOW(), sub.date_of_production ) >= '90' + DATEDIFF( NOW(), sub.date_of_production ) >= SUBSTRING_INDEX(sub.quality_guaran_period,'天',1) AND ivt.canuse_qty > '0' GROUP BY attr.stor_id 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 d013d21f6..80edd0e8e 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 @@ -98,25 +98,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() ? "0" : NumberUtil.round(collect.get(0).getString("num"), 2)+""); + json.put("TotalInventory", collect.isEmpty() ? "0.00" : 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() ? "0" : NumberUtil.round(collect2.get(0).getString("num"),2)+""); + json.put("OverdueInventory", collect2.isEmpty() ? "0.00" : 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() ? "0" : NumberUtil.round(collect3.get(0).getString("num"),2)+""); + json.put("InterimInventory", collect3.isEmpty() ? "0.00" : 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() ? "0" : NumberUtil.round(collect4.get(0).getString("num"),2)+""); + json.put("NormalStockAge", collect4.isEmpty() ? "0.00" : NumberUtil.round(collect4.get(0).getString("num"),2)+""); Arrayobject1.add(json); } @@ -125,10 +125,10 @@ public class AutoQueryProudDayData { JSONObject allIvt = new JSONObject(); allIvt.put("local", "汇总"); ; - allIvt.put("TotalInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("TotalInventory")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); - allIvt.put("OverdueInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("OverdueInventory")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); - allIvt.put("InterimInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("InterimInventory")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); - allIvt.put("NormalStockAge", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("NormalStockAge")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + allIvt.put("TotalInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("TotalInventory")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + allIvt.put("OverdueInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("OverdueInventory")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + allIvt.put("InterimInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("InterimInventory")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + allIvt.put("NormalStockAge", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("NormalStockAge")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); Arrayobject1.add(allIvt); result.put("Arrayobject1",Arrayobject1); @@ -194,19 +194,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() ? "0" : NumberUtil.round(collectB.get(0).getString("num"), 2)+""); + json.put("Customernventory1", collectB.isEmpty() ? "0.00" : 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() ? "0" : NumberUtil.round(collectC.get(0).getString("num"), 2)+""); + json.put("Customernventory2", collectC.isEmpty() ? "0.00" : 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() ? "0" : NumberUtil.round(collectOthen.get(0).getString("num"), 2)+""); + json.put("Customernventory3", collectOthen.isEmpty() ? "0.00" : NumberUtil.round(collectOthen.get(0).getString("num"), 2)+""); Arrayobject2.add(json); } @@ -236,11 +236,11 @@ public class AutoQueryProudDayData { JSONArray Arrayobject3 = new JSONArray(); JSONObject changeIvt = new JSONObject(); - changeIvt.put("Customer1", "兰州仓库(除BC)"); - changeIvt.put("Customer2", "兰州二期仓库(除BC)"); + changeIvt.put("Customer1", "兰州一期仓(除BC)"); + changeIvt.put("Customer2", "兰州二期仓(除BC)"); changeIvt.put("Customer3", "东莞仓"); - changeIvt.put("Customer4", "兰州仓B客户"); - changeIvt.put("Customer5", "兰州仓C客户"); + changeIvt.put("Customer4", "兰州仓B"); + changeIvt.put("Customer5", "兰州仓C"); Arrayobject3.add(changeIvt); result.put("Arrayobject3", Arrayobject3); @@ -540,12 +540,12 @@ public class AutoQueryProudDayData { .collect(Collectors.groupingBy(row -> row.getString("region_code"))); if (paramMap.isEmpty()) { - result.put("Areaqty1","0"); - result.put("Areaqty2","0"); - result.put("Areaqty3","0"); - result.put("Areaqty4","0"); - result.put("Areaqty5","0"); - result.put("Areaqty6","0"); + result.put("Areaqty1","0.00"); + result.put("Areaqty2","0.00"); + result.put("Areaqty3","0.00"); + result.put("Areaqty4","0.00"); + result.put("Areaqty5","0.00"); + result.put("Areaqty6","0.00"); } for (String region_code : paramMap.keySet()) { @@ -566,22 +566,22 @@ public class AutoQueryProudDayData { } if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { - result.put("Areaqty1","0"); + result.put("Areaqty1","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { - result.put("Areaqty2","0"); + result.put("Areaqty2","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { - result.put("Areaqty3","0"); + result.put("Areaqty3","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { - result.put("Areaqty4","0"); + result.put("Areaqty4","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) { - result.put("Areaqty5","0"); + result.put("Areaqty5","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) { - result.put("Areaqty6","0"); + result.put("Areaqty6","0.00"); } return result; @@ -603,12 +603,12 @@ public class AutoQueryProudDayData { .collect(Collectors.groupingBy(row -> row.getString("region_code"))); if (paramMap.isEmpty()) { - result.put("Areaqty1","0"); - result.put("Areaqty2","0"); - result.put("Areaqty3","0"); - result.put("Areaqty4","0"); - result.put("Areaqty5","0"); - result.put("Areaqty6","0"); + result.put("Areaqty1","0.00"); + result.put("Areaqty2","0.00"); + result.put("Areaqty3","0.00"); + result.put("Areaqty4","0.00"); + result.put("Areaqty5","0.00"); + result.put("Areaqty6","0.00"); } for (String region_code : paramMap.keySet()) { @@ -634,22 +634,22 @@ public class AutoQueryProudDayData { } if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { - result.put("Areaqty1","0"); + result.put("Areaqty1","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { - result.put("Areaqty2","0"); + result.put("Areaqty2","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { - result.put("Areaqty3","0"); + result.put("Areaqty3","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { - result.put("Areaqty4","0"); + result.put("Areaqty4","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) { - result.put("Areaqty5","0"); + result.put("Areaqty5","0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) { - result.put("Areaqty6", "0"); + result.put("Areaqty6", "0.00"); } return result; @@ -671,34 +671,34 @@ public class AutoQueryProudDayData { .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> !custBandC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty1", NumberUtil.round(collect.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + result.put("Customerqty1", NumberUtil.round(collect.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); // 兰州二期仓(除BC) List collect2 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.BC01.getId())) .filter(row -> !custBandC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty2", NumberUtil.round(collect2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + result.put("Customerqty2", NumberUtil.round(collect2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); // 东莞仓 List collect3 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.WK01.getId())) .collect(Collectors.toList()); - result.put("Customerqty3", NumberUtil.round(collect3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + result.put("Customerqty3", NumberUtil.round(collect3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); // 兰州一期仓(B) List collect4 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> custB.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty4", NumberUtil.round(collect4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + result.put("Customerqty4", NumberUtil.round(collect4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); // 兰州一期仓(C) List collect5 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> custC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty5", NumberUtil.round(collect5.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2)+""); + result.put("Customerqty5", NumberUtil.round(collect5.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); return result; } @@ -716,7 +716,7 @@ public class AutoQueryProudDayData { double subIvt = NumberUtil.sub(jsonIvtB.getDoubleValue("num"), monthInB.getDoubleValue("num")); - result.put("Customerqty1", subIvt > 0 ? NumberUtil.round(subIvt, 2).toString() : "0"); + result.put("Customerqty1", subIvt > 0 ? NumberUtil.round(subIvt, 2).toString() : "0.00"); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index ebb431c3b..5d184a3ba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -5185,11 +5185,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } else { if (ObjectUtil.isEmpty(jsonCust)) { - throw new BadRequestException("客户不存在"); + shd_dtl_num = 44; + //1.根据出入库主表中 收货单位 查询客户表中的模板路径 + code_template = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("PRINT_TEMPLE").getValue(); + + } else { + shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); + //1.根据出入库主表中 收货单位 查询客户表中的模板路径 + code_template = jsonCust.getString("shd_print_no"); } - shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); - //1.根据出入库主表中 收货单位 查询客户表中的模板路径 - code_template = jsonCust.getString("shd_print_no"); JSONObject jsonDtl = dtlTab.query("iostorinv_id = '" + jsonMst.getString("iostorinv_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonDtl)) { diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 38ae59ec0..d57961b69 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -549,15 +549,16 @@ export default { } }, printExcel(jo) { - if (jo.bill_type !== '1004' && jo.bill_type !== '1009') { + /*if (jo.bill_type !== '1004' && jo.bill_type !== '1009') { if (jo.shd_dtl_num === '') { return this.crud.notify('客户为空！', CRUD.NOTIFICATION_TYPE.INFO) } - } + }*/ - if (jo.bill_type === '1004' || jo.bill_type === '1009') { + /* if (jo.bill_type === '1004' || jo.bill_type === '1009') { jo.shd_dtl_num = 44 - } + }*/ + jo.shd_dtl_num = 44 checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => { const j = Math.ceil(res.num / jo.shd_dtl_num) debugger diff --git a/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue b/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue index cb4cf5ea0..a347415b9 100644 --- a/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue @@ -309,7 +309,8 @@ export default { 'sap_pcsn': this.crud.query.sap_pcsn, 'date_of_production': this.crud.query.date_of_production, 'sale_order_name': this.crud.query.sale_order_name, - 'customer_name': this.crud.query.customer_name + 'customer_name': this.crud.query.customer_name, + 'is_sid': this.crud.query.is_sid } if (this.crud.query.createTime !== undefined) { data.begin_time = this.crud.query.createTime[0]