lsh#

1

23 小时以前 8cdeb3f101eb31b53e1dc4cc84c14ed9ad03f44f

lsh#

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/CallBackEvent.java

@@ -10,6 +10,7 @@
    /**任务回调事件*/
    CALL_BACK_EVENT_START("START", "取箱完成"),
    CALL_BACK_EVENT_OBIT("OTBIN", "搬运中"),
    CALL_BACK_EVENT_BIN("BIN", "出站"),
    CALL_BACK_EVENT_END("END", "放箱完成"),
    CALL_BACK_EVENT_TRANSFER("TRANSFER", "中转"),
    ;

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

@@ -475,17 +475,49 @@
        }

        /**料箱搬运中， 修改站点状态*/
//        if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_OBIT.event)) {
//            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//
//            }
//            /**取箱完成， 修改任务状态*/
//        } else
        if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_BIN.event)) {
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                /**修改出库站点状态*/
                BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                        .eq(BasStation::getStationName, task.getTargSite()));
                if (Objects.isNull(station)) {
                    throw new CoolException("数据错误，站点不存在！！");
                }
                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
                    station.setBarcode(null);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态修改失败！！");
                    }
                }
            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) {


                /**修改出库站点状态*/
                BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                        .eq(BasStation::getStationName, task.getOrgLoc()));
                if (Objects.isNull(station)) {
                    throw new CoolException("数据错误，站点不存在！！");
                }
                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
                    station.setBarcode(null);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态修改失败！！");
                    }
                }
            }
            /**取箱完成， 修改任务状态*/
        } else
        if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_END.event)) {
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)

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

@@ -250,10 +250,6 @@
        BeanUtils.copyProperties(matnr, wkOrderItem);
        wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());

        wkOrderItem.setBaseUnit(matnr.getUnit());
        wkOrderItem.setPurUnit(matnr.getUnit());
        wkOrderItem.setStockUnit(matnr.getUnit());
        wkOrderItem.setPriceUnitId(matnr.getUnit());
        WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
        if (Objects.isNull(wkOrder)) {
            throw new CoolException("数据错误，单据不存在！！");
@@ -284,6 +280,10 @@
            }
        }
        wkOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
        wkOrderItem.setBaseUnit(matnr.getUnit());
        wkOrderItem.setPurUnit(matnr.getUnit());
        wkOrderItem.setStockUnit(matnr.getUnit());
        wkOrderItem.setPriceUnitId(matnr.getUnit());
        if (!this.saveOrUpdate(wkOrderItem)) {
            throw new CoolException("收货通知单明细保存失败！！");
        }