rev：任务修改

2026-02-05 14:50:18 +08:00
parent a49d8ca150
commit caa96ef03e
35 changed files with 50 additions and 76 deletions
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java
@@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService;
 import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket;
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
@@ -185,10 +185,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                        secondaryPackagingService.palletizingCallEmpty(whereJson);
                    }
                }
-               /* // 拆盘机
-                if (type.equals(IOSConstant.THREE)) {
-                    // 找一垛空托盘
-                }*/
            } else {
                throw new BadRequestException("设备编码为：" + device_code + "的设备正在操作中！");
            }
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java
@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.pda.general_management.service.PdaPointAndPointBoxService;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java
@@ -92,9 +92,8 @@ public class AcsTaskDto {

    /**
     * Agv系统类型
-     * 1:1楼叉车系统
-     * 2:2楼1区域AGV系统
-     * 3:2楼2区域AGV系统
+     * 2:NDC系统
+     * 3:海康系统
     */
    String agv_system_type;

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java
@@ -113,7 +113,7 @@ public class CallMaterialTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java
@@ -94,7 +94,7 @@ public class CenterInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java
@@ -126,7 +126,7 @@ public class CheckBackMoveTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java
@@ -113,7 +113,7 @@ public class CheckMoveTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java
@@ -82,7 +82,7 @@ public class CoatingUpTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java
@@ -110,7 +110,7 @@ public class EmpVehicleInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java
@@ -101,7 +101,7 @@ public class EmpVehicleOutTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java
@@ -27,7 +27,7 @@ import javax.annotation.Resource;
 import java.util.List;

 /**
- * 空盘运输任务
+ * 空盘运输任务 海康任务
 * @author: lyd
 * @date: 2026/1/12
 */
@@ -87,8 +87,6 @@ public class EmptyDiskConveyTask extends AbstractTask {

        acsTaskDto.setPriority(IOSConstant.ONE);
        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
-        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
-        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

        return acsTaskDto;
    }
@@ -140,13 +138,6 @@ public class EmptyDiskConveyTask extends AbstractTask {
                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
                        .set(SchBasePoint::getIng_task_code, "")
        );
-        pointService.update(
-                new UpdateWrapper<SchBasePoint>().lambda()
-                        .set(SchBasePoint::getVehicle_code, "")
-                        .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空载具"))
-                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
-                        .set(SchBasePoint::getIng_task_code, "")
-        );

        // 判断是否需要呼叫空盘
        List<SchBasePoint> palletPoints = pointService.getNoTaskPointByRegionAndType("WBZQ", "2", "1");
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java
@@ -52,7 +52,7 @@ public class EmptyDiskEnterTask extends AbstractTask {
        task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
        task.setTask_status(TaskStatus.CREATED.getCode());
        task.setConfig_code(EmptyDiskEnterTask.class.getSimpleName());
-        task.setPoint_code1("ZBJ01");
+        task.setPoint_code1(IOSConstant.CBJ01);
        task.setPoint_code2(point.getPoint_code());
        task.setPoint_code3(json.getString("device_code"));
        task.setVehicle_code(json.getString("vehicle_code"));
@@ -92,9 +92,7 @@ public class EmptyDiskEnterTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
-        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
-        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);

        return acsTaskDto;
    }
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java
@@ -101,7 +101,7 @@ public class HandInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
@@ -120,7 +120,7 @@ public class HandOutTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java
@@ -95,7 +95,7 @@ public class InsideMoveTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java
@@ -119,7 +119,7 @@ public class IntermediateOutTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java
@@ -96,7 +96,7 @@ public class MaterialBackTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java
@@ -98,7 +98,7 @@ public class NoCarUnloadTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);

        return acsTaskDto;
    }
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java
@@ -129,7 +129,7 @@ public class PalletOutTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java
@@ -64,7 +64,7 @@ public class PalletizingAddTask extends AbstractTask {
            throw new BadRequestException("起点终点不能一致，请检查!");
        }
        // 下发任务
-//        this.sendTaskOne(task.getTask_id());
+        this.sendTaskOne(task.getTask_id());
        return task.getTask_id();
    }

@@ -85,9 +85,7 @@ public class PalletizingAddTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
-        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
-        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);

        return acsTaskDto;
    }
@@ -139,15 +137,6 @@ public class PalletizingAddTask extends AbstractTask {
                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
                        .set(SchBasePoint::getIng_task_code, "")
        );
-
-        // 更新
-        pointService.update(
-                new UpdateWrapper<SchBasePoint>().lambda()
-                        .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code())
-                        .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("有箱有料"))
-                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
-                        .set(SchBasePoint::getIng_task_code, "")
-        );
    }

    @Override
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java
@@ -8,7 +8,6 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.IdUtil;
-import org.nl.wms.basedata_manage.service.dao.Sectattr;
 import org.nl.wms.sch_manage.enums.TaskEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
@@ -25,10 +24,10 @@ import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;

 /**
 * 码垛下料
+ *
 * @author: lyd
 * @date: 2026/1/9
 */
