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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-06-13 15:22:10 +08:00
parent 21f6ff70c5 dfa6939f43
commit f8d5f29fbc
2 changed files with 69 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
View File

@ -210,7 +210,8 @@ public class MaterialService {
materialMainService.saveOrUpdateBatch(resultList); materialMainService.saveOrUpdateBatch(resultList);
initCategoryInfo(syncOaEnts); initCategoryInfo(syncOaEnts);
//同步OA //同步OA
CompletableFuture.runAsync(() -> sysnToOa(syncOaEnts),syncOAThreadPool); sysnToOa(syncOaEnts);
// CompletableFuture.runAsync(() -> sysnToOa(syncOaEnts),syncOAThreadPool);
return result; return result;
} }

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

@ -26,6 +26,7 @@ import com.nflg.product.bomnew.util.OrderNoUtil;
import nflg.product.common.constant.STATE; import nflg.product.common.constant.STATE;
import nflg.product.common.vo.ResultVO; import nflg.product.common.vo.ResultVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
@ -46,8 +47,7 @@ public class PublishMaterialService {
MaterialService materialService; MaterialService materialService;
@Transactional(rollbackFor = Exception.class)
public ResultVO<String> publishWork(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) { public ResultVO<String> publishWork(OptionalEbomPublishAddDTO optionalEbomPublishAddDTO) {
List<OptionalEbomImportChildVO> optionList = optionalEbomConfigService.getPreviewOptionList(optionalEbomPublishAddDTO.getRowId()); List<OptionalEbomImportChildVO> optionList = optionalEbomConfigService.getPreviewOptionList(optionalEbomPublishAddDTO.getRowId());
@ -81,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());
@ -107,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) {
@ -258,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);
@ -273,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());
} }
@ -305,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 {
@ -386,7 +374,6 @@ public class PublishMaterialService {
} }
} else { //同物料号 } else { //同物料号
material = Convert.convert(new TypeReference<OptionalMbomMaterialEntity>() { material = Convert.convert(new TypeReference<OptionalMbomMaterialEntity>() {
}, optionalMbomCompareEntity); }, optionalMbomCompareEntity);
@ -463,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);
@ -508,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);