no message

skyouc

8 天以前 1af222e201ad79526abca68c71207286ddf49188

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java

@@ -12,13 +12,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.BasStation;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -41,6 +39,9 @@

    @Autowired
    private WaitPakinItemService waitPakinItemService;

    @Autowired
    private BasStationService basStationService;

    @Autowired
    private TaskService taskService;
@@ -109,22 +110,21 @@
    @PostMapping("/waitPakin/remove/{ids}")
    @Transactional(rollbackFor = Exception.class)
    public R remove(@PathVariable Long[] ids) {
        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
                .in(WaitPakinItem::getPakinId, ids));
        if (!pakinItems.isEmpty()) {
            List<Long> list = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, list));
            if (!taskItems.isEmpty()) {
                return R.error("组拖档有明细任务");
        if (Arrays.asList(ids).isEmpty()) {
            return R.error("参数不能为空！！");
        }
        for (Long id : ids) {
            WaitPakin waitPakin = waitPakinService.getById(id);
            BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                            .eq(BasStation::getBarcode, waitPakin.getBarcode())
                    ,false
            );
            if (!Cools.isEmpty(isBarcodeSta)){
                throw new CoolException("该条码已被"+isBarcodeSta.getStationName()+"站绑定");
            }
        }
        if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        if (!waitPakinItemService.removeByIds(pakinItems)) {
            throw new CoolException("明细删除失败！！");
        }
        return R.ok("Delete Success").add(ids);

        return waitPakinService.removePakin(Arrays.asList(ids));
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:list')")