#

zjj

2 天以前 75f1980c5e915635cfbf403485c1778e5a583c98

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java

@@ -9,9 +9,11 @@
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskResouceType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.service.*;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +24,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

@Service
public class PdaOutStockServiceImpl implements PdaOutStockService {
@@ -36,6 +39,8 @@
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private WaveOrderRelaService waveOrderRelaService;

    @Override
    public R getOutStockTaskItem(String barcode) {
@@ -52,6 +57,33 @@


        return R.ok(taskItems);
    }

    @Override
    public R saveOutTaskSts(String barcode) {
        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Task::getBarcode, barcode);
        Task task = taskService.getOne(lambdaQueryWrapper);
        if (null == task){
            throw new CoolException("未找到容器号对应任务");
        }
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)){
            return R.error("任务状态不是等待确认");
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
        maps.keySet().forEach(key -> {
                AsnOrderItem orderItem = asnOrderItemService.getById(key);
                if (Objects.isNull(orderItem)) {
                    throw new CoolException("单据明细不存在！！");
                }
        });
        task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
        if (!taskService.updateById(task)){
            return R.error("更新任务状态失败");
        }

        return R.ok("确认成功");
    }

    @Override
@@ -73,8 +105,8 @@
        if (null == task){
            throw new CoolException("未找到容器号对应任务");
        }
        if (task.getTaskStatus().equals(TaskStsType.COMPLETE_OUT.id)){
            throw new CoolException("当前状态为不可拣货状态");
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)){
            return R.error("任务状态不是等待确认");
        }
        ArrayList<ContainerWaveDto> containerWaveDtos = new ArrayList<>();
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
@@ -85,8 +117,13 @@
            if (null == wave){
                throw new CoolException("未找到容器号对应波次");
            }
            List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>().eq(WaveOrderRela::getWaveId, wave.getId()));
            if (Cools.isEmpty(waveOrderRelas)){
                throw new CoolException("波次对应关联单未找到");
            }
            List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
            ArrayList<AsnOrderItem> list = new ArrayList<>();
            List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));
            List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
            for (AsnOrder asnOrder : asnOrderList) {
                AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
                        .eq(AsnOrderItem::getAsnId, asnOrder.getId())
@@ -108,6 +145,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @Synchronized
    public R saveWavePick(ContainerWaveParam containerWaveParam, Long loginUserId) {
        if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0){
            return R.error("参数错误");
@@ -115,6 +153,9 @@
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode,containerWaveParam.getContainer()));
        if (null == task){
            return R.error("未找到托盘对应的任务");
        }
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)){
            return R.error("任务状态不是等待确认");
        }

        for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
@@ -125,7 +166,8 @@
            if (!anfme.equals(total)){
                throw new CoolException("播种数量不等于容器出库数量，请检查");
            }
            for (AsnOrderItem orderItem : containerWaveDto.getAsnOrderItems()) {
            for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
                AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
                if (Double.compare(orderItem.getDemandQty(), 0.0) == 0) {
                    continue;
                }
@@ -145,6 +187,7 @@
                    if (Cools.isEmpty(asnOrder)){
                        throw new CoolException("出库单主单未找到");
                    }
                    asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
                    asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                    if (!asnOrderService.updateById(asnOrder)){
                        throw new CoolException("出库单更新状态失败");
@@ -152,17 +195,17 @@
                }
            }
            //检查波次是否完成
            Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
            if (waveChecked){
                Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
                if (null == wave){
                    throw new CoolException("未找到容器号对应波次");
                }
                wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_DONE.val);
                if (!waveService.updateById(wave)){
                    throw new CoolException("波次单更新状态失败");
                }
            }
//            Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
//            if (waveChecked){
//                Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
//                if (null == wave){
//                    throw new CoolException("未找到容器号对应波次");
//                }
//                wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
//                if (!waveService.updateById(wave)){
//                    throw new CoolException("波次单更新状态失败");
//                }
//            }

        }

@@ -175,6 +218,8 @@
        return R.ok();
    }



    private Boolean checkWaveComplete(TaskItem taskItem) {
        Wave wave = waveService.getById(taskItem.getSourceId());
        List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));