From 3ebb715544706fc76fe6a1559234b7737bc189a6 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Wed, 7 Aug 2024 16:27:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/FactoryDataServiceImpl.java | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java index 4b47b5ce..4d070a47 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.smartfactory.service.factorydata; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; @@ -17,7 +16,6 @@ import cn.iocoder.yudao.module.smartfactory.convert.packageData.PackageDataConve import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO; -import cn.iocoder.yudao.module.smartfactory.dal.dataobject.packageInfo.PackageDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.packagedata.PackageDataDO; import cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata.FactoryDataMapper; import cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata.FactoryDataSizeMapper; @@ -40,7 +38,6 @@ import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.yudao.module.smartfactory.enums.ErrorCodeConstants.*; @@ -298,7 +295,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { Long factoryId = null; try { factoryId = validateFactoryForCreate(data.getFactoryName(), data.getSizeName(), data.getDate()); - } catch (ServiceException ex) { + } catch (Exception ex) { respVO.getFailureUsernames().put(data.getFactoryName() + "-" + data.getDate(), ex.getMessage()); return; @@ -309,35 +306,35 @@ public class FactoryDataServiceImpl implements FactoryDataService { // 获取 规格名称 String sizeName = data.getSizeName().split(":")[1]; - PackageDO packageDO = packageService.getPackageByFactoryIdAndSize(factoryId, sizeId); - if (packageDO != null && (data.getNum() != null || data.getAutoNum() != null)) { - - PackageDataDO packageDataDO = BeanUtils.toBean(packageDO, PackageDataDO.class); - packageDataDO.setId(null); - packageDataDO.setPackageDate(data.getDate()); - packageDataDO.setPackageId(packageDO.getId()); - packageDataDO.setPackageName(packageDO.getName()); - packageDataDO.setSizeName(sizeName); - packageDataDO.setNum(data.getNum()); - packageDataDO.setAutoNum(data.getAutoNum()); - packageDataDO.setDamageNum(data.getDamageNum()); - packageDataDO.setCreator(getLoginUserId().toString()); - packageDataDO.setUpdater(null); - packageDataDO.setCreateTime(LocalDateTime.now()); - - //计算平方数 - String[] size = sizeName.split("\\*"); - BigDecimal squareNum = BigDecimal.valueOf((double) Integer.parseInt(size[0]) / 1000) - .multiply(BigDecimal.valueOf((double) Integer.parseInt(size[1]) / 1000)) - .multiply(BigDecimal.valueOf(packageDataDO.getSizePieces())) - .multiply(BigDecimal.valueOf(Integer.sum(packageDataDO.getNum(), packageDataDO.getAutoNum()))); - - //设置平方数 - packageDataDO.setSquareNum(squareNum); - - // 插入打包线数据 - packageDataService.create(packageDataDO); - } +// PackageDO packageDO = packageService.getPackageByFactoryIdAndSize(factoryId, sizeId); +// if (packageDO != null && (data.getNum() != null || data.getAutoNum() != null)) { +// +// PackageDataDO packageDataDO = BeanUtils.toBean(packageDO, PackageDataDO.class); +// packageDataDO.setId(null); +// packageDataDO.setPackageDate(data.getDate()); +// packageDataDO.setPackageId(packageDO.getId()); +// packageDataDO.setPackageName(packageDO.getName()); +// packageDataDO.setSizeName(sizeName); +// packageDataDO.setNum(data.getNum()); +// packageDataDO.setAutoNum(data.getAutoNum()); +// packageDataDO.setDamageNum(data.getDamageNum()); +// packageDataDO.setCreator(getLoginUserId().toString()); +// packageDataDO.setUpdater(null); +// packageDataDO.setCreateTime(LocalDateTime.now()); +// +// //计算平方数 +// String[] size = sizeName.split("\\*"); +// BigDecimal squareNum = BigDecimal.valueOf((double) Integer.parseInt(size[0]) / 1000) +// .multiply(BigDecimal.valueOf((double) Integer.parseInt(size[1]) / 1000)) +// .multiply(BigDecimal.valueOf(packageDataDO.getSizePieces())) +// .multiply(BigDecimal.valueOf(Integer.sum(packageDataDO.getNum(), packageDataDO.getAutoNum()))); +// +// //设置平方数 +// packageDataDO.setSquareNum(squareNum); +// +// // 插入打包线数据 +// packageDataService.create(packageDataDO); +// } List factoryDataSizeDOs = new ArrayList<>(); if (data.getInDamageNum() != null || data.getInNum() != null || data.getOutNum() != null) {