#

lsh

2024-01-17 298adfe254be9a5976a28dfd63f915842886d588

#

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -257,6 +257,7 @@
     * 查找是否存在拆垛单次完成的工作档
     */
    WrkMast selectWrkMastUnstackingOne202(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectWrkMastUnstackingOne202Two(@Param("sourceStaNo")Integer sourceStaNo);

    WrkMast selectWrkMastLabelingOne54();


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

@@ -492,17 +492,17 @@
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep4(staProtocol.getSiteId(),"3");

                    if (wrkMast == null) {
                        WrkMast wrkMast1 = wrkMastMapper.selectPakInStep5(staProtocol.getSiteId(),"3");
                        if (Cools.isEmpty(wrkMast1) && staProtocol.isEmptyMk()){
                            WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(staProtocol.getSiteId() + 9999L);
                            if (Cools.isEmpty(wrkMastSta)){
                                WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staProtocol.getSiteId());
                                wrkMastSta1.setType(2);
                                wrkMastSta1.setWrkType(1);
                                wrkMastStaMapper.insert(wrkMastSta1);
                            }
                            continue;
                        }
//                        WrkMast wrkMast1 = wrkMastMapper.selectPakInStep5(staProtocol.getSiteId(),"3");
//                        if (Cools.isEmpty(wrkMast1) && staProtocol.isEmptyMk()){
//                            WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(staProtocol.getSiteId() + 9999L);
//                            if (Cools.isEmpty(wrkMastSta)){
//                                WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staProtocol.getSiteId());
//                                wrkMastSta1.setType(2);
//                                wrkMastSta1.setWrkType(1);
//                                wrkMastStaMapper.insert(wrkMastSta1);
//                            }
//                            continue;
//                        }
//                        log.error("站点号"+staProtocol.getSiteId()+"未查询到工作档案！");
                        // 无拣料数据
                        continue;
@@ -580,6 +580,46 @@

            }

        }
    }

    /**
     * 拣料、并板、盘点再入库  拆垛位置
     */
    public synchronized void storeEmptyPlt4() {
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历叠盘入库口
            for (DevpSlave.Sta pickSta : devp.getEmptyInSta2()) {

                // 获取入库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }
                BasDevp basDevp = basDevpService.selectById(staProtocol.getSiteId());
                if (Cools.isEmpty(basDevp) || basDevp.getReportSign()!=1){
                    continue;
                }

                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()==0 && !staProtocol.isOutEnable() && staProtocol.isInEnable()) {
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep4(staProtocol.getSiteId(),"3");
                    if (wrkMast == null) {
                        WrkMast wrkMast1 = wrkMastMapper.selectPakInStep5(staProtocol.getSiteId(),"3");
                        if (Cools.isEmpty(wrkMast1) && staProtocol.isEmptyMk()){
                            WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(staProtocol.getSiteId() + 19999L);
                            if (Cools.isEmpty(wrkMastSta)){
                                WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staProtocol.getSiteId());
                                wrkMastSta1.setType(2);
                                wrkMastSta1.setWrkType(1);
                                wrkMastStaMapper.insert(wrkMastSta1);
                            }
                        }
                    }
                }
            }
        }
    }

