Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version

zwl

2025-07-01 4958451d972b1872d8e852b6c3c3446e700bd806

Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version

 src/main/java/com/zy/asrs/entity/param/Result.java

@@ -11,6 +11,7 @@
    private int Row;            //分配的货位所属排
    private int Floor;          //分配的货位所属层
    private int Column;         //分配的货位所属列
    private int priority;       //优先级
    //站位编号   用户是从哪个口入的
    private Integer TerminalNo;
}

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

@@ -1839,7 +1839,7 @@
        taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收
        taskWrk.setCreateTime(now);
        taskWrk.setIoType(1);//任务类型 入库
        taskWrk.setIoPri(13);//优先级
        taskWrk.setIoPri(result.getPriority());//优先级
        taskWrk.setBarcode(barcode);//条码
        taskWrk.setTargetPoint(locNo);
        taskWrk.setStartPoint(staNo+"");

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

@@ -83,15 +83,6 @@
        taskWrk.setWrkNo(workNo1);
        taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收
        taskWrk.setCreateTime(now);
        try {
            if (param.getIoType() > 1) {
                if (Utils.locNoRowBoolean(locMast.getRow1())) {
                    param.setTaskPriority(11);
                }
            }
        } catch (Exception e) {

        }
        taskWrk.setIoType(param.getIoType());//任务类型
        taskWrk.setIoPri(param.getTaskPriority());//优先级
        taskWrk.setBarcode(param.getBarcode());//条码

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

@@ -266,7 +266,7 @@
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4));   // 目标站

                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
                staProtocol.setAutoing(status[0]);  // 自动
                staProtocol.setAutoing(status[0]);  //
                staProtocol.setLoading(status[1]);  // 有物
                staProtocol.setInEnable(status[2]); // 可入
                staProtocol.setOutEnable(status[3]);// 可出