Merge remote-tracking branch 'origin/zb-md-wcs' into zb-md-wcs

zjj

2024-09-11 a81c56cc9d0766914a5cd932cb61bf94dce27bc8

Merge remote-tracking branch 'origin/zb-md-wcs' into zb-md-wcs

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

@@ -2278,8 +2278,8 @@
            crnCommand.setSourcePosY(crnStn.getBay().shortValue());     // 源库位列
            crnCommand.setSourcePosZ(crnStn.getLev().shortValue());     // 源库位层
            crnCommand.setDestinationPosX((short) (locMast.getRow1()+slave.getOffset()));     // 目标库位排
            crnCommand.setDestinationPosY((short) (locMast.getBay1()+slave.getOffset()));     // 目标库位列
            crnCommand.setDestinationPosZ((short) (locMast.getLev1()+slave.getOffset()));     // 目标库位层
            crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 目标库位列
            crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 目标库位层
            crnCommand.setLocType1(locMast.getLocType1());     // 货物类型
            if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
@@ -2468,9 +2468,9 @@
                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                    crnCommand.setSourcePosX((short) (locMast.getRow1()+slave.getOffset()));     // 源库位排
                    crnCommand.setSourcePosY((short) (locMast.getBay1()+slave.getOffset()));     // 源库位列
                    crnCommand.setSourcePosZ((short) (locMast.getLev1()+slave.getOffset()));     // 源库位层
                    crnCommand.setSourcePosX((short)(locMast.getRow1()+slave.getOffset()));     // 源库位排
                    crnCommand.setSourcePosY(locMast.getBay1().shortValue());     // 源库位列
                    crnCommand.setSourcePosZ(locMast.getLev1().shortValue());     // 源库位层
                    crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 目标库位排
                    crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 目标库位列
                    crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 目标库位层

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

@@ -235,7 +235,7 @@
        }
        // 向堆垛机发任务前的堆垛机状态
        try{
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
            if (resultRead.IsSuccess) {
                CrnCommand one = new CrnCommand();
                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -291,7 +291,7 @@
                    writeCount1++;
                    continue;
                }
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
                if (resultRead.IsSuccess) {
                    CrnCommand one = new CrnCommand();
                    one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));

 src/main/resources/application.yml

@@ -34,7 +34,7 @@
  enable: false

wms:
  url: localhost:8088/mdqdwms
  url: localhost:8080/wms

# 下位机配置
wcs-slave:

 src/main/resources/mapper/WrkMastMapper.xml

@@ -208,6 +208,6 @@
        select top 1 * from dbo.asr_wrk_mast where wrk_no = #{wrkNo} and (wrk_sts = 13 or wrk_sts = 2) order by io_pri desc,io_time,wrk_no asc
    </select>
    <select id="selectCrn5Task2" resultMap="BaseResultMap">
        select * from dbo.asr_wrk_mast where wrk_sts=1 and io_type=1 and crn_no=5 order by io_pri desc,io_time,wrk_no ASC
        select * from dbo.asr_wrk_mast where wrk_sts=1 and io_type=1 order by io_pri desc,io_time,wrk_no ASC
    </select>
</mapper>

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

@@ -8,13 +8,22 @@
    "floors": 2,
    "racks": [{
        "type": "rack",
        "id": "rack1",
        "top": 160,
        "left": 525,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 8
    },{
        "type": "rack",
        "id": "rack2",
        "top": 184,
        "left": 525,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 7
        "maxBayNo": 8
    }, {
        "type": "rack",
        "id": "rack3",
@@ -23,7 +32,16 @@
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 7
        "maxBayNo": 8
    } ,{
        "type": "rack",
        "id": "rack4",
        "top": 268,
        "left": 525,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 8
    }],
    "rackDescs": [{
        "type": "rackDescs",