root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:临期报表

Browse Source
This commit is contained in:
liuxy
2023-12-28 11:07:28 +08:00
parent e0d4df181c
commit 3bbc5dfef3
5 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql
View File

@@ -64,10 +64,9 @@
FROM FROM
st_ivt_structivt ivt st_ivt_structivt ivt
LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id 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 LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name
AND ivt.pcsn = sub.container_name
WHERE 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' AND ivt.canuse_qty > '0'
GROUP BY attr.stor_id GROUP BY attr.stor_id

90
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java
View File

@@ -98,25 +98,25 @@ public class AutoQueryProudDayData {
List<JSONObject> collect = allIvtList.stream() List<JSONObject> collect = allIvtList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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<JSONObject> collect2 = sidIvtList.stream() List<JSONObject> collect2 = sidIvtList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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<JSONObject> collect3 = faceIvtList.stream() List<JSONObject> collect3 = faceIvtList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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<JSONObject> collect4 = regIvtList.stream() List<JSONObject> collect4 = regIvtList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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); Arrayobject1.add(json);
} }
@@ -125,10 +125,10 @@ public class AutoQueryProudDayData {
JSONObject allIvt = new JSONObject(); JSONObject allIvt = new JSONObject();
allIvt.put("local", "汇总"); 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("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.0).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.0).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.0).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); Arrayobject1.add(allIvt);
result.put("Arrayobject1",Arrayobject1); result.put("Arrayobject1",Arrayobject1);
@@ -194,19 +194,19 @@ public class AutoQueryProudDayData {
List<JSONObject> collectB = custIvtBList.stream() List<JSONObject> collectB = custIvtBList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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库存 // C库存
List<JSONObject> collectC = custIvtCList.stream() List<JSONObject> collectC = custIvtCList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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<JSONObject> collectOthen = custIvtOtherList.stream() List<JSONObject> collectOthen = custIvtOtherList.stream()
.filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .filter(row -> row.getString("stor_id").equals(item.getString("stor_id")))
.collect(Collectors.toList()); .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); Arrayobject2.add(json);
} }
@@ -236,11 +236,11 @@ public class AutoQueryProudDayData {
JSONArray Arrayobject3 = new JSONArray(); JSONArray Arrayobject3 = new JSONArray();
JSONObject changeIvt = new JSONObject(); JSONObject changeIvt = new JSONObject();
changeIvt.put("Customer1", "兰州仓库(除BC)"); changeIvt.put("Customer1", "兰州一期仓(除BC)");
changeIvt.put("Customer2", "兰州二期仓库(除BC)"); changeIvt.put("Customer2", "兰州二期仓(除BC)");
changeIvt.put("Customer3", "东莞仓"); changeIvt.put("Customer3", "东莞仓");
changeIvt.put("Customer4", "兰州仓B客户"); changeIvt.put("Customer4", "兰州仓B");
changeIvt.put("Customer5", "兰州仓C客户"); changeIvt.put("Customer5", "兰州仓C");
Arrayobject3.add(changeIvt); Arrayobject3.add(changeIvt);
result.put("Arrayobject3", Arrayobject3); result.put("Arrayobject3", Arrayobject3);
@@ -540,12 +540,12 @@ public class AutoQueryProudDayData {
.collect(Collectors.groupingBy(row -> row.getString("region_code"))); .collect(Collectors.groupingBy(row -> row.getString("region_code")));
if (paramMap.isEmpty()) { if (paramMap.isEmpty()) {
result.put("Areaqty1","0"); result.put("Areaqty1","0.00");
result.put("Areaqty2","0"); result.put("Areaqty2","0.00");
result.put("Areaqty3","0"); result.put("Areaqty3","0.00");
result.put("Areaqty4","0"); result.put("Areaqty4","0.00");
result.put("Areaqty5","0"); result.put("Areaqty5","0.00");
result.put("Areaqty6","0"); result.put("Areaqty6","0.00");
} }
for (String region_code : paramMap.keySet()) { for (String region_code : paramMap.keySet()) {
@@ -566,22 +566,22 @@ public class AutoQueryProudDayData {
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) {
result.put("Areaqty1","0"); result.put("Areaqty1","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) {
result.put("Areaqty2","0"); result.put("Areaqty2","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) {
result.put("Areaqty3","0"); result.put("Areaqty3","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) {
result.put("Areaqty4","0"); result.put("Areaqty4","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) {
result.put("Areaqty5","0"); result.put("Areaqty5","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) {
result.put("Areaqty6","0"); result.put("Areaqty6","0.00");
} }
return result; return result;
@@ -603,12 +603,12 @@ public class AutoQueryProudDayData {
.collect(Collectors.groupingBy(row -> row.getString("region_code"))); .collect(Collectors.groupingBy(row -> row.getString("region_code")));
if (paramMap.isEmpty()) { if (paramMap.isEmpty()) {
result.put("Areaqty1","0"); result.put("Areaqty1","0.00");
result.put("Areaqty2","0"); result.put("Areaqty2","0.00");
result.put("Areaqty3","0"); result.put("Areaqty3","0.00");
result.put("Areaqty4","0"); result.put("Areaqty4","0.00");
result.put("Areaqty5","0"); result.put("Areaqty5","0.00");
result.put("Areaqty6","0"); result.put("Areaqty6","0.00");
} }
for (String region_code : paramMap.keySet()) { for (String region_code : paramMap.keySet()) {
@@ -634,22 +634,22 @@ public class AutoQueryProudDayData {
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) {
result.put("Areaqty1","0"); result.put("Areaqty1","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) {
result.put("Areaqty2","0"); result.put("Areaqty2","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) {
result.put("Areaqty3","0"); result.put("Areaqty3","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) {
result.put("Areaqty4","0"); result.put("Areaqty4","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) {
result.put("Areaqty5","0"); result.put("Areaqty5","0.00");
} }
if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) { if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) {
result.put("Areaqty6", "0"); result.put("Areaqty6", "0.00");
} }
return result; return result;
@@ -671,34 +671,34 @@ public class AutoQueryProudDayData {
.filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId()))
.filter(row -> !custBandC.contains(row.getString("customer_name"))) .filter(row -> !custBandC.contains(row.getString("customer_name")))
.collect(Collectors.toList()); .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) // 兰州二期仓(除BC)
List<JSONObject> collect2 = dataList.stream() List<JSONObject> collect2 = dataList.stream()
.filter(row -> row.getString("stor_id").equals(AutoQueryEnum.BC01.getId())) .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.BC01.getId()))
.filter(row -> !custBandC.contains(row.getString("customer_name"))) .filter(row -> !custBandC.contains(row.getString("customer_name")))
.collect(Collectors.toList()); .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<JSONObject> collect3 = dataList.stream() List<JSONObject> collect3 = dataList.stream()
.filter(row -> row.getString("stor_id").equals(AutoQueryEnum.WK01.getId())) .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.WK01.getId()))
.collect(Collectors.toList()); .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) // 兰州一期仓(B)
List<JSONObject> collect4 = dataList.stream() List<JSONObject> collect4 = dataList.stream()
.filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId()))
.filter(row -> custB.contains(row.getString("customer_name"))) .filter(row -> custB.contains(row.getString("customer_name")))
.collect(Collectors.toList()); .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) // 兰州一期仓(C)
List<JSONObject> collect5 = dataList.stream() List<JSONObject> collect5 = dataList.stream()
.filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId()))
.filter(row -> custC.contains(row.getString("customer_name"))) .filter(row -> custC.contains(row.getString("customer_name")))
.collect(Collectors.toList()); .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; return result;
} }
@@ -716,7 +716,7 @@ public class AutoQueryProudDayData {
double subIvt = NumberUtil.sub(jsonIvtB.getDoubleValue("num"), monthInB.getDoubleValue("num")); 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; return result;
} }

