#

野心家

2023-04-21 5dbe9e79932224bd9358bf027aa04e29151154ad

#

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

@@ -966,20 +966,20 @@
//                    }catch(Exception ignore){}
//                }

                        // 修改工作档状态 2.设备上走 => 3.吊车入库中
                        Date now = new Date();
                        wrkMast.setWrkSts(3L);
                        wrkMast.setCrnStrTime(now);
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            News.error(methodName + ":修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                        }
                    }
                                // 修改工作档状态 2.设备上走 => 3.吊车入库中
                                Date now = new Date();
                                wrkMast.setWrkSts(3L);
                                wrkMast.setCrnStrTime(now);
                                wrkMast.setModiTime(now);
                                if (wrkMastMapper.updateById(wrkMast) == 0) {
                                    News.error(methodName + ":修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                                }
                            }
                        }
                    }
                }else News.error(methodName + ":入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
            }else News.error(methodName + ":查询库存无数据--库位号{}", wrkMast.getLocNo());
            }
        }
    }

    public synchronized void crnStnToLoc1(CrnSlave slave, CrnProtocol crnProtocol) {

 src/main/resources/mapper/WrkMastMapper.xml

@@ -56,7 +56,7 @@
        <result column="log_err_time" property="logErrTime" />
        <result column="log_err_memo" property="logErrMemo" />
        <result column="barcode" property="barcode" />
<!--        <result column="Pdc_type" property="PdcType" />-->
        <!--        <result column="Pdc_type" property="PdcType" />-->
        <result column="ctn_no" property="ctnNo" />
        <result column="full_plt" property="fullPlt" />

@@ -77,9 +77,9 @@
    <select id="selectToBeHistoryData" resultMap="BaseResultMap">
        select * from asr_wrk_mast
        where wrk_sts=5
        or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
           or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
           or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
           or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
        order by io_time,wrk_no asc
    </select>

@@ -123,26 +123,26 @@
        select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
    </select>

<!--    &lt;!&ndash; 入库任务 &ndash;&gt;-->
<!--    <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
<!--        select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
<!--    </select>-->
    <!--    &lt;!&ndash; 入库任务 &ndash;&gt;-->
    <!--    <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
    <!--        select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
    <!--    </select>-->

<!--    &lt;!&ndash; 出库任务 &ndash;&gt;-->
<!--    <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
<!--        select top 1 *-->
<!--        from dbo.asr_wrk_mast-->
<!--        where (wrk_sts in (11,12)-->
<!--        or (wrk_sts in (14,15) and wrk_no in-->
<!--        (-->
<!--        select wrk_no-->
<!--        from asr_bas_devp-->
<!--        where wrk_no > 0)-->
<!--        ))-->
<!--        and io_type != 11-->
<!--        and source_sta_no = 180-->
<!--        order by io_time,wrk_no-->
<!--    </select>-->
    <!--    &lt;!&ndash; 出库任务 &ndash;&gt;-->
    <!--    <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
    <!--        select top 1 *-->
    <!--        from dbo.asr_wrk_mast-->
    <!--        where (wrk_sts in (11,12)-->
    <!--        or (wrk_sts in (14,15) and wrk_no in-->
    <!--        (-->
    <!--        select wrk_no-->
    <!--        from asr_bas_devp-->
    <!--        where wrk_no > 0)-->
    <!--        ))-->
    <!--        and io_type != 11-->
    <!--        and source_sta_no = 180-->
    <!--        order by io_time,wrk_no-->
    <!--    </select>-->

    <select id="selectCrnWorking" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
@@ -169,13 +169,13 @@
        select top 1 *
        from dbo.asr_wrk_mast
        where (wrk_sts in (11,12)
        or (wrk_sts in (14,15) and wrk_no in
        (
        select wrk_no
        from asr_bas_devp
        where wrk_no > 0)
        ))
        and io_type != 11
            or (wrk_sts in (14,15) and wrk_no in
                                       (
                                           select wrk_no
                                           from asr_bas_devp
                                           where wrk_no > 0)
                   ))
          and io_type != 11
        and source_sta_no = #{sourceStaNo}
        order by io_time,wrk_no
    </select>

 src/main/webapp/static/js/console.map.js

