#

Junjie

2024-04-28 46054fc49e33fe4f1aba8da23b74b8f14664bdfe

#

 zy-asrs-flow/src/components/Flow/Drawer/GraphDrawerLift.jsx

@@ -38,14 +38,33 @@
        },
    ];

    const sourceLevChange = (e) => {
        setSourceLev(e.target.value);
        nodeData.data.liftType.sourceLev = e.target.value;
    const liftOptions2 = [
        {
            label: '无',
            value: 'none'
        },
        {
            label: '穿梭车层',
            value: 'shuttleLev'
        },
        {
            label: '工作档源库位层',
            value: 'originLev'
        },
        {
            label: '工作档目标库位层',
            value: 'targetLev'
        },
    ];

    const sourceLevChange = (event) => {
        setSourceLev(event);
        nodeData.data.liftType.sourceLev = event;
    }

    const targetLevChange = (e) => {
        setTargetLev(e.target.value);
        nodeData.data.liftType.targetLev = e.target.value;
    const targetLevChange = (event) => {
        setTargetLev(event);
        nodeData.data.liftType.targetLev = event;
    }

    const liftOptionsChange = (event) => {
@@ -137,10 +156,22 @@
                        <div>组件名：<Input defaultValue={nodeData.label} onChange={nodeDataInputChange} /></div>
                        <div>根节点：<Switch checkedChildren="是" unCheckedChildren="否" checked={nodeData.data.root} /></div>
                        <div>
                            源层：<Input defaultValue={sourceLev} onChange={sourceLevChange} />
                            源层：
                            <Select
                                style={{ width: 240 }}
                                options={liftOptions2}
                                value={sourceLev}
                                onChange={sourceLevChange}
                            />
                        </div>
                        <div>
                            目标层：<Input defaultValue={targetLev} onChange={targetLevChange} />
                            目标层：
                            <Select
                                style={{ width: 240 }}
                                options={liftOptions2}
                                value={targetLev}
                                onChange={targetLevChange}
                            />
                        </div>
                        <div>
                            操作方法：

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java

@@ -7,7 +7,10 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.asrs.entity.param.FlowLogicCodeParam;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.entity.Task;
import com.zy.asrs.wcs.core.kernel.KernelService;
import com.zy.asrs.wcs.core.service.TaskService;
import com.zy.asrs.wcs.core.utils.RedisUtil;
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
@@ -15,12 +18,14 @@
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.codec.digest.Md5Crypt;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -33,6 +38,8 @@
    private TaskService taskService;
    @Autowired
    private ShuttleDispatcher shuttleDispatcher;
    @Autowired
    private KernelService kernelService;

    //执行流程图
    public boolean execute(List<JSONObject> list) {
@@ -48,6 +55,7 @@
        for (Task task : tasks) {
            String redisKey = DigestUtils.md5Hex(JSON.toJSONString(list));

            redisSet(redisKey, "motionList", new ArrayList<Motion>());
            while (currentId != null) {
                //获取流程图
                JSONObject flow = findFLow(list, currentId);
@@ -160,15 +168,85 @@
    }

    private boolean executeLiftFlow(Task task, JSONObject data, String redisKey) {
        Object object = redisGet(redisKey, "motionList");
        List<Motion> motionList = JSON.parseArray(JSON.toJSONString(object), Motion.class);

        Object liftDeviceObj = redisGet(redisKey, "liftDevice");
        if (liftDeviceObj == null) {
            throw new CoolException("提升机缓存为空");
        }

        Device device = JSON.parseObject(String.valueOf(liftDeviceObj), Device.class);
        if (device == null) {
            throw new CoolException("提升机设备不存在");
        }

        LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
        if (liftThread == null) {
            throw new CoolException("提升机不存在");
        }

        LiftProtocol liftProtocol = liftThread.getStatus();
        if (liftProtocol == null) {
            throw new CoolException("提升机不存在");
        }

        JSONObject liftType = data.getJSONObject("liftType");
        String oper = liftType.getString("liftOper");
        if (oper.equals("move")) {
        String opera = liftType.getString("liftOper");
        if (opera.equals("move")) {
            //提升机升降
            String sourceLevStr = liftType.getString("sourceLev");
            String targetLevStr = liftType.getString("targetLev");
            Integer sourceLev = getLiftOperaLev(sourceLevStr, task, redisKey);
            Integer targetLev = getLiftOperaLev(targetLevStr, task, redisKey);

            motionList.addAll(kernelService.liftMove(
                    MotionDto.build((dto -> {
                        dto.setLiftNo(device.getId().intValue());
                        dto.setLev(sourceLev);
                    }))
                    , MotionDto.build((dto -> {
                        dto.setLiftNo(device.getId().intValue());
                        dto.setLev(targetLev);
                    }))
            ));
        }

        return true;
    }

    private Integer getLiftOperaLev(String opera, Task task, String redisKey) {
        if (opera.equals("sourceLev")) {
            return Utils.getLev(task.getOriginLoc());
        } else if (opera.equals("targetLev")) {
            return Utils.getLev(task.getDestLoc());
        } else if (opera.equals("shuttleLev")) {
            //取出缓存小车
            Object shuttleDeviceObj = redisGet(redisKey, "shuttleDevice");
            if (shuttleDeviceObj == null) {
                throw new CoolException("穿梭车缓存为空");
            }
            Device device = JSON.parseObject(String.valueOf(shuttleDeviceObj), Device.class);
            if (device == null) {
                throw new CoolException("穿梭车设备不存在");
            }

            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
            if (shuttleThread == null) {
                throw new CoolException("穿梭车不存在");
            }

            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
            if (shuttleProtocol == null) {
                throw new CoolException("穿梭车不存在");
            }

            return Utils.getLev(shuttleProtocol.getCurrentLocNo());
        }

        throw new CoolException("类型异常");
    }

    private boolean redisSet(String redisKey, String key, Object data) {
        if (redisUtil.hasKey(redisKey)) {
            Object obj = redisUtil.get(redisKey);