@@ -3992,7 +4032,10 @@
            int[] staNos=new int[]{131,135};//(2个入库站点，1楼2个出库码垛站,根据现场修改)
            for (int staNo : staNos){
                BasDevp basDevp = basDevpService.selectById(staNo);
                if (basDevp.getWrkNo()!=0){
                if (Cools.isEmpty(basDevp) || basDevp.getReportSign()!=1){
                    continue;
                }
                if (basDevp.getWrkNo()!=0 && (basDevp.getWrkNo()<9900 || basDevp.getWrkNo()>9999)){
                    continue;
                }
                WrkMast wrkMast = wrkMastMapper.selectWrkMastUnstackingOne202(staNo);
@@ -4116,7 +4159,7 @@
            int[] staNos=new int[]{144};//(1楼1个贴标位,根据现场修改)
            for (int staNo : staNos){
                BasDevp basDevp = basDevpService.selectById(staNo);
                if ((basDevp.getWrkNo()<9900 || basDevp.getWrkNo()>19999) && basDevp.getWrkNo()!=32222){
                if ((basDevp.getWrkNo()<9900 || basDevp.getWrkNo()>9999) && basDevp.getWrkNo()!=32222){
                    continue;
                }
                WrkMast wrkMast = wrkMastMapper.selectWrkMastUnstackingOne202(staNo);
@@ -4170,6 +4213,84 @@
    }

    /**
     * 其他  ===>> 拆垛完成继续下一步  运行途中自动避让空板
     */
    public synchronized void stackingCompletionDriveTray4() {
        try {
            int[] staNos=new int[]{134};//(134有任务，135空闲，则避让)
            for (int staNo : staNos){
                BasDevp basDevp = basDevpService.selectById(staNo);
                BasDevp basDevp135 = basDevpService.selectById(135);
                if (basDevp.getWrkNo()==0 || (basDevp.getWrkNo()<10000 && basDevp.getWrkNo()>9899) ){
                    continue;
                }
                if (basDevp135.getReportSign()!=0){
                    continue;
                }
                WrkMast wrkMast131 = wrkMastMapper.selectWrkMastUnstackingOne202Two(131);
                if (Cools.isEmpty(wrkMast131)){
                    continue;
                }
                // 获取站点信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
                StaProtocol staProtocol135 = devpThread.getStation().get(135);
                if (staProtocol135 == null) {
                    continue;
                } else {
                    staProtocol135 = staProtocol135.clone();
                }
                if (staProtocol135.getWorkNo()<9900 || staProtocol135.getWorkNo()>9999 || staProtocol135.getWorkNo()==0
                        || !staProtocol135.isLoading() || !staProtocol135.isAutoing()){
                    continue;
                }
                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }

                if (!staProtocol.isLoading()){
                    continue;
                }
//                if (!staProtocol.getWorkNo().equals(wrkMast131.getWrkNo())){
//                    log.info("站点工作号={} 与贴标工作号={} 不一致，异常！",staProtocol.getWorkNo(),wrkMast131.getWrkNo().shortValue());
//                }
                // 判断是否满足入库条件
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && basDevp.getReportSign()==0
                ) {//&& staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
                    if (true){
                        return;
                    }

                    //任务完成
                    boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol135));
                    try{
                        Thread.sleep(100);
                    }catch (Exception e){ }
                    basDevp135.setReportSign(2);
                    basDevpService.updateById(basDevp135);
                    staProtocol135.setWorkNo(32222);
                    staProtocol135.setStaNo(144);
                    devpThread.setPakMk(staProtocol135.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol135));
                    if (!result) {
                        throw new CoolException("更新plc站点信息失败==>驱动码垛位托盘前进失败！");
                    }
                    boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol135));

                }
            }
        }catch (Exception e){
//            e.printStackTrace();
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            log.error("其他  ===>> 贴标完成驱动托盘进入下一步"+e);
        }
    }

    /**
     *  完成小车任务
     */
    public synchronized void rgvCompleteWrkMastSta() {

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

@@ -107,6 +107,8 @@
                    mainService.storeEmptyPlt2();
                    // 入库  ===>> 空栈板初始化入库,1楼叠盘机空板入库
                    mainService.storeEmptyPlt3();
                    // 拣料、并板、盘点再入库拆盘区   1楼拆垛位置  空板叠盘
                    mainService.storeEmptyPlt4();
                    // 出库  ===>> 工作档信息写入led显示器
                    mainService.ledExecute();
                    // 其他  ===>> LED显示器复位，显示默认信息
@@ -136,6 +138,8 @@
                    mainService.stackingCompletionDriveTray();
                    //拆垛完成继续下一步
                    mainService.stackingCompletionDriveTray2();
                    //拆垛完成继续下一步  运行途中自动避让空板
                    mainService.stackingCompletionDriveTray4();
                    //拆垛完成托盘继续下一步
                    mainService.stackingCompletionDriveTrayOk2();
                    //贴标完成继续下一步

 src/main/java/com/zy/core/model/DevpSlave.java

@@ -24,6 +24,7 @@
    private List<Sta> inWmsSta = new ArrayList<>();

    private List<Sta> emptyInSta = new ArrayList<>();
    private List<Sta> emptyInSta2 = new ArrayList<>();

    private List<Sta> outSta = new ArrayList<>();


 src/main/resources/application.yml

@@ -348,6 +348,18 @@
    # 空板入库口1
    emptyInSta[0]:
      staNo: 122
    # 拆垛叠盘口1
    emptyInSta2[0]:
      staNo: 118
    # 拆垛叠盘口2
    emptyInSta2[1]:
      staNo: 119
    # 拆垛叠盘口3
    emptyInSta2[2]:
      staNo: 120
    # 拆垛叠盘口4
    emptyInSta2[3]:
      staNo: 121
    # 出库口1
    outSta[0]:
      staNo: 122

 src/main/resources/mapper/WrkMastMapper.xml

@@ -347,6 +347,10 @@
        SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =51 and source_sta_no = #{sourceStaNo}
    </select>

    <select id="selectWrkMastUnstackingOne202Two" resultMap="BaseResultMap">
        SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =52 and source_sta_no = #{sourceStaNo}
    </select>

    <select id="selectWrkMastLabelingOne54" resultMap="BaseResultMap">
        SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =54
    </select>