@@ -1,495 +1 @@
mapInfo ={
    "mapName": "XFXWCS",
    "rackCount": 6,
    "crnCount": 3,
    "stbCount": 39,
    "hpPosition": 1,
    "minBayNo": 2,
    "floors": 3,
    "racks": [{
        "type": "rack",
        "id": "rack6",
        "top": 344,
        "left": 193,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 35
    }, {
        "type": "rack",
        "id": "rack5",
        "top": 284,
        "left": 193,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 35
    }, {
        "type": "rack",
        "id": "rack4",
        "top": 260,
        "left": 193,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 35
    }, {
        "type": "rack",
        "id": "rack1",
        "top": 119,
        "left": 193,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 35
    }, {
        "type": "rack",
        "id": "rack2",
        "top": 176,
        "left": 193,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 35
    }, {
        "type": "rack",
        "id": "rack3",
        "top": 200,
        "left": 193,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 35
    }],
    "rackDescs": [{
        "type": "rackDescs",
        "id": "lb_desc17",
        "text": "#1",
        "top": 119,
        "left": 157,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc16",
        "text": "#6",
        "top": 344,
        "left": 154,
        "width": 33,
        "height": 23
    }],
    "crns": [{
        "type": "track",
        "id": "lb_track4",
        "text": "",
        "top": 97,
        "left": 1090,
        "width": 3,
        "height": 290
    }, {
        "type": "track",
        "id": "lb_track5",
        "text": "",
        "top": 97,
        "left": 1119,
        "width": 3,
        "height": 290
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "3",
        "top": 316,
        "left": 466,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 327,
        "left": 172,
        "width": 850,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 232,
        "left": 466,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 160,
        "left": 177,
        "width": 850,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 243,
        "left": 172,
        "width": 850,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 151,
        "left": 471,
        "width": 93,
        "height": 22
    }],
    "areas": [{
        "type": "Control_floor",
        "id": "tabControl_floor1",
        "text": "楼层",
        "top": 66,
        "left": 80,
        "width": 1267,
        "height": 666,
        "floors": [{
            "type": "floor",
            "id": "page_floor1",
            "text": "1F",
            "top": 4,
            "left": 22,
            "width": 1241,
            "height": 658,
            "stns": [{
                "type": "stn",
                "id": "site-100",
                "text": "100",
                "top": 176,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-102",
                "text": "102",
                "top": 237,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-101",
                "text": "101",
                "top": 176,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-112",
                "text": "112",
                "top": 176,
                "left": 1072,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-105",
                "text": "105",
                "top": 284,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-103",
                "text": "103",
                "top": 237,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-110",
                "text": "110",
                "top": 284,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-108",
                "text": "108",
                "top": 200,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-109",
                "text": "109",
                "top": 260,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-104",
                "text": "104",
                "top": 284,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-107",
                "text": "107",
                "top": 176,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-106",
                "text": "106",
                "top": 119,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-111",
                "text": "111",
                "top": 344,
                "left": 991,
                "width": 80,
                "height": 23
            }]
        }, {
            "type": "floor",
            "id": "page_floor2",
            "text": "2F",
            "top": 4,
            "left": 22,
            "width": 1241,
            "height": 658,
            "stns": [{
                "type": "stn",
                "id": "site-200",
                "text": "200",
                "top": 176,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-202",
                "text": "202",
                "top": 237,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-201",
                "text": "201",
                "top": 176,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-212",
                "text": "212",
                "top": 176,
                "left": 1072,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-205",
                "text": "205",
                "top": 284,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-203",
                "text": "203",
                "top": 237,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-210",
                "text": "210",
                "top": 284,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-208",
                "text": "208",
                "top": 200,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-209",
                "text": "209",
                "top": 260,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-204",
                "text": "204",
                "top": 284,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-207",
                "text": "207",
                "top": 176,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-206",
                "text": "206",
                "top": 119,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-211",
                "text": "211",
                "top": 344,
                "left": 991,
                "width": 80,
                "height": 23
            }]
        }, {
            "type": "floor",
            "id": "page_floor3",
            "text": "3F",
            "top": 4,
            "left": 22,
            "width": 1241,
            "height": 658,
            "stns": [{
                "type": "stn",
                "id": "site-300",
                "text": "300",
                "top": 176,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-302",
                "text": "302",
                "top": 237,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-301",
                "text": "301",
                "top": 176,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-312",
                "text": "312",
                "top": 176,
                "left": 1072,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-305",
                "text": "305",
                "top": 284,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-303",
                "text": "303",
                "top": 237,
                "left": 1138,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-310",
                "text": "310",
                "top": 284,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-308",
                "text": "308",
                "top": 200,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-309",
                "text": "309",
                "top": 260,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-304",
                "text": "304",
                "top": 284,
                "left": 1204,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-307",
                "text": "307",
                "top": 176,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-306",
                "text": "306",
                "top": 119,
                "left": 991,
                "width": 80,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-311",
                "text": "311",
                "top": 344,
                "left": 991,
                "width": 80,
                "height": 23
            }]
        }]
    }]
}
mapInfo ={"mapName":"SHBGWCS","rackCount":8,"crnCount":2,"stbCount":16,"hpPosition":1,"minBayNo":2,"floors":1,"racks":[{"type":"rack","id":"rack4","top":272,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack1","top":363,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack2","top":342,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack3","top":294,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack8","top":158,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack5","top":250,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack6","top":228,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38},{"type":"rack","id":"rack7","top":180,"left":189,"width":917,"height":20,"minBayNo":2,"maxBayNo":38}],"rackDescs":[{"type":"rackDescs","id":"lb_desc1","text":"#1","top":386,"left":1005,"width":30,"height":23},{"type":"rackDescs","id":"lb_desc11","text":"#8","top":129,"left":1005,"width":33,"height":23}],"crns":[{"type":"track","id":"lb_track1","text":"","top":327,"left":128,"width":1022,"height":2},{"type":"track","id":"lb_track2","text":"","top":213,"left":128,"width":1023,"height":2},{"type":"crane","id":"crn-2","text":"2","top":203,"left":278,"width":93,"height":22},{"type":"crane","id":"crn-1","text":"1","top":317,"left":278,"width":93,"height":22}],"areas":[{"type":"Control_floor","id":"tabControl_floor1","text":"楼层","top":68,"left":80,"width":1430,"height":598,"floors":[{"type":"floor","id":"page_floor1","text":"1F","top":4,"left":22,"width":1404,"height":590,"stns":[{"type":"stn","id":"site-103","text":"103","top":180,"left":1378,"width":53,"height":20},{"type":"stn","id":"site-101","text":"101","top":180,"left":1107,"width":53,"height":20},{"type":"stn","id":"site-102","text":"102","top":180,"left":1323,"width":53,"height":20},{"type":"stn","id":"site-110","text":"110","top":342,"left":1432,"width":53,"height":20},{"type":"stn","id":"site-111","text":"111","top":180,"left":1161,"width":53,"height":20},{"type":"stn","id":"site-112","text":"112","top":180,"left":1215,"width":53,"height":20},{"type":"stn","id":"site-113","text":"113","top":180,"left":1269,"width":53,"height":20},{"type":"stn","id":"site-114","text":"114","top":342,"left":1161,"width":53,"height":20},{"type":"stn","id":"site-115","text":"115","top":342,"left":1215,"width":53,"height":20},{"type":"stn","id":"site-116","text":"116","top":342,"left":1269,"width":53,"height":20},{"type":"stn","id":"site-109","text":"109","top":342,"left":1377,"width":53,"height":20},{"type":"stn","id":"site-108","text":"108","top":342,"left":1323,"width":53,"height":20},{"type":"stn","id":"site-104","text":"104","top":180,"left":1433,"width":53,"height":20},{"type":"stn","id":"site-105","text":"105","top":201,"left":1323,"width":53,"height":69},{"type":"stn","id":"site-106","text":"106","top":272,"left":1323,"width":53,"height":69},{"type":"stn","id":"site-107","text":"107","top":342,"left":1107,"width":53,"height":20}]}]}]}