rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -142,7 +142,7 @@
                    log.error(e.getMessage());
                }
            }
            if (order.getType().equals(OrderType.ORDER_OUT.type) &&  order.getReportOnce() >= 4) {
//            if (order.getType().equals(OrderType.ORDER_OUT.type) &&  order.getReportOnce() >= 4) {
                AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
                if (Objects.isNull(one)) {
                    AsnOrderLog orderLog = new AsnOrderLog();
@@ -233,7 +233,7 @@
//                if (!this.asnOrderService.removeById(order.getId())) {
//                    throw new CoolException("原单据删除失败！！");
//                }
            }
//            }
        }
    }
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java

@@ -13,8 +13,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@Component
@@ -67,24 +66,40 @@
                throw new CoolException("组拖明细为空！！");
            }
            List<String> pkinItems = pakinItems.stream().map(WaitPakinItem::getAsnCode).collect(Collectors.toList());

            pkinItems.forEach(item -> {
                List<WkOrderItem> wkOrders = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, item));
                if (wkOrders.isEmpty()) {
                    throw new CoolException("数据错误，原单据不存在或已丢失！！");
                }
                Double sum = wkOrders.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnCode, item));
                if (waitPakinItems.isEmpty()) {
                    throw new CoolException("数据错误，组托明细不存在！！");
                }
                Double sum1 = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
                if (sum.compareTo(sum1) == 0) {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                            .eq(WkOrder::getCode, item)
                            .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
                        throw new CoolException("单据修改失败！！");
                Set<Long> orderIds = wkOrders.stream().map(WkOrderItem::getOrderId).collect(Collectors.toSet());
                orderIds.forEach(itemId -> {
                    WkOrder wkOrder = asnOrderService.getById(itemId);
                    if (Objects.isNull(wkOrder)) {
                        throw new CoolException("数据错误，原单据不存在或已丢失！！");
                    }
                }
                    if (wkOrder.getAnfme().compareTo(wkOrder.getQty()) == 0) {
                        if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                                .eq(WkOrder::getId, itemId)
                                .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
                            throw new CoolException("单据修改失败！！");
                        }
                    }
                });

//                Double sum = wkOrders.stream().mapToDouble(WkOrderItem::getAnfme).sum();
//                List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnCode, item));
//                if (waitPakinItems.isEmpty()) {
//                    throw new CoolException("数据错误，组托明细不存在！！");
//                }
//                Double sum1 = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
//                if (sum.compareTo(sum1) == 0) {
//                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
//                            .eq(WkOrder::getCode, item)
//                            .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
//                        throw new CoolException("单据修改失败！！");
//                    }
//                }
            });

            List<WaitPakinItemLog> itemLogs = new ArrayList<>();

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -19,6 +19,7 @@
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -453,25 +454,21 @@
     * @throws Exception
     */
    @Override
    public void complateInTask(List<Task> tasks) throws Exception {
    public void complateInTask(List<Task> tasks) {
        AtomicBoolean success = new AtomicBoolean(false);
        if (success.compareAndSet(false, true)) {
            Long loginUserId = SystemAuthUtils.getLoginUserId();
            for (Task task : tasks) {
                try {
                    if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                        //1.入库
                        complateInstock(task, loginUserId);
                    } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
                        //53.拣料再入库
                        //57.盘点再入库
                        pickComplateInStock(task, loginUserId);
                    } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                        //移库
                        moveInStock(task, loginUserId);
                    }
                } catch (Exception ex) {
                    log.error(ex.getMessage(), ex);
                if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                    //1.入库
                    complateInstock(task, loginUserId);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
                    //53.拣料再入库
                    //57.盘点再入库
                    pickComplateInStock(task, loginUserId);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                    //移库
                    moveInStock(task, loginUserId);
                }
            }
        }
@@ -1584,12 +1581,9 @@
        if (taskItems.isEmpty()) {
            throw new CoolException("任务明细不存在！！");
        }
        try {
            //更新库位明细
            saveLocItem(taskItems, task.getId(), loginUserId);
        } catch (Exception e) {
            throw new CoolException("库位明细更新失败！！");
        }

        //更新库位明细
        saveLocItem(taskItems, task.getId(), loginUserId);

        /**对任务明细按组拖明细进行分组*/
        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
@@ -1599,16 +1593,26 @@
                throw new CoolException("数据错误：组拖数据不存在，请联系管理员！！");
            }
            List<TaskItem> items = orderMap.get(key);
            try {
                //保存库存明细
                saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType(), loginUserId);
                //移出收货区库存， 修改组托状态
                removeReceiptStock(pakinItem, loginUserId);
            } catch (Exception e) {
                logger.error("<UNK>", e);
                throw new CoolException(e.getMessage());
            }
            //保存入出库明细
            saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType(), loginUserId);
            //移出收货区库存， 修改组托状态
            removeReceiptStock(pakinItem, loginUserId);
        });

        Set<Long> pkinItemIds = taskItems.stream().map(TaskItem::getSource).collect(Collectors.toSet());
        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getId, pkinItemIds));
        if (pakinItems.isEmpty()) {
            throw new CoolException("组托明细不存在！！");
        }
        Set<Long> pakinIds = pakinItems.stream().map(WaitPakinItem::getPakinId).collect(Collectors.toSet());

        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
                .set(WaitPakin::getUpdateBy, loginUserId)
                .in(WaitPakin::getId, pakinIds))) {
            throw new CoolException("组拖状态修改失败！！");
        }

        /**修改库位状态为F.在库*/
        if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) {
            throw new CoolException("库位状态修改失败！！");
@@ -1636,13 +1640,6 @@
        Double workQty = Math.round((itemServiceOne.getWorkQty() - pakinItem.getAnfme()) * 1000000) / 1000000.0;
        Double qty = Math.round((itemServiceOne.getQty() + pakinItem.getAnfme()) * 1000000) / 1000000.0;
        itemServiceOne.setWorkQty(workQty).setQty(qty);

        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
                .set(WaitPakin::getUpdateBy, loginUserId)
                .eq(WaitPakin::getId, pakinItem.getPakinId()))) {
            throw new CoolException("组拖状态修改失败！！");
        }

        if (qty.compareTo(itemServiceOne.getAnfme()) == 0.00) {
            if (!warehouseAreasItemService.removeById(itemServiceOne.getId())) {
@@ -1695,7 +1692,8 @@
                    throw new CoolException("库位明细更新失败！！");
                }
            } else {
                throw new CoolException("当前票号已在库内，请检查后再操作！！");
                logger.error("当前票号:"  + locItem.getFieldsIndex()  + " 已在库内，请检查后再操作！！");
//                throw new CoolException("当前票号已在库内，请检查后再操作！！");
//                locItem.setAnfme(Math.round((locItem.getAnfme() + taskItem.getAnfme()) * 1000000) / 1000000.0)
//                        .setUpdateTime(new Date());
//                if (!locItemService.saveOrUpdate(locItem)) {