warewms-ams 分支整理

warewms-wms/src/main/java/com/warewms/wms/car/controller/CarInfoController.java

@@ -1,6 +1,6 @@
-package com.warewms.wms.car.controller;
+package com.warewms.agv.car.controller;
 
-import com.warewms.wms.car.service.ICarInfoService;
+import com.warewms.agv.car.service.ICarInfoService;
 import com.warewms.common.base.controller.BaseController;
 import com.warewms.common.base.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-wms/src/main/java/com/warewms/wms/car/domain/CarInfo.java

@@ -1,4 +1,4 @@
-package com.warewms.wms.car.domain;
+package com.warewms.agv.car.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.warewms.common.base.domain.BaseEntity;

warewms-wms/src/main/java/com/warewms/wms/car/dto/CarInfoDTO.java

@@ -1,4 +1,4 @@
-package com.warewms.wms.car.dto;
+package com.warewms.agv.car.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

warewms-wms/src/main/java/com/warewms/wms/car/mapper/CarInfoMapper.java

@@ -1,7 +1,7 @@
-package com.warewms.wms.car.mapper;
+package com.warewms.agv.car.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.warewms.wms.car.domain.CarInfo;
+import com.warewms.agv.car.domain.CarInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

warewms-wms/src/main/java/com/warewms/wms/car/service/ICarInfoService.java

@@ -1,7 +1,7 @@
-package com.warewms.wms.car.service;
+package com.warewms.agv.car.service;
 
