#

luxiaotao1123

2020-08-10 37dbd9b1e1d47c46a0ad590155d941ddffbd825a

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -4,12 +4,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WrkDetlService;
@@ -58,6 +56,8 @@
    private LocMastService locMastService;
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private JdbcTemplate jdbcTemplate;

@@ -270,18 +270,51 @@
                        }
                    }

                    // 更新堆垛机信息 且 下发plc命令 todo:luxiaotao
                    // 命令下发区 --------------------------------------------------------------------------

                    // 1.复位堆垛机 更新堆垛机信息 且 下发plc命令 todo:luxiaotao
                    crnProtocol.setStatus(CrnStatusType.IDLE);
                    crnProtocol.setTaskNo((short)0);
                    boolean result = MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task<>(4, crnProtocol));
                    if (!result) {
                    if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task<>(4, crnProtocol))) {
                        throw new CoolException("更新堆垛机信息失败");
                    }

                    // 2.下发站点信息
                    staProtocol.setWorkNo(wrkMast.getWrkNo());
                    staProtocol.setStaNo(wrkMast.getStaNo());
                    if (!MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task<>(4, staProtocol))) {
                        throw new CoolException("更新plc站点信息失败");
                    }
                }
            }
        }
    }


    /**
     * 入库  ===>>  堆垛机站到库位
     */
    public void crnStnToLoc(){
        for (Slave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
            if (basCrnp == null) {
                continue;
            }
            // 只有当堆垛机空闲 或者 无任务时才继续执行
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE || crnProtocol.getTaskNo() == 0) {

            }




        }
    }



    /**
     * 执行对工作档的入库完成
@@ -295,4 +328,23 @@
        }
    }

    /**
     * 更新堆垛机移动时工作档状态
     */
    public void updateCrnMove() {
        for (Slave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            // todo
            if (crnProtocol.getStatusType() == CrnStatusType.FETCH_POSITION) {

                WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());


            }


        }
    }
}

 src/main/java/com/zy/core/MainProcess.java

@@ -34,16 +34,30 @@
                    if (SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;
                    }
                    // 入库站，根据条码扫描生成入库工作档，工作状态2，无设备命令下发
                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile();
                    // 拣料、并板、盘点再入库
                    mainService.stnToCrnStnPick();
                    // 堆垛机出库站到出库站
                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn();


                    // 入库  ===>>  堆垛机站到库位
                    mainService.crnStnToLoc();










                    // 执行对工作档的入库完成
                    mainService.storeFinished();

                    // 更新堆垛机移动时工作档状态
                    mainService.updateCrnMove();




 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -37,7 +37,7 @@
    /**
     * 任务号
     */
    public short taskNo;
    public short taskNo = 0;

    /**
     * 堆垛机当前状态

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

@@ -47,6 +47,7 @@
                        break;
                    case 3:
                        break;
                    // 复位
                    case 4:
                        break;
                    default: