#

yxFwq

2024-07-12 bb25300d92dd425f9608f444d6de5e1580cca217

#

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

@@ -59,6 +59,7 @@
    // 出库第二步，从堆垛机出库站到目标出库站，堆垛机出库站有物时执行
//    @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
    WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectPakOutStep2345(@Param("sourceStaNo")Integer sourceStaNo,@Param("workNo")Integer workNo);

    WrkMast selectPakOutStep3(@Param("sourceStaNo")Integer sourceStaNo);


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

@@ -1073,7 +1073,7 @@
                    case 3:
                    case 4:
                    case 5:
                        crnStnToOutStnTwo(crnStn,1);
                        crnStnToOutStnTwo(crnSlave.getId(),crnStn,1);
                        continue;
                    case 6:
                    case 7:
@@ -1206,7 +1206,7 @@
        return false;
    }

    public synchronized boolean crnStnToOutStnTwo(CrnSlave.CrnStn crnStn ,Integer conStation) {
    public synchronized boolean crnStnToOutStnTwo(Integer crnNo,CrnSlave.CrnStn crnStn ,Integer conStation) {
        try{
            Date now = new Date();
            // 获取堆垛机出库站信息
@@ -1218,19 +1218,21 @@
                staProtocol = staProtocol.clone();
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
                // 查询工作档
                WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
                if (wrkMast == null) {
                    return false;
                }
                // 判断工作档条件
                if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                    return false;
                }

                // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn,crnNo);
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();

                if (conStation==1){
                    // 查询工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakOutStep2345(staProtocol.getSiteId(),crnProtocol.getTaskNo().intValue());
                    if (wrkMast == null) {
                        return false;
                    }
                    // 判断工作档条件
                    if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                        return false;
                    }
                    if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) {
                        // 移动中
                        return false;
@@ -1276,6 +1278,15 @@
                        }
                    }
                }else if (conStation==2){
                    // 查询工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakOutStep2345(staProtocol.getSiteId(),crnProtocol.getTaskNoTwo().intValue());
                    if (wrkMast == null) {
                        return false;
                    }
                    // 判断工作档条件
                    if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                        return false;
                    }
                    if (crnProtocol.statusTypeTwo == CrnStatusType.FETCHING || crnProtocol.statusTypeTwo == CrnStatusType.PUTTING) {
                        // 移动中
                        return false;
@@ -1396,7 +1407,7 @@
                    case 3:
                    case 4:
                    case 5:
                        crnStnToOutStnTwo(crnStn,2);
                        crnStnToOutStnTwo(crnSlave.getId(),crnStn,2);
                        continue;
                    default:
                        break;

 src/main/resources/application.yml

@@ -254,12 +254,10 @@
#      staNo: 173
    # 大料箱 双工位单伸 入库口1
    inLargeSta[0]:
      barcode: ${wcs-slave.barcode[1].id}
      staNo: 292
      barcode: ${wcs-slave.barcode[1].id}
    # 大料箱 双工位单伸 入库口1
    inLargeSta[1]:
      barcode: ${wcs-slave.barcode[0].id}
      staNo: 281
      barcode: ${wcs-slave.barcode[0].id}
    # 大料箱 双工位单伸 空板入库口1

 src/main/resources/mapper/WrkMastMapper.xml

@@ -131,6 +131,10 @@
        select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
    </select>

    <select id="selectPakOutStep2345" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
    </select>

    <select id="selectPakOutStep3" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and io_type=10
    </select>