29b24b9f230e230bb9a394c8301484070d7de1a6..bbe021298549f86c5ee5c9294e987eab874cddc7
2025-07-01 zwl
更新入出库优先级
bbe021 对比 | 目录
2025-07-01 zwl
Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version
495845 对比 | 目录
2025-07-01 zwl
添加数据库
f585af 对比 | 目录
2025-06-29 zwl
更新入出库优先级
5e7990 对比 | 目录
2025-06-29 zwl
#
72c330 对比 | 目录
1个文件已添加
6个文件已修改
24 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/param/Result.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/czscwcs20250516.bak 补丁 | 查看 | 原始文档 | blame | 历史
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/entity/param/TaskCreateParam.java
@@ -16,7 +16,7 @@
    private String startPoint;
    //优先级
    private Integer taskPriority;
    private Integer priority;
    //终点
    private String targetPoint;
@@ -38,7 +38,7 @@
        this.taskNo = param.getTaskNo();
        this.ioType = convertParamIoType(param.getTaskType());
        this.barcode = param.getContainerCode();
        this.taskPriority = param.getTaskPriority();
        this.priority = param.getPriority();
        this.startPoint = param.getSourceLocationCode();
        this.targetPoint = param.getTargetLocationCode();
        this.emptyContainer = param.getEmptyContainer();
@@ -49,7 +49,7 @@
        this.taskNo = param.getTaskNo();
        this.ioType = param.getStereoscopicTaskType();
        this.barcode = param.getBoxNo();
        this.taskPriority = 12;
        this.priority = param.getPriority();
        this.startPoint = param.getStartPoint();
        this.targetPoint = param.getTerminalNo();
        this.emptyContainer = "N";
src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
@@ -22,7 +22,7 @@
    //wms出库任务下发接口
    private String taskType;            //任务类型             CK、YK、RK、PD
    private int taskPriority;           //优先级
    private int priority;           //优先级
    private String containerCode;       //容器编码
    private String containerTypeCode;   //容器类型
    private String emptyContainer;      //是否空托盘            Y:是 N:否
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(10);//优先级
        taskWrk.setBarcode(barcode);//条码
        taskWrk.setTargetPoint(locNo);
        taskWrk.setStartPoint(staNo+"");
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -83,17 +83,8 @@
        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.setIoPri(param.getPriority());//优先级
        taskWrk.setBarcode(param.getBarcode());//条码
        taskWrk.setCrnNo(locMast.getCrnNo());
        if (param.getIoType() == 1) {
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]);// 可出
src/main/resources/czscwcs20250516.bak
Binary files differ