|
@@ -17,6 +17,7 @@ import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureRobotArm
|
|
|
import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureVersionMapper;
|
|
|
import com.github.zuihou.business.productionReadyCenter.dto.BomProcedureVersionSaveDTO;
|
|
|
import com.github.zuihou.business.productionReadyCenter.dto.BomProcedureVersionUpdateDTO;
|
|
|
+import com.github.zuihou.business.productionReadyCenter.dto.BomVersionInfoUpdateDTO;
|
|
|
import com.github.zuihou.business.productionReadyCenter.entity.*;
|
|
|
import com.github.zuihou.business.productionReadyCenter.service.*;
|
|
|
import com.github.zuihou.base.service.SuperServiceImpl;
|
|
@@ -108,6 +109,9 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
|
|
|
@Autowired
|
|
|
private BomProcedureMapper bomProcedureMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private BomVersionInfoService bomVersionInfoService;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> pageList(Map<String, Object> map) {
|
|
@@ -763,8 +767,17 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
|
|
|
}
|
|
|
//更新版本数据
|
|
|
updateById(bean);
|
|
|
- //同步正式数据
|
|
|
- synVersionInfo(bean);
|
|
|
+ //如果这个版本已经设为使用,需要需要重新调一次,把最新的数据更新过去
|
|
|
+ BomVersionInfo versionInfo = bomVersionInfoService.getById(bean.getVersionId());
|
|
|
+ if(versionInfo!=null&&"2".equals(versionInfo.getUseStatus())){
|
|
|
+ BomVersionInfoUpdateDTO dto = new BomVersionInfoUpdateDTO();
|
|
|
+ dto.setId(bean.getVersionId());
|
|
|
+ dto.setBomId(bean.getBomId());
|
|
|
+ bomVersionInfoService.updateUseStatus(dto);
|
|
|
+ }
|
|
|
+
|
|
|
+// //同步正式数据
|
|
|
+// synVersionInfo(bean);
|
|
|
|
|
|
return bean;
|
|
|
}
|