|
@@ -1044,7 +1044,7 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 导入Excel发布产品
|
|
* 导入Excel发布产品
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @author hejq
|
|
* @author hejq
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
@@ -2046,7 +2046,10 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
}
|
|
}
|
|
|
goodsInfos.add(new GoodsInfo(goods));
|
|
goodsInfos.add(new GoodsInfo(goods));
|
|
|
goods.setStatus(Status.REMOVED.value());
|
|
goods.setStatus(Status.REMOVED.value());
|
|
|
- goodsDao.deleteByBatchCode(batchCode);
|
|
|
|
|
|
|
+ Goods goodses = goodsDao.findByBatchCode(batchCode);
|
|
|
|
|
+ if (goodses != null) {
|
|
|
|
|
+ goodsDao.delete(goodses);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
|
|
GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
|
|
|
GoodsHistory.OperateType.Down.getPhrase(), false);
|
|
GoodsHistory.OperateType.Down.getPhrase(), false);
|