#

luxiaotao1123

2022-01-05 9338cdee4bae84f74825fbd86786e35ddfbd2d64

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

File was renamed from src/main/java/com/zy/core/thread/CrnThread.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.core.CrnThread;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -33,14 +34,14 @@
 */
@Data
@Slf4j
public class CrnThread implements Runnable, ThreadHandler {
public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {

    private MelsecMcNet melsecMcNet;
    private CrnSlave slave;
    private CrnProtocol crnProtocol;
    private boolean resetFlag = false;

    public CrnThread(CrnSlave slave) {
    public MelsecCrnThread(CrnSlave slave) {
        this.slave = slave;
    }

@@ -187,9 +188,6 @@
        }
        command.setCrnNo(slave.getId());
        short[] array = new short[10];

        OperateResult result;
        if (command.getAckFinish() == 0) {
            array[0] = command.getAckFinish();
            array[1] = command.getTaskNo();
            array[2] = command.getTaskMode();
@@ -200,19 +198,12 @@
            array[7] = command.getDestinationPosY();
            array[8] = command.getDestinationPosZ();
            array[9] = command.getCommand();
            result = melsecMcNet.Write("D0", array);
        OperateResult result = melsecMcNet.Write("D0", array);

            short[] array0 = new short[1];
            array0[0] = 1;
            result = melsecMcNet.Write("D9", array);

        } else {

        if (command.getAckFinish() == 0) {
            short commandFinish = 1;
            result = melsecMcNet.Write("D9", commandFinish);
        }





        try {
            // 日志记录
@@ -264,10 +255,10 @@
        slave.setPort(5015);
        slave.setRack(0);
        slave.setSlot(0);
        CrnThread crnThread = new CrnThread(slave);
        crnThread.connect();
        crnThread.readStatus();
        System.out.println(JSON.toJSONString(crnThread.crnProtocol));
        MelsecCrnThread melsecCrnThread = new MelsecCrnThread(slave);
        melsecCrnThread.connect();
        melsecCrnThread.readStatus();
        System.out.println(JSON.toJSONString(melsecCrnThread.crnProtocol));

        // 1.入库 源和目标都发
//        CrnCommand command = new CrnCommand();