12
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -5185,11 +5185,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} else { } else {
if (ObjectUtil.isEmpty(jsonCust)) { 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); JSONObject jsonDtl = dtlTab.query("iostorinv_id = '" + jsonMst.getString("iostorinv_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonDtl)) { if (ObjectUtil.isNotEmpty(jsonDtl)) {

9
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -549,15 +549,16 @@ export default {
} }
}, },
printExcel(jo) { 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 === '') { if (jo.shd_dtl_num === '') {
return this.crud.notify('客户为空！', CRUD.NOTIFICATION_TYPE.INFO) 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
} }*/
jo.shd_dtl_num = 44
checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => { checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => {
const j = Math.ceil(res.num / jo.shd_dtl_num) const j = Math.ceil(res.num / jo.shd_dtl_num)
debugger debugger

3
lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
View File

@@ -309,7 +309,8 @@ export default {
'sap_pcsn': this.crud.query.sap_pcsn, 'sap_pcsn': this.crud.query.sap_pcsn,
'date_of_production': this.crud.query.date_of_production, 'date_of_production': this.crud.query.date_of_production,
'sale_order_name': this.crud.query.sale_order_name, '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) { if (this.crud.query.createTime !== undefined) {
data.begin_time = this.crud.query.createTime[0] data.begin_time = this.crud.query.createTime[0]