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 7e2aa679..8657ddff 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 @@ -17,9 +17,11 @@ import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryIn 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.service.factoryinfo.FactoryInfoService; +import cn.iocoder.yudao.module.smartfactory.service.packagedata.PackageDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -54,6 +56,9 @@ public class FactoryDataServiceImpl implements FactoryDataService { @Resource private FactoryInfoService factoryInfoService; + @Resource + private PackageDataService packageDataService; + @Override public Long createData(List factoryDataDOS) { @@ -64,6 +69,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { } @Override + @Transactional(rollbackFor = Exception.class) public void updateData(FactoryDataSizeCreateReqVO updateReqVO) { // 修改 规格明细数据 @@ -107,10 +113,14 @@ public class FactoryDataServiceImpl implements FactoryDataService { } @Override + @Transactional(rollbackFor = Exception.class) public void deleteData(Long factoryId, String date) { //删除出入库 规格数据 dataSizeService.deleteData(factoryId, date); + + //删除打包线数据 + packageDataService.deletePackageData(factoryId, date); } @Override diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java index 9c9202c9..09248e72 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java @@ -128,7 +128,6 @@ public class FactoryDataSizeServiceImpl implements FactoryDataSizeService{ } @Override - @Transactional(rollbackFor = Exception.class) public void updateData(FactoryDataSizeCreateReqVO updateReqVO) { // 更新