|
@@ -9,6 +9,7 @@ import com.uas.search.constant.model.PageInfo;
|
|
|
import com.uas.search.constant.model.PageParams;
|
|
import com.uas.search.constant.model.PageParams;
|
|
|
import com.uas.search.constant.model.SPage;
|
|
import com.uas.search.constant.model.SPage;
|
|
|
import com.uas.search.dao.*;
|
|
import com.uas.search.dao.*;
|
|
|
|
|
+import com.uas.search.exception.DataNotFoundException;
|
|
|
import com.uas.search.jms.JmsListener;
|
|
import com.uas.search.jms.JmsListener;
|
|
|
import com.uas.search.jms.QueueMessageParser;
|
|
import com.uas.search.jms.QueueMessageParser;
|
|
|
import com.uas.search.model.*;
|
|
import com.uas.search.model.*;
|
|
@@ -714,13 +715,18 @@ public class IndexServiceImpl implements IndexService {
|
|
|
delete(object);
|
|
delete(object);
|
|
|
Goods goodsObject = (Goods) object;
|
|
Goods goodsObject = (Goods) object;
|
|
|
if (goodsObject.getComponent() != null && goodsObject.getComponent().getId() != null) {
|
|
if (goodsObject.getComponent() != null && goodsObject.getComponent().getId() != null) {
|
|
|
- // 如果是器件,再重新写入
|
|
|
|
|
- List<Goods> goodsesList = goodsDao.find((Goods) object);
|
|
|
|
|
- for (Goods goods : goodsesList) {
|
|
|
|
|
- Object maintainedObject = save(goods);
|
|
|
|
|
- if (maintainedObject != null) {
|
|
|
|
|
- maintainedObjects.add(maintainedObject);
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ // 如果是器件,再重新写入
|
|
|
|
|
+ List<Goods> goodsesList = goodsDao.find((Goods) object);
|
|
|
|
|
+ for (Goods goods : goodsesList) {
|
|
|
|
|
+ Object maintainedObject = save(goods);
|
|
|
|
|
+ if (maintainedObject != null) {
|
|
|
|
|
+ maintainedObjects.add(maintainedObject);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+ } catch (DataNotFoundException e) {
|
|
|
|
|
+ // 删除操作时,器件可能已经不存在,此时是正常情况,不必抛异常
|
|
|
|
|
+ logger.warn("器件已删除,不必重新写入相关批次和器件" ,e);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|