@@ -40,6 +39,7 @@ public class PalletizingDownTask extends AbstractTask {
    private ISchBaseTaskService taskService;
    @Resource(name = "PalletizingAddTask")
    private PalletizingAddTask palletizingAddTask;
+
    @Override
    public String create(JSONObject json) {
        // 查找空闲的内外中转点
@@ -71,7 +71,7 @@ public class PalletizingDownTask extends AbstractTask {
            throw new BadRequestException("起点终点不能一致，请检查!");
        }
        // 下发任务
-//        this.sendTaskOne(task.getTask_id());
+        this.sendTaskOne(task.getTask_id());
        return task.getTask_id();
    }

@@ -93,8 +93,6 @@ public class PalletizingDownTask extends AbstractTask {

        acsTaskDto.setPriority(IOSConstant.ONE);
        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
-        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
-        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

        return acsTaskDto;
    }
@@ -145,15 +143,8 @@ public class PalletizingDownTask extends AbstractTask {
                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
                        .set(SchBasePoint::getIng_task_code, "")
        );
-        // 创建出去缠绕机或者空点位
+        // 创建出去缠绕机的任务
        List<SchBasePoint> pointList = pointService.getCRUsedDevice();
-        if (pointList.size() == 0) {
-            // 查找空位置, todo: 先不考虑二次分配
-            pointList = pointService.getNoTaskPointByRegionAndType("CRHCQ", "1", "1");
-        }
-        if (pointList.size() == 0) {
-            throw new BadRequestException("找不到可存放的空位！");
-        }
        SchBasePoint point = pointList.get(0);
        JSONObject taskParam = new JSONObject();
        taskParam.put("point_code1", taskObj.getPoint_code2());
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaNotCarUnloadTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaNotCarUnloadTask.java
@@ -92,7 +92,7 @@ public class PdaNotCarUnloadTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);

        return acsTaskDto;
    }
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
@@ -93,7 +93,7 @@ public class PdaPointTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);

        return acsTaskDto;
    }
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java
@@ -94,7 +94,7 @@ public class PreProcessingInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java
@@ -91,7 +91,7 @@ public class ProduceInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java
@@ -97,7 +97,7 @@ public class RawInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java
@@ -116,7 +116,7 @@ public class TabletingInTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java
@@ -100,7 +100,7 @@ public class WrappingDownTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java
@@ -99,7 +99,7 @@ public class WrappingUpTask extends AbstractTask {
        acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode());

        acsTaskDto.setPriority(IOSConstant.ONE);
-        acsTaskDto.setAgv_system_type(IOSConstant.THREE);
+        acsTaskDto.setAgv_system_type(IOSConstant.TWO);
        acsTaskDto.setIs_get_pause(IOSConstant.ZERO);
        acsTaskDto.setIs_put_pause(IOSConstant.ZERO);

--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
@@ -47,6 +47,11 @@ public class IOSConstant {
     */
    public final static String AGVZJZ001 = "AGVZJZ001";

+    /**
+     * 拆盘机
+     */
+    public final static String CBJ01 = "CBJ01";
+
    /**
     * 手持-库存查询-类型类型下拉框- 内包材值
     */
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java
@@ -108,7 +108,7 @@ public class VehicleOutServiceImpl implements VehicleOutService {
        );

        if (ObjectUtil.isEmpty(attrList)) {
-            throw new BadRequestException("库内没有空载具");
+            throw new BadRequestException("暂时没有可用的空载具");
        }
        return attrList;
    }
--- a/wms/nladmin-ui/src/views/login.vue
+++ b/wms/nladmin-ui/src/views/login.vue
@@ -4,12 +4,12 @@
      <h3 class="title">
        {{ title }}</h3>
      <el-form-item prop="username">
-        <el-input v-model="loginForm.username" type="text" auto-complete="off" :placeholder="$t('common.account')">
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" :placeholder="$t('common.password')" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="new-password" placeholder="密码" @keyup.enter.native="handleLogin">
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
@@ -74,8 +74,8 @@ export default {
      codeUrl: '',
      cookiePass: '',
      loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
        rememberMe: false,
        code: '',
        uuid: ''
--- a/wms/nladmin-ui/src/views/monitor/server/index.vue
+++ b/wms/nladmin-ui/src/views/monitor/server/index.vue
@@ -13,6 +13,9 @@
          <span>
            {{ $t('monitor.day') }}：{{ data.sys.day }}
          </span>
+          <span>
+            系统版本：{{ "V1.0"}}
+          </span>
          <i class="el-icon-refresh" style="margin-left: 40px" @click="init" />
        </div>
      </el-card>
--- a/wms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/wms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -201,8 +201,8 @@
 <!--          </template>-->
 <!--        </el-table-column>-->
 <!--        <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />-->
-        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('mater_name',crud.data,'物料名称')" />
-        <el-table-column prop="material_qty" label="物料重量" :min-width="flexWidth('mater_name',crud.data,'物料重量')" />
+        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="material_qty" label="物料重量" :min-width="flexWidth('material_qty',crud.data,'物料重量')" />
        <el-table-column v-if="false" prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
        <el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
        <el-table-column v-if="false" prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />