diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/job/factoryData/FactoryDataJob.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/job/factoryData/FactoryDataJob.java index 80d42a57..f8bbfc96 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/job/factoryData/FactoryDataJob.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/job/factoryData/FactoryDataJob.java @@ -97,19 +97,32 @@ public class FactoryDataJob { infoRespVOS.removeAll(infos); }); - // 插入 出库数据 + // 插入 打包线以外数据 for (FactoryDataInfoRespVO infoRespVO : infoRespVOS) { - FactoryDataDO dataDO = new FactoryDataDO(); + // 插入出库数据 + FactoryDataDO outDO = new FactoryDataDO(); - dataDO.setFactoryId(infoRespVO.getFactoryId()); - dataDO.setDate(infoRespVO.getDate()); - dataDO.setDataType(1); - dataDO.setTotalNum(infoRespVO.getOutNum()); - dataDO.setDamageNum(infoRespVO.getOutDamageNum()); - dataDO.setCreator(Objects.requireNonNull(getLoginUserId()).toString()); + outDO.setFactoryId(infoRespVO.getFactoryId()); + outDO.setDate(infoRespVO.getDate()); + outDO.setDataType(1); + outDO.setTotalNum(infoRespVO.getOutNum()); + outDO.setDamageNum(infoRespVO.getOutDamageNum()); + outDO.setCreator(Objects.requireNonNull(getLoginUserId()).toString()); - outFactoryDataDOs.add(dataDO); + outFactoryDataDOs.add(outDO); + + // 插入入库数据 + FactoryDataDO inDO = new FactoryDataDO(); + + inDO.setFactoryId(infoRespVO.getFactoryId()); + inDO.setDate(infoRespVO.getDate()); + inDO.setDataType(2); + inDO.setTotalNum(infoRespVO.getInNum()); + inDO.setDamageNum(infoRespVO.getInDamageNum()); + inDO.setCreator(Objects.requireNonNull(getLoginUserId()).toString()); + + outFactoryDataDOs.add(inDO); } // 插入