From da3cc13bf97e75bd125000336bdbd1fd5dcc7b9f Mon Sep 17 00:00:00 2001 From: siontion Date: Mon, 24 Jun 2024 17:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/service/projectorder/ProjectOrderServiceImpl.java | 7 ++++++- mes-ui/mes-ui-admin-vue3/package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/projectorder/ProjectOrderServiceImpl.java index 5a09ddf6..d22706c3 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/projectorder/ProjectOrderServiceImpl.java @@ -235,7 +235,12 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { List stockMatDatas = chanjetManager.queryStock(matCodes,projectOrderDO.getWarehouseId()); projectOrderSubDOList.forEach(vo->{ if(stockMatDatas.stream().filter(mo->mo.getInventoryCode().equals(vo.getProjectSubCode())).count()>0){ - vo.setOrderAmount(new Integer(stockMatDatas.stream().filter(mo->mo.getInventoryCode().equals(vo.getProjectSubCode())).collect(Collectors.toList()).get(0).getAvailableQuantity())); + QueryCurrentStockResVO queryCurrentStockResVO = stockMatDatas.stream().filter(mo->mo.getInventoryCode().equals(vo.getProjectSubCode())).collect(Collectors.toList()).get(0); + if(queryCurrentStockResVO.getAvailableQuantity()!= null){ + vo.setOrderAmount(new Double(queryCurrentStockResVO.getAvailableQuantity()).intValue()); + }else { + vo.setOrderAmount(0); + } }else{ vo.setOrderAmount(0); } diff --git a/mes-ui/mes-ui-admin-vue3/package.json b/mes-ui/mes-ui-admin-vue3/package.json index ef429f8b..495774d1 100644 --- a/mes-ui/mes-ui-admin-vue3/package.json +++ b/mes-ui/mes-ui-admin-vue3/package.json @@ -51,7 +51,7 @@ "echarts-wordcloud": "^2.1.0", "element-plus": "2.4.2", "fast-xml-parser": "^4.3.2", - "goeasy": "2.12.4", + "goeasy": "^2.12.4", "highlight.js": "^11.9.0", "jsencrypt": "^3.3.2", "lodash-es": "^4.17.21",