From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 07 三月 2025 16:16:18 +0800 Subject: [PATCH] art: 选择设备查询逻辑修改, 点检工单新增时产线逻辑修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java index ef137fa..89f23ca 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java @@ -68,14 +68,14 @@ //3.鑾峰彇涓� 杈呭崟浣嶈浆鎹㈡瘮渚� SparePart sparePart = sparePartService.getById(sparePartId); - String conversionRatio = sparePart.getConversionRatio(); - double conversionRatioD = 0; + /* String conversionRatio = sparePart.getConversionRatio();*/ + /* double conversionRatioD = 0; if (StringUtils.isBlank(conversionRatio)) { conversionRatioD = Double.parseDouble("0"); } else { conversionRatioD = Double.parseDouble(conversionRatio); } - BigDecimal conversionRatioB = new BigDecimal(conversionRatioD); + BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);*/ //4.璁$畻鍑哄簱鏁伴噺鏇存柊搴撳瓨鏁伴噺(搴撳瓨) /*搴撳瓨涓绘暟閲�*/ @@ -83,16 +83,16 @@ BigDecimal mainQuantityB = new BigDecimal(mainQuantity); /*搴撳瓨杈呮暟閲�*/ - Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity(); - BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity); + /* Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity(); + BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);*/ BigDecimal mainQuantitySubtract = mainQuantityB.subtract(scrapMainQuantityB);//棰嗗彇鍚庡簱瀛樹富鏁伴噺 - BigDecimal scrapAuxiliaryQuantity = mainQuantitySubtract.multiply(conversionRatioB);//棰嗗彇鍚庡簱瀛樿緟鏁伴噺 + /* BigDecimal scrapAuxiliaryQuantity = mainQuantitySubtract.multiply(conversionRatioB);//棰嗗彇鍚庡簱瀛樿緟鏁伴噺*/ sparesPartInventory.setMainQuantity(mainQuantitySubtract.doubleValue()); - sparesPartInventory.setAuxiliaryQuantity(scrapAuxiliaryQuantity.doubleValue()); + /* sparesPartInventory.setAuxiliaryQuantity(scrapAuxiliaryQuantity.doubleValue());*/ boolean b = sparesPartInventoryService.updateById(sparesPartInventory); if (!b) { return b; -- Gitblit v1.9.3