|
|
@ -531,7 +531,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
// } |
|
|
// } |
|
|
|
|
|
|
|
|
// 调用存储过程 |
|
|
// 调用存储过程 |
|
|
List<BomComponentVo> list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo()); |
|
|
|
|
|
|
|
|
List<BomComponentVo> list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo(), "search"); |
|
|
//List<BomComponentVo> list = bomManagementMapper.queryBomComponent(bomDetailEntity.get(0)); |
|
|
//List<BomComponentVo> list = bomManagementMapper.queryBomComponent(bomDetailEntity.get(0)); |
|
|
map.put("rows", list); |
|
|
map.put("rows", list); |
|
|
if (list.isEmpty()) { |
|
|
if (list.isEmpty()) { |
|
|
@ -542,11 +542,17 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public List<BomComponentVo> fetchBomComponentDetails(String site, String codeNo) { |
|
|
|
|
|
|
|
|
public List<BomComponentVo> fetchBomComponentDetails(String site, String codeNo, String type) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
params.add(site); |
|
|
params.add(site); |
|
|
params.add(codeNo); |
|
|
params.add(codeNo); |
|
|
List<Map<String, Object>> resultList = procedureDao.getProcedureData("get_BM_BOMDetail", params); |
|
|
|
|
|
|
|
|
List<Map<String, Object>> resultList; |
|
|
|
|
|
// 2025-12-25 如果是归档类型,调用归档存储过程 |
|
|
|
|
|
if ("archiving".equals(type)) { |
|
|
|
|
|
resultList = procedureDao.getProcedureData("get_BM_BOMDetailArchiving", params); |
|
|
|
|
|
} else { |
|
|
|
|
|
resultList = procedureDao.getProcedureData("get_BM_BOMDetail", params); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (resultList.isEmpty()) { |
|
|
if (resultList.isEmpty()) { |
|
|
return new ArrayList<>(); |
|
|
return new ArrayList<>(); |
|
|
@ -2161,7 +2167,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
public void bmStatusToFinish(PlmTechnicalSpecificationSheetData data) { |
|
|
public void bmStatusToFinish(PlmTechnicalSpecificationSheetData data) { |
|
|
|
|
|
|
|
|
// 2025-07-17 修改技术参数卡的状态为已完成后,重新获取bom和工艺路线 |
|
|
// 2025-07-17 修改技术参数卡的状态为已完成后,重新获取bom和工艺路线 |
|
|
List<BomComponentVo> bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo()); |
|
|
|
|
|
|
|
|
List<BomComponentVo> bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo(), "archiving"); |
|
|
if (!bomList.isEmpty()) { |
|
|
if (!bomList.isEmpty()) { |
|
|
// 插入到plm_bm_bom表中 先删除再新增 |
|
|
// 插入到plm_bm_bom表中 先删除再新增 |
|
|
technicalSpecificationMapper.deleteBmBom(data.getSite(), data.getCodeNo()); |
|
|
technicalSpecificationMapper.deleteBmBom(data.getSite(), data.getCodeNo()); |
|
|
|