b72527e67cc2000742824ba400448d81416cb548..5a8064c78b2138ededdca56ec1fcf8eb7e8bb9ae
2025-06-13 Administrator
Merge remote-tracking branch 'origin/glccwcs' into glccwcs
5a8064 对比 | 目录
2025-06-13 Administrator
1
4ccbac 对比 | 目录
2025-06-13 zhang
1
41bc6f 对比 | 目录
4个文件已修改
28 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/taskWrk/taskWrk.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/taskWrkLog/taskWrkLog.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -67,7 +67,7 @@
        }
        int workNoType = WorkNoType.PAKOUT.type;
        // 2,3号堆垛机出库,需要通过条码区分大小托盘,16开头小托盘,18开头大托盘,任务号3001-6000为小托盘
        if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBarcode().startsWith("16")){
        if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBarcode().startsWith("16")) {
            workNoType = WorkNoType.PICK.type;
        }
        int workNo1 = commonService.getWorkNo(workNoType);//获取入库工作号
@@ -91,8 +91,8 @@
        } else if (param.getIoType() == 2) {
            taskWrk.setWrkSts(11);
//            if (!Cools.isEmpty(param.getStartPoint())) {
                taskWrk.setStartPoint(param.getStartPoint());//起点
                taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint())-1));
            taskWrk.setStartPoint(param.getStartPoint());//起点
            taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1));
//            }
//            taskWrk.setTargetPoint(param.getTargetPoint());
        } else if (param.getIoType() == 3) {
@@ -132,6 +132,15 @@
        } else {
            staProtocol = staProtocol.clone();
        }
        StaProtocol staProtocol1 = devpThread.getStation().get(param.getTargetSite());
        if (staProtocol1 == null) {
            return R.parse(param.getTargetSite() + "线程为空!");
        } else {
            staProtocol1 = staProtocol1.clone();
        }
        if (staProtocol1.isLoading()) {
            return R.error("目标站点有物!");
        }
        staProtocol.setWorkNo((short) commonService.getWorkNo(param.getFlag()));
        staProtocol.setStaNo(param.getTargetSite().shortValue());
        basDevpService.updateById(basDevp);
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -541,10 +541,11 @@
        //任务下发成功标识
        boolean writeFlag = false;
        while (writeCount < 5) {
            OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo());    // 工作号
            OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo());    // 目标站
            if (!Cools.isEmpty(staProtocol.getHeight()) && heightAddress != null) {
                OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));    // 目标站
                OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                log.info("写入高度地址:{},{}", heightAddress,  writeResult3);
                if (!writeResult3.IsSuccess) {
                    //fangzhi xierukushibai,jiu duoxiejici,meixunhuan
@@ -554,6 +555,8 @@
                    }
                }
            }
            OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo());    // 工作号
            OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo());    // 目标站
            if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
                Thread.sleep(200);
                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 2);
src/main/webapp/views/taskWrk/taskWrk.html
@@ -86,6 +86,8 @@
                        </el-table-column>
                        <el-table-column property="ioPri" label="优先级">
                        </el-table-column>
                        <el-table-column property="type" label="下降高度">
                        </el-table-column>
                        <el-table-column property="memo" label="备注">
                        </el-table-column>
                    </el-table>
src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -71,6 +71,8 @@
                        </el-table-column>
                        <el-table-column property="barcode" label="条码">
                        </el-table-column>
                        <el-table-column property="type" label="下降高度">
                        </el-table-column>
                    </el-table>
                    <div style="margin-top: 10px;">