rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、事务问题

This commit is contained in:
大米 2024-06-13 14:52:42 +08:00
parent 4ddd6d1505
commit e76f8bd2e6
1 changed files with 65 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java
View File

@ -47,7 +47,6 @@ public class PublishMaterialService {
MaterialService materialService; MaterialService materialService;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ResultVO<String> publishWork(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) { public ResultVO<String> publishWork(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) {
@ -82,9 +81,6 @@ public class PublishMaterialService {
).concat(".0")); ).concat(".0"));
try {
List<OptionalMbomMaterialEntity> materialList = null; List<OptionalMbomMaterialEntity> materialList = null;
//第一层级 机型发货 和制作 //第一层级 机型发货 和制作
// Long parentId = genVirtualPackLevel1(materialList, optionalEbomPublishAddDTO.getRowId(), optionalEbomPublishAddDTO.getGoodsDesc()); // Long parentId = genVirtualPackLevel1(materialList, optionalEbomPublishAddDTO.getRowId(), optionalEbomPublishAddDTO.getGoodsDesc());
@ -108,17 +104,12 @@ public class PublishMaterialService {
optionalEbomConfigService.updateById(optionalEbomConfigEntity); optionalEbomConfigService.updateById(optionalEbomConfigEntity);
} }
} catch (NflgBusinessException e) {
return ResultVO.error(e.getMsg());
}
return ResultVO.success("发布成功"); return ResultVO.success("发布成功");
} }
@Deprecated @Deprecated
public ResultVO<String> publishWorkOld(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) { public ResultVO<String> publishWorkOld(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) {
@ -259,8 +250,6 @@ public class PublishMaterialService {
// makePack.setMaterialNo(data); // makePack.setMaterialNo(data);
AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO(); AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO();
String key = String.valueOf(IdWorker.getId()); String key = String.valueOf(IdWorker.getId());
toM.setKey(key); toM.setKey(key);
@ -274,7 +263,6 @@ public class PublishMaterialService {
makePack.setMaterialNo(materialNo); makePack.setMaterialNo(materialNo);
} catch (Exception e) { } catch (Exception e) {
throw new NflgBusinessException(STATE.Error, "机型制作," + e.getMessage()); throw new NflgBusinessException(STATE.Error, "机型制作," + e.getMessage());
} }
@ -306,7 +294,6 @@ public class PublishMaterialService {
* @param materialList * @param materialList
* @param rootRowId * @param rootRowId
* @param parentId * @param parentId
* @return * @return
*/ */
private void genVirtualPackMachineLevel2(List<OptionalMbomMaterialEntity> materialList, List<OptionalEbomImportChildVO> optionList, Long rootRowId, Long parentId, Long deviceRowId) throws NflgBusinessException { private void genVirtualPackMachineLevel2(List<OptionalMbomMaterialEntity> materialList, List<OptionalEbomImportChildVO> optionList, Long rootRowId, Long parentId, Long deviceRowId) throws NflgBusinessException {
@ -387,7 +374,6 @@ public class PublishMaterialService {
} }
} else { //同物料号 } else { //同物料号
material = Convert.convert(new TypeReference<OptionalMbomMaterialEntity>() { material = Convert.convert(new TypeReference<OptionalMbomMaterialEntity>() {
}, optionalMbomCompareEntity); }, optionalMbomCompareEntity);
@ -464,8 +450,6 @@ public class PublishMaterialService {
// makePack.setMaterialNo(data); // makePack.setMaterialNo(data);
AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO(); AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO();
String key = String.valueOf(IdWorker.getId()); String key = String.valueOf(IdWorker.getId());
toM.setKey(key); toM.setKey(key);
@ -509,7 +493,6 @@ public class PublishMaterialService {
// sendPack.setMaterialNo(data); // sendPack.setMaterialNo(data);
AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO(); AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO();
String key = String.valueOf(IdWorker.getId()); String key = String.valueOf(IdWorker.getId());
toM.setKey(key); toM.setKey(key);