-import com.warewms.wms.car.domain.CarInfo;
-import com.warewms.wms.car.dto.CarInfoDTO;
+import com.warewms.agv.car.domain.CarInfo;
+import com.warewms.agv.car.dto.CarInfoDTO;
 
 /**
  * 入库单Service接口

warewms-wms/src/main/java/com/warewms/wms/car/service/impl/CarInfoServiceImpl.java

@@ -1,10 +1,10 @@
-package com.warewms.wms.car.service.impl;
+package com.warewms.agv.car.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.warewms.wms.car.domain.CarInfo;
-import com.warewms.wms.car.dto.CarInfoDTO;
-import com.warewms.wms.car.mapper.CarInfoMapper;
-import com.warewms.wms.car.service.ICarInfoService;
+import com.warewms.agv.car.domain.CarInfo;
+import com.warewms.agv.car.dto.CarInfoDTO;
+import com.warewms.agv.car.mapper.CarInfoMapper;
+import com.warewms.agv.car.service.ICarInfoService;
 import com.warewms.common.utils.ConvertUtils;
 import io.jsonwebtoken.lang.Assert;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-wms/src/main/java/com/warewms/wms/car/vo/CarInfoVO.java

@@ -1,6 +1,6 @@
-package com.warewms.wms.car.vo;
+package com.warewms.agv.car.vo;
 
-import com.warewms.wms.car.domain.CarInfo;
+import com.warewms.agv.car.domain.CarInfo;
 import lombok.Getter;
 import lombok.Setter;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/AciService.java

@@ -1,16 +1,16 @@
-package com.warewms.ams.agv.ndc;
+package com.warewms.agv.ndc;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
-import com.warewms.ams.agv.ndc.common.Aci;
-import com.warewms.ams.agv.ndc.common.ByteUtil;
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineDetail;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.entity.Order;
-import com.warewms.ams.agv.ndc.service.IAmsHexdefineDetailService;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
-import com.warewms.ams.agv.ndc.service.SocketBufferService;
+import com.warewms.agv.ndc.common.Aci;
+import com.warewms.agv.ndc.common.ByteUtil;
+import com.warewms.agv.ndc.domain.AmsHexdefineDetail;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.entity.Order;
+import com.warewms.agv.ndc.service.IAmsHexdefineDetailService;
+import com.warewms.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.service.SocketBufferService;
 import com.warewms.common.constant.WmsConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/common/Aci.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.common;
+package com.warewms.agv.ndc.common;
 
 /**
  * Created by IntelliJ IDEA.

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/common/ByteUtil.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.common;
+package com.warewms.agv.ndc.common;
 
 import org.springframework.util.StringUtils;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/common/ValType.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.common;
+package com.warewms.agv.ndc.common;
 
 import lombok.Getter;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/config/TestTagConfig.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.config;
+package com.warewms.agv.ndc.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/controller/AmsTaskController.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.controller;
+package com.warewms.agv.ndc.controller;
 
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.service.IAmsTaskService;
 import com.warewms.common.base.controller.BaseController;
 import com.warewms.common.base.domain.AjaxResult;
 import com.warewms.wms.task.dto.WcsTaskCancelDTO;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/domain/AmsHexdefineDetail.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.domain;
+package com.warewms.agv.ndc.domain;
 
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.base.domain.BaseEntity;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/domain/AmsHexdefineHeader.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.domain;
+package com.warewms.agv.ndc.domain;
 
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.base.domain.BaseEntity;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/domain/AmsNdcEvent.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.domain;
+package com.warewms.agv.ndc.domain;
 
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.base.domain.BaseEntity;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/domain/AmsTask.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.domain;
+package com.warewms.agv.ndc.domain;
 
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.base.domain.BaseEntity;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/entity/AciInfo.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.entity;
+package com.warewms.agv.ndc.entity;
 
 
 import java.util.ArrayList;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/entity/CallbackResult.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.entity;
+package com.warewms.agv.ndc.entity;
 
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/entity/CarStatus.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.entity;
+package com.warewms.agv.ndc.entity;
 
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/entity/EventBean.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.entity;
+package com.warewms.agv.ndc.entity;
 
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/entity/Messageb.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.entity;
+package com.warewms.agv.ndc.entity;
 
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/entity/Order.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.entity;
+package com.warewms.agv.ndc.entity;
 
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/mapper/AmsHexdefineDetailMapper.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.mapper;
+package com.warewms.agv.ndc.mapper;
 
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineDetail;
+import com.warewms.agv.ndc.domain.AmsHexdefineDetail;
 
 import java.util.List;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/mapper/AmsHexdefineHeaderMapper.java

@@ -1,8 +1,8 @@
-package com.warewms.ams.agv.ndc.mapper;
+package com.warewms.agv.ndc.mapper;
 
 import java.util.List;
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineHeader;
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineDetail;
+import com.warewms.agv.ndc.domain.AmsHexdefineHeader;
+import com.warewms.agv.ndc.domain.AmsHexdefineDetail;
 
 /**
  * 16进制指令定义Mapper接口

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/mapper/AmsNdcEventMapper.java

@@ -1,7 +1,8 @@
-package com.warewms.ams.agv.ndc.mapper;
+package com.warewms.agv.ndc.mapper;
+
+import com.warewms.agv.ndc.domain.AmsNdcEvent;
 
 import java.util.List;
-import com.warewms.ams.agv.ndc.domain.AmsNdcEvent;
 
 /**
  * Ndc反馈事件代码字典Mapper接口

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/mapper/AmsTaskMapper.java

@@ -1,8 +1,8 @@
-package com.warewms.ams.agv.ndc.mapper;
+package com.warewms.agv.ndc.mapper;
 
 import java.util.List;
 
-import com.warewms.ams.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.domain.AmsTask;
 
 /**
  * ams任务列表Mapper接口

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/AgvInteractingService.java

@@ -1,7 +1,7 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
-import com.warewms.ams.agv.ndc.domain.AmsNdcEvent;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.domain.AmsNdcEvent;
+import com.warewms.agv.ndc.domain.AmsTask;
 
 /**
  * Created by IntelliJ IDEA.

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/IAmsHexdefineDetailService.java

@@ -1,7 +1,7 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineDetail;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.domain.AmsHexdefineDetail;
+import com.warewms.agv.ndc.domain.AmsTask;
 
 import java.util.List;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/IAmsHexdefineHeaderService.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineHeader;
+import com.warewms.agv.ndc.domain.AmsHexdefineHeader;
 
 import java.util.List;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/IAmsNdcEventService.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
-import com.warewms.ams.agv.ndc.domain.AmsNdcEvent;
+import com.warewms.agv.ndc.domain.AmsNdcEvent;
 
 import java.util.List;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/IAmsTaskService.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
-import com.warewms.ams.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.domain.AmsTask;
 import com.warewms.common.base.domain.AjaxResult;
 import com.warewms.wms.task.dto.WcsTaskCancelDTO;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/SocketBufferService.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
-import com.warewms.ams.agv.ndc.entity.Order;
+import com.warewms.agv.ndc.entity.Order;
 
 import java.util.List;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/StatusUpdateService.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.agv.ndc.service;
+package com.warewms.agv.ndc.service;
 
 /**
  * Created by IntelliJ IDEA.

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/AgvInteractingServiceImpl.java

@@ -1,8 +1,8 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
-import com.warewms.ams.agv.ndc.domain.AmsNdcEvent;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.service.AgvInteractingService;
+import com.warewms.agv.ndc.domain.AmsNdcEvent;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.service.AgvInteractingService;
 import org.springframework.stereotype.Component;
 
 /**

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/AmsHexdefineDetailServiceImpl.java

@@ -1,10 +1,10 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
-import com.warewms.ams.agv.ndc.common.ValType;
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineDetail;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.mapper.AmsHexdefineDetailMapper;
-import com.warewms.ams.agv.ndc.service.IAmsHexdefineDetailService;
+import com.warewms.agv.ndc.common.ValType;
+import com.warewms.agv.ndc.domain.AmsHexdefineDetail;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.mapper.AmsHexdefineDetailMapper;
+import com.warewms.agv.ndc.service.IAmsHexdefineDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/AmsHexdefineHeaderServiceImpl.java

@@ -1,11 +1,10 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineDetail;
-import com.warewms.ams.agv.ndc.domain.AmsHexdefineHeader;
-import com.warewms.ams.agv.ndc.mapper.AmsHexdefineHeaderMapper;
-import com.warewms.ams.agv.ndc.service.IAmsHexdefineHeaderService;
-import org.apache.commons.lang3.StringUtils;
+import com.warewms.agv.ndc.domain.AmsHexdefineDetail;
+import com.warewms.agv.ndc.domain.AmsHexdefineHeader;
+import com.warewms.agv.ndc.mapper.AmsHexdefineHeaderMapper;
+import com.warewms.agv.ndc.service.IAmsHexdefineHeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/AmsNdcEventServiceImpl.java

@@ -1,8 +1,8 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
-import com.warewms.ams.agv.ndc.domain.AmsNdcEvent;
-import com.warewms.ams.agv.ndc.mapper.AmsNdcEventMapper;
-import com.warewms.ams.agv.ndc.service.IAmsNdcEventService;
+import com.warewms.agv.ndc.domain.AmsNdcEvent;
+import com.warewms.agv.ndc.mapper.AmsNdcEventMapper;
+import com.warewms.agv.ndc.service.IAmsNdcEventService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/AmsTaskServiceImpl.java

@@ -1,10 +1,10 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
 import cn.hutool.core.comparator.CompareUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.mapper.AmsTaskMapper;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.mapper.AmsTaskMapper;
+import com.warewms.agv.ndc.service.IAmsTaskService;
 import com.warewms.common.base.domain.AjaxResult;
 import com.warewms.common.constant.WmsConstant;
 import com.warewms.common.utils.string.StringUtils;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/SocketBufferServiceImpl.java

@@ -1,15 +1,15 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.warewms.ams.agv.ndc.common.Aci;
-import com.warewms.ams.agv.ndc.common.ByteUtil;
-import com.warewms.ams.agv.ndc.domain.AmsNdcEvent;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.entity.Order;
-import com.warewms.ams.agv.ndc.service.IAmsNdcEventService;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
-import com.warewms.ams.agv.ndc.service.SocketBufferService;
-import com.warewms.ams.agv.ndc.service.StatusUpdateService;
+import com.warewms.agv.ndc.common.Aci;
+import com.warewms.agv.ndc.common.ByteUtil;
+import com.warewms.agv.ndc.domain.AmsNdcEvent;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.entity.Order;
+import com.warewms.agv.ndc.service.IAmsNdcEventService;
+import com.warewms.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.service.SocketBufferService;
+import com.warewms.agv.ndc.service.StatusUpdateService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -1,10 +1,10 @@
-package com.warewms.ams.agv.ndc.service.impl;
+package com.warewms.agv.ndc.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.entity.CallbackResult;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
-import com.warewms.ams.agv.ndc.service.StatusUpdateService;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.entity.CallbackResult;
+import com.warewms.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.service.StatusUpdateService;
 import com.warewms.wms.task.service.IWcsTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/thread/AciServiceThread.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.thread;
+package com.warewms.agv.ndc.thread;
 
-import com.warewms.ams.agv.ndc.AciService;
+import com.warewms.agv.ndc.AciService;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

warewms-ams/src/main/java/com/warewms/ams/agv/ndc/thread/AutoTaskThread.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.agv.ndc.thread;
+package com.warewms.agv.ndc.thread;
 
-import com.warewms.ams.business.service.IBusinessService;
+import com.warewms.business.service.IBusinessService;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

warewms-ams/src/main/java/com/warewms/ams/business/controller/BusinessController.java

@@ -1,10 +1,11 @@
-package com.warewms.ams.business.controller;
+package com.warewms.business.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.warewms.ams.business.form.LineCallForm;
-import com.warewms.ams.business.form.LineCallListFrom;
-import com.warewms.ams.business.service.IBusinessService;
-import com.warewms.ams.business.service.ILineCallService;
+import com.warewms.business.form.LineCallForm;
+import com.warewms.business.form.LineCallListFrom;
+import com.warewms.business.service.IBusinessService;
+import com.warewms.business.service.ILineCallService;
+import com.warewms.business.vo.LineCallVO;
 import com.warewms.common.annotation.Log;
 import com.warewms.common.base.domain.AjaxResult;
 import com.warewms.common.constant.WmsConstant;
@@ -18,7 +19,6 @@ import com.warewms.wms.flow.vo.FlowConfigHeaderVO;
 import com.warewms.wms.inv.domain.form.InvLotLocIdMoveForm;
 import com.warewms.wms.order.form.CheckOutForm;
 import com.warewms.wms.order.form.CheckOutInfoForm;
-import com.warewms.ams.business.vo.LineCallVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

warewms-ams/src/main/java/com/warewms/ams/business/domain/FilterLockInvLocationDTO.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.business.domain;
+package com.warewms.business.domain;
 
-import com.warewms.ams.config.domain.dto.OutWarehouseDTO;
+import com.warewms.config.domain.dto.OutWarehouseDTO;
 import com.warewms.wms.base.entity.BaseLocationInfo;
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/business/domain/LocationSortComparator.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.business.domain;
+package com.warewms.business.domain;
 
 import org.apache.commons.lang3.StringUtils;
 

warewms-ams/src/main/java/com/warewms/ams/business/domain/LocationSortDTO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.business.domain;
+package com.warewms.business.domain;
 
 
 /**

warewms-ams/src/main/java/com/warewms/ams/business/form/LineCallDetailsForm.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.business.form;
+package com.warewms.business.form;
 
 /**
  * Created by IntelliJ IDEA.

warewms-ams/src/main/java/com/warewms/ams/business/form/LineCallForm.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.business.form;
+package com.warewms.business.form;
 
 import java.io.Serializable;
 import java.util.List;

warewms-ams/src/main/java/com/warewms/ams/business/form/LineCallListFrom.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.business.form;
+package com.warewms.business.form;
 
 import java.io.Serializable;
 import java.util.List;

warewms-ams/src/main/java/com/warewms/ams/business/service/IBusinessService.java

@@ -1,14 +1,15 @@
-package com.warewms.ams.business.service;
+package com.warewms.business.service;
 
 import com.warewms.ams.config.domain.dto.*;
+import com.warewms.business.form.LineCallForm;
+import com.warewms.business.form.LineCallListFrom;
 import com.warewms.common.base.domain.AjaxResult;
+import com.warewms.config.domain.dto.*;
 import com.warewms.wms.asn.form.PaForm;
 import com.warewms.wms.base.entity.BaseLocationInfo;
 import com.warewms.wms.flow.domain.AsnSoStrategy;
 import com.warewms.wms.flow.vo.FlowConfigHeaderVO;
 import com.warewms.wms.inv.domain.form.InvLotLocIdMoveForm;
-import com.warewms.ams.business.form.LineCallForm;
-import com.warewms.ams.business.form.LineCallListFrom;
 import com.warewms.wms.order.form.CheckOutInfoForm;
 import com.warewms.wms.task.domain.WcsTask;
 

warewms-ams/src/main/java/com/warewms/ams/business/service/ILineCallService.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.business.service;
+package com.warewms.business.service;
 
-import com.warewms.ams.business.vo.LineCallVO;
+import com.warewms.business.vo.LineCallVO;
 
 /**
  * Created by IntelliJ IDEA.

warewms-ams/src/main/java/com/warewms/ams/business/service/impl/BusinessServiceImpl.java

@@ -1,21 +1,24 @@
-package com.warewms.ams.business.service.impl;
+package com.warewms.business.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.warewms.ams.agv.ndc.common.ByteUtil;
-import com.warewms.ams.agv.ndc.common.CRC16Util;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
-import com.warewms.ams.business.service.IBusinessService;
-import com.warewms.ams.config.domain.dto.*;
-import com.warewms.ams.config.service.LocationAllocationStrategy;
+import com.warewms.agv.ndc.common.ByteUtil;
+import com.warewms.agv.ndc.common.CRC16Util;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.service.IAmsTaskService;
+import com.warewms.business.form.LineCallDetailsForm;
+import com.warewms.business.form.LineCallForm;
+import com.warewms.business.form.LineCallListFrom;
+import com.warewms.business.service.IBusinessService;
 import com.warewms.common.base.domain.AjaxResult;
 import com.warewms.common.constant.WmsConstant;
 import com.warewms.common.exception.ServiceException;
 import com.warewms.common.utils.redis.RedisCache;
 import com.warewms.common.utils.redis.RedisKey;
 import com.warewms.common.utils.uuid.SnowflakeIdWorker;
+import com.warewms.config.domain.dto.*;
+import com.warewms.config.service.LocationAllocationStrategy;
 import com.warewms.wms.asn.form.PaForm;
 import com.warewms.wms.asn.service.IWmsDocAsnHeaderService;
 import com.warewms.wms.base.dto.BaseLocationInfoSameColDTO;
@@ -37,9 +40,6 @@ import com.warewms.wms.inv.domain.vo.InvLotLocIdLotattVO;
 import com.warewms.wms.inv.dto.LotattDTO;
 import com.warewms.wms.inv.mapper.InvLotLocIdMapper;
 import com.warewms.wms.inv.service.IInvLotLocIdService;
-import com.warewms.ams.business.form.LineCallDetailsForm;
-import com.warewms.ams.business.form.LineCallForm;
-import com.warewms.ams.business.form.LineCallListFrom;
 import com.warewms.wms.order.form.CheckOutInfoForm;
 import com.warewms.wms.task.domain.WcsTask;
 import com.warewms.wms.task.dto.WcsTaskLocationDTO;

warewms-ams/src/main/java/com/warewms/ams/business/service/impl/LineCallServiceImpl.java

@@ -1,5 +1,7 @@
-package com.warewms.ams.business.service.impl;
+package com.warewms.business.service.impl;
 
+import com.warewms.business.service.ILineCallService;
+import com.warewms.business.vo.LineCallVO;
 import com.warewms.common.exception.ServiceException;
 import com.warewms.wms.base.entity.BaseLocationInfo;
 import com.warewms.wms.base.entity.BaseLocationZone;
@@ -9,8 +11,6 @@ import com.warewms.wms.base.service.IBaseLocationZoneService;
 import com.warewms.wms.base.service.IBaseSkuService;
 import com.warewms.wms.flow.mapper.FlowConfigHeaderMapper;
 import com.warewms.wms.flow.vo.FlowConfigHeaderVO;
-import com.warewms.ams.business.service.ILineCallService;
-import com.warewms.ams.business.vo.LineCallVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

warewms-ams/src/main/java/com/warewms/ams/business/vo/LineCallVO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.business.vo;
+package com.warewms.business.vo;
 
 import com.warewms.wms.base.entity.BaseLocationInfo;
 import com.warewms.wms.base.entity.BaseSku;

warewms-ams/src/main/java/com/warewms/ams/config/controller/LocationPriorityHeaderController.java

@@ -1,8 +1,9 @@
-package com.warewms.ams.config.controller;
+package com.warewms.config.controller;
 
 import java.util.List;
 
-import com.warewms.ams.config.domain.vo.LocationPriorityHeaderVO;
+import com.warewms.config.domain.vo.LocationPriorityHeaderVO;
+import com.warewms.config.domain.LocationPriorityHeader;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,8 +18,7 @@ import com.warewms.common.annotation.Log;
 import com.warewms.common.base.controller.BaseController;
 import com.warewms.common.base.domain.AjaxResult;
 import com.warewms.common.enums.BusinessType;
-import com.warewms.ams.config.domain.LocationPriorityHeader;
-import com.warewms.ams.config.service.ILocationPriorityHeaderService;
+import com.warewms.config.service.ILocationPriorityHeaderService;
 import com.warewms.common.base.page.TableDataInfo;
 
 /**

warewms-ams/src/main/java/com/warewms/ams/config/domain/LocationPriorityDetails.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain;
+package com.warewms.config.domain;
 
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.base.domain.BaseEntity;

warewms-ams/src/main/java/com/warewms/ams/config/domain/LocationPriorityHeader.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain;
+package com.warewms.config.domain;
 
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.base.domain.BaseEntity;

warewms-ams/src/main/java/com/warewms/ams/config/domain/dto/AgvCallDTO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.dto;
+package com.warewms.config.domain.dto;
 
 import java.util.ArrayList;
 import java.util.List;

warewms-ams/src/main/java/com/warewms/ams/config/domain/dto/AgvCallItem.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.dto;
+package com.warewms.config.domain.dto;
 
 import com.warewms.wms.inv.dto.LotattDTO;
 import lombok.Data;

warewms-ams/src/main/java/com/warewms/ams/config/domain/dto/AgvCallItemDTO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.dto;
+package com.warewms.config.domain.dto;
 
 import com.warewms.wms.flow.vo.FlowConfigHeaderVO;
 import com.warewms.wms.inv.dto.LotattDTO;

warewms-ams/src/main/java/com/warewms/ams/config/domain/dto/InWarehouseDTO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.dto;
+package com.warewms.config.domain.dto;
 
 import com.warewms.wms.inv.dto.LotattDTO;
 

warewms-ams/src/main/java/com/warewms/ams/config/domain/dto/OutWarehouseDTO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.dto;
+package com.warewms.config.domain.dto;
 
 import com.warewms.wms.inv.dto.LotattDTO;
 

warewms-ams/src/main/java/com/warewms/ams/config/domain/vo/LocationPriorityDetailsVO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.vo;
+package com.warewms.config.domain.vo;
 
 import com.warewms.common.base.domain.BaseEntity;
 

warewms-ams/src/main/java/com/warewms/ams/config/domain/vo/LocationPriorityHeaderVO.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.config.domain.vo;
+package com.warewms.config.domain.vo;
 
 import com.warewms.common.base.domain.BaseEntity;
 

warewms-ams/src/main/java/com/warewms/ams/config/mapper/LocationPriorityHeaderMapper.java

@@ -1,10 +1,10 @@
-package com.warewms.ams.config.mapper;
+package com.warewms.config.mapper;
 
 import java.util.List;
-import com.warewms.ams.config.domain.LocationPriorityHeader;
-import com.warewms.ams.config.domain.LocationPriorityDetails;
-import com.warewms.ams.config.domain.vo.LocationPriorityDetailsVO;
-import com.warewms.ams.config.domain.vo.LocationPriorityHeaderVO;
+import com.warewms.config.domain.LocationPriorityHeader;
+import com.warewms.config.domain.LocationPriorityDetails;
+import com.warewms.config.domain.vo.LocationPriorityDetailsVO;
+import com.warewms.config.domain.vo.LocationPriorityHeaderVO;
 
 /**
  * 出入库策略Mapper接口

warewms-ams/src/main/java/com/warewms/ams/config/service/ILocationPriorityHeaderService.java

@@ -1,7 +1,7 @@
-package com.warewms.ams.config.service;
+package com.warewms.config.service;
 
-import com.warewms.ams.config.domain.LocationPriorityHeader;
-import com.warewms.ams.config.domain.vo.LocationPriorityHeaderVO;
+import com.warewms.config.domain.LocationPriorityHeader;
+import com.warewms.config.domain.vo.LocationPriorityHeaderVO;
 
 import java.util.List;
 

warewms-ams/src/main/java/com/warewms/ams/config/service/LocationAllocationStrategy.java

@@ -1,11 +1,11 @@
-package com.warewms.ams.config.service;
+package com.warewms.config.service;
 
 import com.alibaba.fastjson.JSON;
-import com.warewms.ams.business.domain.FilterLockInvLocationDTO;
-import com.warewms.ams.business.domain.LocationSortComparator;
-import com.warewms.ams.business.domain.LocationSortDTO;
-import com.warewms.ams.config.domain.dto.InWarehouseDTO;
-import com.warewms.ams.config.domain.dto.OutWarehouseDTO;
+import com.warewms.business.domain.FilterLockInvLocationDTO;
+import com.warewms.business.domain.LocationSortComparator;
+import com.warewms.business.domain.LocationSortDTO;
+import com.warewms.config.domain.dto.InWarehouseDTO;
+import com.warewms.config.domain.dto.OutWarehouseDTO;
 import com.warewms.common.utils.redis.RedisCache;
 import com.warewms.common.utils.redis.RedisKey;
 import com.warewms.wms.base.entity.BaseLocationInfo;

warewms-ams/src/main/java/com/warewms/ams/config/service/impl/LocationPriorityHeaderServiceImpl.java

@@ -1,10 +1,10 @@
-package com.warewms.ams.config.service.impl;
+package com.warewms.config.service.impl;
 
-import com.warewms.ams.config.domain.LocationPriorityDetails;
-import com.warewms.ams.config.domain.LocationPriorityHeader;
-import com.warewms.ams.config.domain.vo.LocationPriorityHeaderVO;
-import com.warewms.ams.config.mapper.LocationPriorityHeaderMapper;
-import com.warewms.ams.config.service.ILocationPriorityHeaderService;
+import com.warewms.config.domain.LocationPriorityDetails;
+import com.warewms.config.domain.LocationPriorityHeader;
+import com.warewms.config.domain.vo.LocationPriorityHeaderVO;
+import com.warewms.config.mapper.LocationPriorityHeaderMapper;
+import com.warewms.config.service.ILocationPriorityHeaderService;
 import com.warewms.common.utils.DateUtils;
 import com.warewms.common.utils.string.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-ams/src/main/java/com/warewms/ams/init/StartService.java

@@ -1,11 +1,11 @@
-package com.warewms.ams.init;
-
-import com.warewms.ams.agv.ndc.AciService;
-import com.warewms.ams.agv.ndc.config.TestTagConfig;
-import com.warewms.ams.agv.ndc.thread.AciServiceThread;
-import com.warewms.ams.agv.ndc.thread.AutoTaskThread;
-import com.warewms.ams.business.service.IBusinessService;
-import com.warewms.ams.thread.ServerGs;
+package com.warewms.init;
+
+import com.warewms.agv.ndc.AciService;
+import com.warewms.agv.ndc.config.TestTagConfig;
+import com.warewms.agv.ndc.thread.AciServiceThread;
+import com.warewms.agv.ndc.thread.AutoTaskThread;
+import com.warewms.business.service.IBusinessService;
+import com.warewms.thread.ServerGs;
 import com.warewms.common.utils.redis.RedisCache;
 import com.warewms.common.utils.redis.RedisKey;
 import com.warewms.system.service.ISysConfigService;

warewms-ams/src/main/java/com/warewms/nio/NioBaseServer.java

@@ -0,0 +1,91 @@
+package com.warewms.nio;
+
+import cn.hutool.core.util.NumberUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.util.Iterator;
+
+@Slf4j
+public abstract class NioBaseServer {
+
+    private ServerSocketChannel listenChannel;
+
+    private Selector selector;
+
+    public NioBaseServer(int port) {
+        try {
+            selector = Selector.open();
+            listenChannel = ServerSocketChannel.open();
+            listenChannel.socket().bind(new InetSocketAddress(port));
+            listenChannel.configureBlocking(Boolean.FALSE);
+            listenChannel.register(selector, SelectionKey.OP_ACCEPT);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void start() {
+        try {
+            while (true) {
+                int count = selector.select();
+                if (NumberUtil.isGreater(BigDecimal.valueOf(count), BigDecimal.ZERO)) {
+                    Iterator<SelectionKey> selectionKeyIterator = selector.selectedKeys().iterator();
+                    while (selectionKeyIterator.hasNext()) {
+                        SelectionKey selectionKey = selectionKeyIterator.next();
+                        //连接事件
+                        if (selectionKey.isAcceptable()) {
+                            SocketChannel socketChannel = listenChannel.accept();
+                            socketChannel.configureBlocking(Boolean.FALSE);
+                            socketChannel.register(selector, SelectionKey.OP_READ);
+                            log.info("The server has a new client connection :{}", socketChannel.getRemoteAddress());
+                        }
+                        //读取事件
+                        if (selectionKey.isReadable()) read(selectionKey);
+                        selectionKeyIterator.remove();
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //读取客户端消息
+    private void read(SelectionKey key) {
+        //取到关联的channel
+        SocketChannel channel = null;
+        try {
+            //得到channel
+            channel = (SocketChannel) key.channel();
+            channel.configureBlocking(Boolean.FALSE);
+            //创建buffer
+            ByteBuffer buffer = ByteBuffer.allocate(1024);
+            int count = channel.read(buffer);
+            if (count > 0) {
+                readData(buffer.array());
+            }
+        } catch (IOException e) {
+            try {
+                log.info("the client {} connection is disconnected", channel.getRemoteAddress());
+                //取消注册
+                key.cancel();
+                //关闭通道
+                channel.close();
+            } catch (IOException e2) {
+                e2.printStackTrace();
+            }
+        }
+    }
+
+
+    protected abstract void readData(byte[] data);
+
+}

warewms-ams/src/main/java/com/warewms/ams/thread/ClientHandler.java

@@ -1,10 +1,10 @@
-package com.warewms.ams.thread;
+package com.warewms.thread;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.warewms.ams.agv.ndc.common.ByteUtil;
-import com.warewms.ams.agv.ndc.common.CRC16Util;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.common.ByteUtil;
+import com.warewms.agv.ndc.common.CRC16Util;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.agv.ndc.service.IAmsTaskService;
 import com.warewms.common.constant.WmsConstant;
 import com.warewms.common.utils.redis.RedisCache;
 import com.warewms.system.entity.SysConfig;

warewms-ams/src/main/java/com/warewms/ams/thread/ServerGs.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.thread;
+package com.warewms.thread;
 
-import com.warewms.ams.agv.ndc.common.ByteUtil;
+import com.warewms.agv.ndc.common.ByteUtil;
 import com.warewms.common.constant.WmsConstant;
 import com.warewms.system.entity.SysConfig;
 import com.warewms.system.service.ISysConfigService;

warewms-ams/src/main/java/com/warewms/ams/wcs/controller/WcsController.java

@@ -1,7 +1,7 @@
-package com.warewms.ams.wcs.controller;
+package com.warewms.wcs.controller;
 
-import com.warewms.ams.wcs.form.BtnOpForm;
-import com.warewms.ams.wcs.service.IWcsService;
+import com.warewms.wcs.form.BtnOpForm;
+import com.warewms.wcs.service.IWcsService;
 import com.warewms.common.base.domain.AjaxResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

warewms-ams/src/main/java/com/warewms/ams/wcs/form/BtnOpForm.java

@@ -1,4 +1,4 @@
-package com.warewms.ams.wcs.form;
+package com.warewms.wcs.form;
 
 import lombok.Data;
 

warewms-ams/src/main/java/com/warewms/ams/wcs/service/IWcsService.java

@@ -1,6 +1,6 @@
-package com.warewms.ams.wcs.service;
+package com.warewms.wcs.service;
 
-import com.warewms.ams.wcs.form.BtnOpForm;
+import com.warewms.wcs.form.BtnOpForm;
 
 /**
  * 出库单头Service接口

warewms-ams/src/main/java/com/warewms/ams/wcs/service/impl/WcsServiceImpl.java

@@ -1,13 +1,13 @@
-package com.warewms.ams.wcs.service.impl;
+package com.warewms.wcs.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.warewms.ams.agv.ndc.common.ByteUtil;
-import com.warewms.ams.agv.ndc.common.CRC16Util;
-import com.warewms.ams.agv.ndc.domain.AmsTask;
-import com.warewms.ams.agv.ndc.service.IAmsTaskService;
-import com.warewms.ams.wcs.form.BtnOpForm;
-import com.warewms.ams.wcs.service.IWcsService;
+import com.warewms.agv.ndc.service.IAmsTaskService;
+import com.warewms.agv.ndc.common.ByteUtil;
+import com.warewms.agv.ndc.common.CRC16Util;
+import com.warewms.agv.ndc.domain.AmsTask;
+import com.warewms.wcs.form.BtnOpForm;
+import com.warewms.wcs.service.IWcsService;
 import com.warewms.common.constant.WmsConstant;
 import com.warewms.common.utils.redis.RedisCache;
 import lombok.extern.slf4j.Slf4j;

warewms-ams/src/main/resources/mapper/ams/AmsHexdefineDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ams.agv.ndc.mapper.AmsHexdefineDetailMapper">
+<mapper namespace="com.warewms.agv.ndc.mapper.AmsHexdefineDetailMapper">
     
     <resultMap type="AmsHexdefineDetail" id="AmsHexdefineDetailResult">
         <result property="id"    column="id"    />

warewms-ams/src/main/resources/mapper/ams/AmsHexdefineHeaderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ams.agv.ndc.mapper.AmsHexdefineHeaderMapper">
+<mapper namespace="com.warewms.agv.ndc.mapper.AmsHexdefineHeaderMapper">
     
     <resultMap type="AmsHexdefineHeader" id="AmsHexdefineHeaderResult">
         <result property="id"    column="id"    />

warewms-ams/src/main/resources/mapper/ams/AmsNdcEventMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ams.agv.ndc.mapper.AmsNdcEventMapper">
+<mapper namespace="com.warewms.agv.ndc.mapper.AmsNdcEventMapper">
     
     <resultMap type="AmsNdcEvent" id="AmsNdcEventResult">
         <result property="id"    column="id"    />

warewms-ams/src/main/resources/mapper/ams/AmsTaskMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ams.agv.ndc.mapper.AmsTaskMapper">
+<mapper namespace="com.warewms.agv.ndc.mapper.AmsTaskMapper">
     
     <resultMap type="AmsTask" id="AmsTaskResult">
         <result property="id"    column="id"    />

warewms-wms/src/main/resources/mapper/car/CarInfoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.warewms.wms.car.mapper.CarInfoMapper">
+<mapper namespace="com.warewms.agv.car.mapper.CarInfoMapper">
 
-    <resultMap type="com.warewms.wms.car.domain.CarInfo" id="CarInfoResult">
+    <resultMap type="CarInfo" id="CarInfoResult">
         <result column="id" property="id"/>
         <result column="carNo" property="carNo"/>
         <result column="warehouse_id" property="warehouseId"/>

warewms-hard/src/main/java/com/warewms/hard/modbus/tcp/AutoDoorClient.java

@@ -1,4 +1,4 @@
-package com.warewms.hard.modbus.tcp;
+package com.warewms.modbus.tcp;
 
 import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
 import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;

warewms-hard/src/main/java/com/warewms/hard/modbus/tcp/ButtonBoxClient.java

@@ -1,4 +1,4 @@
-package com.warewms.hard.modbus.tcp;
+package com.warewms.modbus.tcp;
 
 import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
 import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;

warewms-hard/src/main/java/com/warewms/hard/modbus/tcp/ChargingMachineClient.java

@@ -1,4 +1,4 @@
-package com.warewms.hard.modbus.tcp;
+package com.warewms.modbus.tcp;
 
 import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
 import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;

warewms-hard/src/main/java/com/warewms/hard/modbus/tcp/WarningLightClient.java

@@ -1,4 +1,4 @@
-package com.warewms.hard.modbus.tcp;
+package com.warewms.modbus.tcp;
 
 import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
 import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;

warewms-hard/src/main/java/com/warewms/hard/rfid/RFIDReaderClient.java

@@ -1,4 +1,4 @@
-package com.warewms.hard.rfid;
+package com.warewms.rfid;
 
 import com.jwk.spring.boot.autoconfigure.RfidReaderTemplate;
 import com.jwk.spring.boot.rfid.RfidReaderUtil;

warewms-wms/src/main/java/com/warewms/web/controller/tool/SwaggerController.java

@@ -1,4 +1,4 @@
-package com.warewms.web.controller.tool;
+package com.warewms.tool;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;

warewms-wms/src/main/java/com/warewms/web/controller/tool/TestController.java

@@ -1,4 +1,4 @@
-package com.warewms.web.controller.tool;
+package com.warewms.tool;
 
 import com.warewms.common.base.controller.BaseController;
 import com.warewms.common.base.domain.AjaxResult;