订单 数据逻辑处理

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<QueryCurrentStockResVO> 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);
                 }

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",