入庫功能優化

zc

1 天以前 ed349eab83e3bd2aa08dd23b06535c43a989a23a

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

@@ -7,6 +7,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.cfg.CoercionAction;
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.DateUtils;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -24,6 +25,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.manager.service.impl.WaveOrderRelaServiceImpl;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Config;
@@ -95,6 +97,8 @@
    private BasStationService basStationService;
    @Autowired
    private ReportMsgService reportMsgService;
    @Autowired
    private WaveOrderRelaService waveOrderRelaService;

    /**
     * @param
@@ -574,7 +578,6 @@
                throw new CoolException("任务历史档保存失败！！");
            }
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
            //入库单据明细上报

            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                for (TaskItem taskItem : taskItems) {
@@ -596,6 +599,7 @@
                    reportMsgService.reportOrderItem(wkOrderItem);
                }
            } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {

                //出库单上报RCS修改库位状态
                try {
                    reportStationStatus(task);
@@ -604,6 +608,32 @@
                }
            }

            /**判断单据是否完成**/
            Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
            List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
                    .in(WaveOrderRela::getWaveId, longSet));
            if (Cools.isEmpty(waveOrderRelas)) {
                throw new CoolException("波次对应关联单未找到");
            }
            Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
            List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
            if (wkOrders.isEmpty()) {
                throw new CoolException("单据不存在！！");
            }
            wkOrders.forEach(order -> {
                //检查单据是否完成
                if (order.getAnfme().compareTo(order.getQty()) == 0) {
                    if (order.getType().equals(OrderType.ORDER_IN)) {
                        order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
                    } else {
                        order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                    }
                    if (!asnOrderService.updateById(order)) {
                        throw new CoolException("出库单更新状态失败");
                    }
                }
            });

            List<TaskItemLog> itemLogs = new ArrayList<>();
            for (TaskItem item : taskItems) {
                TaskItemLog itemLog = new TaskItemLog();