ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改出入库数据 导入功能

Browse Source
This commit is contained in:
furongxin 2024-08-09 21:18:23 +08:00
parent a3937a440f
commit 29aeccb91d
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataImportVO.java
View File

@ -53,9 +53,6 @@ public class FactoryDataImportVO {
// @ExcelProperty("出库破损数") // @ExcelProperty("出库破损数")
// private Integer outDamageNum; // private Integer outDamageNum;
@ExcelProperty("规格片数")
private Integer sizePieces;
@ExcelProperty("出入库数") @ExcelProperty("出入库数")
private Integer num; private Integer num;

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factorydata/FactoryDataSizeDO.java
View File

@ -45,7 +45,7 @@ public class FactoryDataSizeDO extends BaseDO {
/** /**
* 规格片数 * 规格片数
*/ */
private Integer sizePieces; private String sizePieces;
/** /**
* 数据类型 * 数据类型

8
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java
View File

@ -208,9 +208,9 @@ public class FactoryDataServiceImpl implements FactoryDataService {
.mapToInt(Integer::intValue).sum(); .mapToInt(Integer::intValue).sum();
dataDetailRespVO.setInTotalNum(inSum == 0 ? null : inSum); dataDetailRespVO.setInTotalNum(inSum == 0 ? null : inSum);
//设置入库平方数 // //设置入库平方数
dataDetailRespVO.setSquareNum(date.getValue().stream().map(FactoryDataInfoRespVO::getSquareNum) // dataDetailRespVO.setSquareNum(date.getValue().stream().map(FactoryDataInfoRespVO::getSquareNum)
.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); // .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
//设置出库总数 //设置出库总数
int outTotalNum = date.getValue().stream().filter(info -> info.getOutNum() != null) int outTotalNum = date.getValue().stream().filter(info -> info.getOutNum() != null)
@ -344,7 +344,6 @@ public class FactoryDataServiceImpl implements FactoryDataService {
//设置规格信息 //设置规格信息
dataSizeDO.setSizeId(sizeId); dataSizeDO.setSizeId(sizeId);
dataSizeDO.setSizeName(sizeName); dataSizeDO.setSizeName(sizeName);
dataSizeDO.setSizePieces(data.getSizePieces());
//设置工厂和日期 //设置工厂和日期
dataSizeDO.setFactoryId(factoryId); dataSizeDO.setFactoryId(factoryId);
dataSizeDO.setDate(data.getDate()); dataSizeDO.setDate(data.getDate());
@ -361,7 +360,6 @@ public class FactoryDataServiceImpl implements FactoryDataService {
//设置规格信息 //设置规格信息
dataSizeDamageDO.setSizeId(sizeId); dataSizeDamageDO.setSizeId(sizeId);
dataSizeDamageDO.setSizeName(sizeName); dataSizeDamageDO.setSizeName(sizeName);
dataSizeDamageDO.setSizePieces(data.getSizePieces());
//设置工厂和日期 //设置工厂和日期
dataSizeDamageDO.setFactoryId(factoryId); dataSizeDamageDO.setFactoryId(factoryId);
dataSizeDamageDO.setDate(data.getDate()); dataSizeDamageDO.setDate(data.getDate());