Commit e7e5cf1d971f4aba04261063174e272ed63734c9
1 parent
dac6d685
fix(修复出库生成任务报警): shipmentContainerHeaderId 入参去重
Showing
2 changed files
with
4 additions
and
3 deletions
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
... | ... | @@ -633,7 +633,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont |
633 | 633 | |
634 | 634 | /* 生成任务 */ |
635 | 635 | @Override |
636 | - @Transactional | |
636 | + @Transactional(rollbackFor = Exception.class) | |
637 | 637 | public AjaxResult createTask(List<Integer> idList) { |
638 | 638 | ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel(); |
639 | 639 | for (Integer id : idList) { |
... | ... |
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
... | ... | @@ -293,7 +293,8 @@ public class ShippingCombinationController extends BaseController { |
293 | 293 | return AjaxResult.error("id不能为空"); |
294 | 294 | } |
295 | 295 | List<Integer> idList = Arrays.asList(Convert.toIntArray(ids)); |
296 | - for (Integer id : idList) { | |
296 | + List<Integer> idsList = idList.stream().distinct().collect(Collectors.toList()); | |
297 | + for (Integer id : idsList) { | |
297 | 298 | //获取表头 |
298 | 299 | ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(id); |
299 | 300 | if(shipmentContainerHeader == null) { |
... | ... | @@ -303,7 +304,7 @@ public class ShippingCombinationController extends BaseController { |
303 | 304 | return AjaxResult.error("出库货箱编码(" + shipmentContainerHeader.getContainerCode() + ")已经生成任务,请不要重复生成,操作中止"); |
304 | 305 | } |
305 | 306 | } |
306 | - ajaxResult = shipmentContainerHeaderService.createTask(idList); | |
307 | + ajaxResult = shipmentContainerHeaderService.createTask(idsList); | |
307 | 308 | return ajaxResult; |
308 | 309 | } |
309 | 310 | } |
... | ... |