diff --git a/src/main/java/com/wms/bussiness/JobComponent.java b/src/main/java/com/wms/bussiness/JobComponent.java index 7126d40..9a68134 100644 --- a/src/main/java/com/wms/bussiness/JobComponent.java +++ b/src/main/java/com/wms/bussiness/JobComponent.java @@ -1,15 +1,13 @@ package com.wms.bussiness; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.wms.constants.enums.*; import com.wms.controller.BaseController; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.container.ContainerApiLocalResponse; -import com.wms.entity.app.container.CreateInstoreTaskRequest; -import com.wms.entity.app.container.SendContainerTaskRequest; -import com.wms.entity.app.wcs.WcsTask; -import com.wms.entity.table.*; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.app.container.ContainerApiLocalResponse; +import com.wms.model.entity.app.container.SendContainerTaskRequest; +import com.wms.model.entity.app.wcs.WcsTask; +import com.wms.model.entity.table.*; import com.wms.mapper.LocationMapper; import com.wms.mapper.StockMapper; import com.wms.mapper.TaskMapper; diff --git a/src/main/java/com/wms/bussiness/TaskOperation.java b/src/main/java/com/wms/bussiness/TaskOperation.java index 3539b1e..140a08b 100644 --- a/src/main/java/com/wms/bussiness/TaskOperation.java +++ b/src/main/java/com/wms/bussiness/TaskOperation.java @@ -1,12 +1,7 @@ package com.wms.bussiness; -import com.alibaba.fastjson2.JSON; import com.wms.constants.enums.*; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.mes.*; -import com.wms.entity.app.wcs.WmsReceiveTaskResultEntity; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.table.*; +import com.wms.model.entity.table.*; import com.wms.mapper.*; import com.wms.service.PartInfoService; import com.wms.utils.WmsUtils; diff --git a/src/main/java/com/wms/controller/ConfigController.java b/src/main/java/com/wms/controller/ConfigController.java index fd87336..00a53de 100644 --- a/src/main/java/com/wms/controller/ConfigController.java +++ b/src/main/java/com/wms/controller/ConfigController.java @@ -1,17 +1,10 @@ package com.wms.controller; import com.alibaba.fastjson2.JSON; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.page.PageDomain; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.Config; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.table.Config; import com.wms.service.ConfigService; -import com.wms.utils.HttpUtils; -import com.wms.utils.StringUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; import java.util.List; /** diff --git a/src/main/java/com/wms/controller/DisplayController.java b/src/main/java/com/wms/controller/DisplayController.java index 7b242b3..022db90 100644 --- a/src/main/java/com/wms/controller/DisplayController.java +++ b/src/main/java/com/wms/controller/DisplayController.java @@ -3,11 +3,11 @@ package com.wms.controller; import com.alibaba.fastjson2.JSON; import com.wms.constants.WmsConstants; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.display.LocationData; -import com.wms.entity.app.display.LocationInfo; -import com.wms.entity.table.Location; -import com.wms.entity.table.Stock; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.app.display.LocationData; +import com.wms.model.entity.app.display.LocationInfo; +import com.wms.model.entity.table.Location; +import com.wms.model.entity.table.Stock; import com.wms.service.LocationService; import com.wms.service.StockService; import com.wms.utils.HttpUtils; diff --git a/src/main/java/com/wms/controller/ExcelController.java b/src/main/java/com/wms/controller/ExcelController.java index 2ca6c60..09fc0d9 100644 --- a/src/main/java/com/wms/controller/ExcelController.java +++ b/src/main/java/com/wms/controller/ExcelController.java @@ -1,11 +1,10 @@ package com.wms.controller; import com.alibaba.fastjson2.JSON; -import com.wms.constants.enums.KateTaskStatus; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.excel.StockExcel; -import com.wms.entity.table.*; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.excel.StockExcel; +import com.wms.model.entity.table.*; import com.wms.service.*; import com.wms.utils.HttpUtils; @@ -20,7 +19,6 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/wms/controller/GoodsController.java b/src/main/java/com/wms/controller/GoodsController.java index 953ae92..1adfb64 100644 --- a/src/main/java/com/wms/controller/GoodsController.java +++ b/src/main/java/com/wms/controller/GoodsController.java @@ -4,14 +4,12 @@ import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.page.PageDomain; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.Goods; -import com.wms.entity.table.PartInfo; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.page.PageDomain; +import com.wms.model.entity.page.TableRequest; +import com.wms.model.entity.page.TableResponse; +import com.wms.model.entity.table.Goods; import com.wms.service.GoodsService; -import com.wms.service.PartInfoService; import com.wms.utils.HttpUtils; import com.wms.utils.StringUtils; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/wms/controller/LocationController.java b/src/main/java/com/wms/controller/LocationController.java index 4ee8f33..3282d0f 100644 --- a/src/main/java/com/wms/controller/LocationController.java +++ b/src/main/java/com/wms/controller/LocationController.java @@ -5,15 +5,15 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.wms.constants.enums.ResponseCode; import com.wms.constants.enums.VehicleStatus; -import com.wms.entity.app.LayerLocation; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.RowLocation; -import com.wms.entity.dto.locaiton.SelectArea; -import com.wms.entity.page.PageDomain; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.Location; -import com.wms.entity.table.Vehicle; +import com.wms.model.entity.app.LayerLocation; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.app.RowLocation; +import com.wms.model.entity.dto.locaiton.SelectArea; +import com.wms.model.entity.page.PageDomain; +import com.wms.model.entity.page.TableRequest; +import com.wms.model.entity.page.TableResponse; +import com.wms.model.entity.table.Location; +import com.wms.model.entity.table.Vehicle; import com.wms.constants.WmsConstants; import com.wms.constants.enums.LocationStatus; import com.wms.service.LocationService; @@ -31,7 +31,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.*; import java.util.*; -import java.util.stream.Collectors; /** * WMS库位控制类 diff --git a/src/main/java/com/wms/controller/OrderCheckController.java b/src/main/java/com/wms/controller/OrderCheckController.java index 2747349..52db1ea 100644 --- a/src/main/java/com/wms/controller/OrderCheckController.java +++ b/src/main/java/com/wms/controller/OrderCheckController.java @@ -1,8 +1,8 @@ package com.wms.controller; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderCheck.queryOrderCheckRequest; -import com.wms.entity.table.OrderCheck; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderCheck.queryOrderCheckRequest; +import com.wms.model.entity.table.OrderCheck; import com.wms.service.IOrderCheckService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/wms/controller/OrderInController.java b/src/main/java/com/wms/controller/OrderInController.java index b2c819b..3c21317 100644 --- a/src/main/java/com/wms/controller/OrderInController.java +++ b/src/main/java/com/wms/controller/OrderInController.java @@ -1,19 +1,17 @@ package com.wms.controller; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderIn.bindingVehicleRequest; -import com.wms.entity.dto.orderIn.downOrderInRequest; -import com.wms.entity.dto.orderIn.queryOrderInRequest; -import com.wms.entity.dto.orderIn.updateNumRequest; -import com.wms.entity.table.AppOrderIn; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderIn.bindingVehicleRequest; +import com.wms.model.entity.dto.orderIn.downOrderInRequest; +import com.wms.model.entity.dto.orderIn.queryOrderInRequest; +import com.wms.model.entity.dto.orderIn.updateNumRequest; +import com.wms.model.entity.table.AppOrderIn; import com.wms.service.IOrderInService; -import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; import java.util.List; @Slf4j diff --git a/src/main/java/com/wms/controller/OrderOutController.java b/src/main/java/com/wms/controller/OrderOutController.java index 9073c02..440e1a2 100644 --- a/src/main/java/com/wms/controller/OrderOutController.java +++ b/src/main/java/com/wms/controller/OrderOutController.java @@ -1,10 +1,10 @@ package com.wms.controller; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderOut.handOrderOutRequest; -import com.wms.entity.dto.orderOut.queryOrderOutRequest; -import com.wms.entity.table.OrderOut; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderOut.handOrderOutRequest; +import com.wms.model.entity.dto.orderOut.queryOrderOutRequest; +import com.wms.model.entity.table.OrderOut; import com.wms.service.IOrderOutService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/wms/controller/RecordController.java b/src/main/java/com/wms/controller/RecordController.java index d941181..f04022b 100644 --- a/src/main/java/com/wms/controller/RecordController.java +++ b/src/main/java/com/wms/controller/RecordController.java @@ -4,11 +4,10 @@ import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.page.PageDomain; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.Task; -import com.wms.service.TaskRecordService; +import com.wms.model.entity.page.PageDomain; +import com.wms.model.entity.page.TableRequest; +import com.wms.model.entity.page.TableResponse; +import com.wms.model.entity.table.Task; import com.wms.service.TaskService; import com.wms.utils.HttpUtils; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/wms/controller/StandController.java b/src/main/java/com/wms/controller/StandController.java index 28d1455..6939055 100644 --- a/src/main/java/com/wms/controller/StandController.java +++ b/src/main/java/com/wms/controller/StandController.java @@ -5,11 +5,11 @@ import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.page.PageDomain; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.Stand; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.page.PageDomain; +import com.wms.model.entity.page.TableRequest; +import com.wms.model.entity.page.TableResponse; +import com.wms.model.entity.table.Stand; import com.wms.service.StandService; import com.wms.utils.HttpUtils; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/wms/controller/StockController.java b/src/main/java/com/wms/controller/StockController.java index d30eec3..aa8ccef 100644 --- a/src/main/java/com/wms/controller/StockController.java +++ b/src/main/java/com/wms/controller/StockController.java @@ -5,18 +5,15 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.wms.constants.enums.LocationStatus; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.dto.stock.StockQueryReuqest; -import com.wms.entity.page.PageDomain; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.Goods; -import com.wms.entity.table.Location; -import com.wms.entity.table.PartInfo; -import com.wms.entity.table.Stock; -import com.wms.entity.vo.StockVO; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.dto.stock.StockQueryReuqest; +import com.wms.model.entity.page.PageDomain; +import com.wms.model.entity.page.TableRequest; +import com.wms.model.entity.page.TableResponse; +import com.wms.model.entity.table.Location; +import com.wms.model.entity.table.Stock; +import com.wms.model.entity.vo.StockVO; import com.wms.mapper.LocationMapper; -import com.wms.mapper.StockMapper; import com.wms.service.StockService; import com.wms.utils.HttpUtils; import com.wms.utils.StringUtils; diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java index f8ada6d..07a02a0 100644 --- a/src/main/java/com/wms/controller/TaskController.java +++ b/src/main/java/com/wms/controller/TaskController.java @@ -4,14 +4,14 @@ import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.wms.constants.enums.*; -import com.wms.entity.app.*; -import com.wms.entity.app.wcs.*; -import com.wms.entity.page.PageDomain; +import com.wms.model.entity.app.*; +import com.wms.model.entity.app.wcs.*; +import com.wms.model.entity.page.PageDomain; import com.wms.mapper.StockMapper; import com.wms.mapper.TaskMapper; -import com.wms.entity.page.TableRequest; -import com.wms.entity.page.TableResponse; -import com.wms.entity.table.*; +import com.wms.model.entity.page.TableRequest; +import com.wms.model.entity.page.TableResponse; +import com.wms.model.entity.table.*; import com.wms.constants.WmsConstants; import com.wms.utils.storage.LocationUtils; import com.wms.service.*; diff --git a/src/main/java/com/wms/controller/TaskDealController.java b/src/main/java/com/wms/controller/TaskDealController.java index 7819728..aa20ba2 100644 --- a/src/main/java/com/wms/controller/TaskDealController.java +++ b/src/main/java/com/wms/controller/TaskDealController.java @@ -2,11 +2,11 @@ package com.wms.controller; import com.alibaba.fastjson2.JSON; import com.wms.constants.enums.*; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.table.Location; -import com.wms.entity.app.wcs.WmsReceiveTaskResultEntity; -import com.wms.entity.table.Stock; -import com.wms.entity.table.Task; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.table.Location; +import com.wms.model.entity.app.wcs.WmsReceiveTaskResultEntity; +import com.wms.model.entity.table.Stock; +import com.wms.model.entity.table.Task; import com.wms.service.LocationService; import com.wms.service.StockService; import com.wms.service.TaskService; @@ -20,10 +20,8 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import java.util.Collections; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/wms/controller/TestController.java b/src/main/java/com/wms/controller/TestController.java index 82cae69..5a31ea1 100644 --- a/src/main/java/com/wms/controller/TestController.java +++ b/src/main/java/com/wms/controller/TestController.java @@ -4,11 +4,11 @@ import com.alibaba.fastjson2.JSON; import com.wms.constants.enums.LocationStatus; import com.wms.constants.enums.ResponseCode; import com.wms.constants.enums.VehicleStatus; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.table.Location; -import com.wms.entity.table.User; -import com.wms.entity.table.Vehicle; -import com.wms.entity.test.ExcelTest; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.table.Location; +import com.wms.model.entity.table.User; +import com.wms.model.entity.table.Vehicle; +import com.wms.model.entity.test.ExcelTest; import com.wms.service.LocationService; import com.wms.service.VehicleService; import com.wms.utils.MyPassword; diff --git a/src/main/java/com/wms/controller/UserController.java b/src/main/java/com/wms/controller/UserController.java index 6357295..e97508e 100644 --- a/src/main/java/com/wms/controller/UserController.java +++ b/src/main/java/com/wms/controller/UserController.java @@ -2,11 +2,11 @@ package com.wms.controller; import com.alibaba.fastjson2.JSON; import com.wms.constants.enums.ResponseCode; -import com.wms.entity.app.MenuEntity; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.UserConfigEntity; -import com.wms.entity.table.Menu; -import com.wms.entity.table.User; +import com.wms.model.entity.app.MenuEntity; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.app.UserConfigEntity; +import com.wms.model.entity.table.Menu; +import com.wms.model.entity.table.User; import com.wms.service.MenuService; import com.wms.service.UserService; import com.wms.utils.MyPassword; diff --git a/src/main/java/com/wms/controller/others/ContainerController.java b/src/main/java/com/wms/controller/others/ContainerController.java index 1e4f0b2..f582f24 100644 --- a/src/main/java/com/wms/controller/others/ContainerController.java +++ b/src/main/java/com/wms/controller/others/ContainerController.java @@ -2,7 +2,7 @@ package com.wms.controller.others; import com.alibaba.fastjson2.JSON; import com.wms.controller.BaseController; -import com.wms.entity.app.container.*; +import com.wms.model.entity.app.container.*; import com.wms.service.ContainerService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -38,7 +38,7 @@ public class ContainerController extends BaseController { log.info("四向车扫码入库信息返回：{}", JSON.toJSONString(instoreTask)); return instoreTask; }catch (Exception e){ - log.info("四向车扫码入库失败，出现异常，请稍后再试"); + log.error("四向车扫码入库失败，出现异常，请稍后再试",e); return new CreateInstoreTaskResponse("400", "四向车扫码入库异常,请稍后再试"); } diff --git a/src/main/java/com/wms/controller/others/MesController.java b/src/main/java/com/wms/controller/others/MesController.java index 7d5b8c5..4a98d20 100644 --- a/src/main/java/com/wms/controller/others/MesController.java +++ b/src/main/java/com/wms/controller/others/MesController.java @@ -1,10 +1,10 @@ package com.wms.controller.others; import com.wms.controller.BaseController; -import com.wms.entity.app.mes.CheckNoticeRequest; -import com.wms.entity.app.mes.MesApiLocalResponse; -import com.wms.entity.app.mes.OutNoticeRequest; -import com.wms.entity.app.mes.ReceiptInRequest; +import com.wms.model.entity.app.mes.CheckNoticeRequest; +import com.wms.model.entity.app.mes.MesApiLocalResponse; +import com.wms.model.entity.app.mes.OutNoticeRequest; +import com.wms.model.entity.app.mes.ReceiptInRequest; import com.wms.service.MesService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/controller/others/WcsController.java b/src/main/java/com/wms/controller/others/WcsController.java index cf917f2..1cc4bd8 100644 --- a/src/main/java/com/wms/controller/others/WcsController.java +++ b/src/main/java/com/wms/controller/others/WcsController.java @@ -1,16 +1,11 @@ package com.wms.controller.others; -import com.alibaba.fastjson2.JSON; import com.wms.bussiness.TaskOperation; import com.wms.constants.enums.*; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.container.ContainerApiLocalResponse; -import com.wms.entity.app.mes.MesApiLocalResponse; -import com.wms.entity.app.mes.SendMesPutInGoodsRequest; -import com.wms.entity.app.wcs.RequireInRequest; -import com.wms.entity.app.wcs.WmsReceiveTaskResultEntity; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.table.*; +import com.wms.model.entity.app.ResponseEntity; +import com.wms.model.entity.app.wcs.RequireInRequest; +import com.wms.model.entity.app.wcs.WmsReceiveTaskResultEntity; +import com.wms.model.entity.table.*; import com.wms.mapper.LocationMapper; import com.wms.mapper.StockMapper; import com.wms.mapper.TaskMapper; @@ -31,9 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; @Slf4j diff --git a/src/main/java/com/wms/filter/GlobalExceptionHandler.java b/src/main/java/com/wms/filter/GlobalExceptionHandler.java index 937c5db..e6ee760 100644 --- a/src/main/java/com/wms/filter/GlobalExceptionHandler.java +++ b/src/main/java/com/wms/filter/GlobalExceptionHandler.java @@ -3,8 +3,8 @@ package com.wms.filter; import com.alibaba.fastjson.JSON; import com.wms.common.BaseResponse; import com.wms.common.ResultUtils; -import com.wms.entity.app.container.ContainerApiLocalResponse; -import com.wms.entity.app.mes.MesApiLocalResponse; +import com.wms.model.entity.app.container.ContainerApiLocalResponse; +import com.wms.model.entity.app.mes.MesApiLocalResponse; import com.wms.exception.BusinessException; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.validation.ObjectError; import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/src/main/java/com/wms/mapper/AppOrderInMapper.java b/src/main/java/com/wms/mapper/AppOrderInMapper.java index 48f031f..2bf6ec4 100644 --- a/src/main/java/com/wms/mapper/AppOrderInMapper.java +++ b/src/main/java/com/wms/mapper/AppOrderInMapper.java @@ -1,13 +1,10 @@ package com.wms.mapper; -import com.wms.entity.table.AppOrderIn; -import com.wms.entity.table.Location; -import com.wms.entity.table.OrderOut; -import com.wms.entity.table.Vehicle; +import com.wms.model.entity.table.AppOrderIn; +import com.wms.model.entity.table.Location; import org.apache.ibatis.annotations.Param; import org.mapstruct.Mapper; -import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/wms/mapper/ConfigMapper.java b/src/main/java/com/wms/mapper/ConfigMapper.java index 55d19c7..b4e1f56 100644 --- a/src/main/java/com/wms/mapper/ConfigMapper.java +++ b/src/main/java/com/wms/mapper/ConfigMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Config; +import com.wms.model.entity.table.Config; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/GoodsMapper.java b/src/main/java/com/wms/mapper/GoodsMapper.java index f0eb812..842f6ca 100644 --- a/src/main/java/com/wms/mapper/GoodsMapper.java +++ b/src/main/java/com/wms/mapper/GoodsMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Goods; +import com.wms.model.entity.table.Goods; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/LocationMapper.java b/src/main/java/com/wms/mapper/LocationMapper.java index c2f529b..619630e 100644 --- a/src/main/java/com/wms/mapper/LocationMapper.java +++ b/src/main/java/com/wms/mapper/LocationMapper.java @@ -1,7 +1,7 @@ package com.wms.mapper; -import com.wms.entity.dto.locaiton.SelectArea; -import com.wms.entity.table.Location; +import com.wms.model.entity.dto.locaiton.SelectArea; +import com.wms.model.entity.table.Location; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/MenuMapper.java b/src/main/java/com/wms/mapper/MenuMapper.java index 6512fc5..55cebb2 100644 --- a/src/main/java/com/wms/mapper/MenuMapper.java +++ b/src/main/java/com/wms/mapper/MenuMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Menu; +import com.wms.model.entity.table.Menu; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/OrderCheckMapper.java b/src/main/java/com/wms/mapper/OrderCheckMapper.java index 0e2d17f..8891568 100644 --- a/src/main/java/com/wms/mapper/OrderCheckMapper.java +++ b/src/main/java/com/wms/mapper/OrderCheckMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.OrderCheck; +import com.wms.model.entity.table.OrderCheck; import org.mapstruct.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/OrderOutMapper.java b/src/main/java/com/wms/mapper/OrderOutMapper.java index 7bfdf69..8e9209b 100644 --- a/src/main/java/com/wms/mapper/OrderOutMapper.java +++ b/src/main/java/com/wms/mapper/OrderOutMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.OrderOut; +import com.wms.model.entity.table.OrderOut; import org.apache.ibatis.annotations.Param; import org.mapstruct.Mapper; diff --git a/src/main/java/com/wms/mapper/PartInfoMapper.java b/src/main/java/com/wms/mapper/PartInfoMapper.java index 5f2c9e5..4dd4b05 100644 --- a/src/main/java/com/wms/mapper/PartInfoMapper.java +++ b/src/main/java/com/wms/mapper/PartInfoMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.PartInfo; +import com.wms.model.entity.table.PartInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/StandMapper.java b/src/main/java/com/wms/mapper/StandMapper.java index cedcf7d..21ef09d 100644 --- a/src/main/java/com/wms/mapper/StandMapper.java +++ b/src/main/java/com/wms/mapper/StandMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Stand; +import com.wms.model.entity.table.Stand; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/StockMapper.java b/src/main/java/com/wms/mapper/StockMapper.java index c8da4eb..75c34f5 100644 --- a/src/main/java/com/wms/mapper/StockMapper.java +++ b/src/main/java/com/wms/mapper/StockMapper.java @@ -1,8 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.AppOrderIn; -import com.wms.entity.table.Stock; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Stock; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/wms/mapper/TaskMapper.java b/src/main/java/com/wms/mapper/TaskMapper.java index ecaa32f..c4a77f0 100644 --- a/src/main/java/com/wms/mapper/TaskMapper.java +++ b/src/main/java/com/wms/mapper/TaskMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Task; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/TaskRecordMapper.java b/src/main/java/com/wms/mapper/TaskRecordMapper.java index f100620..f2f2274 100644 --- a/src/main/java/com/wms/mapper/TaskRecordMapper.java +++ b/src/main/java/com/wms/mapper/TaskRecordMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Task; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/UserMapper.java b/src/main/java/com/wms/mapper/UserMapper.java index 9538961..cb6fb0e 100644 --- a/src/main/java/com/wms/mapper/UserMapper.java +++ b/src/main/java/com/wms/mapper/UserMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.User; +import com.wms.model.entity.table.User; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/mapper/VehicleMapper.java b/src/main/java/com/wms/mapper/VehicleMapper.java index c7aa4e8..c14d5e2 100644 --- a/src/main/java/com/wms/mapper/VehicleMapper.java +++ b/src/main/java/com/wms/mapper/VehicleMapper.java @@ -1,6 +1,6 @@ package com.wms.mapper; -import com.wms.entity.table.Vehicle; +import com.wms.model.entity.table.Vehicle; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/wms/entity/BaseEntity.java b/src/main/java/com/wms/model/entity/BaseEntity.java similarity index 83% rename from src/main/java/com/wms/entity/BaseEntity.java rename to src/main/java/com/wms/model/entity/BaseEntity.java index 36ab926..88af6a3 100644 --- a/src/main/java/com/wms/entity/BaseEntity.java +++ b/src/main/java/com/wms/model/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.wms.entity; +package com.wms.model.entity; import com.alibaba.fastjson2.JSON; diff --git a/src/main/java/com/wms/entity/app/FinishPickTaskRequest.java b/src/main/java/com/wms/model/entity/app/FinishPickTaskRequest.java similarity index 98% rename from src/main/java/com/wms/entity/app/FinishPickTaskRequest.java rename to src/main/java/com/wms/model/entity/app/FinishPickTaskRequest.java index 77377bd..8d33a75 100644 --- a/src/main/java/com/wms/entity/app/FinishPickTaskRequest.java +++ b/src/main/java/com/wms/model/entity/app/FinishPickTaskRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; /** * 完成当前载具拣货任务实体类 diff --git a/src/main/java/com/wms/entity/app/FinishVehicleAndPartRequest.java b/src/main/java/com/wms/model/entity/app/FinishVehicleAndPartRequest.java similarity index 94% rename from src/main/java/com/wms/entity/app/FinishVehicleAndPartRequest.java rename to src/main/java/com/wms/model/entity/app/FinishVehicleAndPartRequest.java index 0b57214..ebb252a 100644 --- a/src/main/java/com/wms/entity/app/FinishVehicleAndPartRequest.java +++ b/src/main/java/com/wms/model/entity/app/FinishVehicleAndPartRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; /** * 完成当前载具的当次拣货任务 diff --git a/src/main/java/com/wms/entity/app/InventoryTask.java b/src/main/java/com/wms/model/entity/app/InventoryTask.java similarity index 92% rename from src/main/java/com/wms/entity/app/InventoryTask.java rename to src/main/java/com/wms/model/entity/app/InventoryTask.java index bba21a6..503fe54 100644 --- a/src/main/java/com/wms/entity/app/InventoryTask.java +++ b/src/main/java/com/wms/model/entity/app/InventoryTask.java @@ -1,6 +1,6 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 盘点任务信息 diff --git a/src/main/java/com/wms/entity/app/LayerLocation.java b/src/main/java/com/wms/model/entity/app/LayerLocation.java similarity index 88% rename from src/main/java/com/wms/entity/app/LayerLocation.java rename to src/main/java/com/wms/model/entity/app/LayerLocation.java index 956a04f..69ddc60 100644 --- a/src/main/java/com/wms/entity/app/LayerLocation.java +++ b/src/main/java/com/wms/model/entity/app/LayerLocation.java @@ -1,6 +1,6 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; -import com.wms.entity.table.Location; +import com.wms.model.entity.table.Location; import java.util.List; diff --git a/src/main/java/com/wms/entity/app/MenuEntity.java b/src/main/java/com/wms/model/entity/app/MenuEntity.java similarity index 97% rename from src/main/java/com/wms/entity/app/MenuEntity.java rename to src/main/java/com/wms/model/entity/app/MenuEntity.java index a779176..5877c6a 100644 --- a/src/main/java/com/wms/entity/app/MenuEntity.java +++ b/src/main/java/com/wms/model/entity/app/MenuEntity.java @@ -1,4 +1,4 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; import java.util.List; diff --git a/src/main/java/com/wms/entity/app/ResponseEntity.java b/src/main/java/com/wms/model/entity/app/ResponseEntity.java similarity index 93% rename from src/main/java/com/wms/entity/app/ResponseEntity.java rename to src/main/java/com/wms/model/entity/app/ResponseEntity.java index 53053e2..2da238c 100644 --- a/src/main/java/com/wms/entity/app/ResponseEntity.java +++ b/src/main/java/com/wms/model/entity/app/ResponseEntity.java @@ -1,6 +1,6 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 接口响应实体类 diff --git a/src/main/java/com/wms/entity/app/RowLocation.java b/src/main/java/com/wms/model/entity/app/RowLocation.java similarity index 94% rename from src/main/java/com/wms/entity/app/RowLocation.java rename to src/main/java/com/wms/model/entity/app/RowLocation.java index d90d50a..00f3e2e 100644 --- a/src/main/java/com/wms/entity/app/RowLocation.java +++ b/src/main/java/com/wms/model/entity/app/RowLocation.java @@ -1,4 +1,4 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; import java.util.List; diff --git a/src/main/java/com/wms/entity/app/TaskInRequestEntity.java b/src/main/java/com/wms/model/entity/app/TaskInRequestEntity.java similarity index 97% rename from src/main/java/com/wms/entity/app/TaskInRequestEntity.java rename to src/main/java/com/wms/model/entity/app/TaskInRequestEntity.java index bd54e4a..7be57a6 100644 --- a/src/main/java/com/wms/entity/app/TaskInRequestEntity.java +++ b/src/main/java/com/wms/model/entity/app/TaskInRequestEntity.java @@ -1,6 +1,6 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import java.util.Date; diff --git a/src/main/java/com/wms/entity/app/TaskOutRequestEntity.java b/src/main/java/com/wms/model/entity/app/TaskOutRequestEntity.java similarity index 93% rename from src/main/java/com/wms/entity/app/TaskOutRequestEntity.java rename to src/main/java/com/wms/model/entity/app/TaskOutRequestEntity.java index f505193..d69aea1 100644 --- a/src/main/java/com/wms/entity/app/TaskOutRequestEntity.java +++ b/src/main/java/com/wms/model/entity/app/TaskOutRequestEntity.java @@ -1,6 +1,6 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 前台向后台发送出库请求实体类 diff --git a/src/main/java/com/wms/entity/app/UserConfigEntity.java b/src/main/java/com/wms/model/entity/app/UserConfigEntity.java similarity index 82% rename from src/main/java/com/wms/entity/app/UserConfigEntity.java rename to src/main/java/com/wms/model/entity/app/UserConfigEntity.java index b09116c..7efc1fb 100644 --- a/src/main/java/com/wms/entity/app/UserConfigEntity.java +++ b/src/main/java/com/wms/model/entity/app/UserConfigEntity.java @@ -1,7 +1,7 @@ -package com.wms.entity.app; +package com.wms.model.entity.app; -import com.wms.entity.table.User; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.table.User; +import com.wms.model.entity.BaseEntity; import java.util.List; diff --git a/src/main/java/com/wms/entity/app/container/ContainerApiLocalResponse.java b/src/main/java/com/wms/model/entity/app/container/ContainerApiLocalResponse.java similarity index 94% rename from src/main/java/com/wms/entity/app/container/ContainerApiLocalResponse.java rename to src/main/java/com/wms/model/entity/app/container/ContainerApiLocalResponse.java index 5ec7700..86e143c 100644 --- a/src/main/java/com/wms/entity/app/container/ContainerApiLocalResponse.java +++ b/src/main/java/com/wms/model/entity/app/container/ContainerApiLocalResponse.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskRequest.java b/src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskRequest.java similarity index 91% rename from src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskRequest.java rename to src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskRequest.java index d1e13f9..f361653 100644 --- a/src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskRequest.java +++ b/src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskResponse.java b/src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskResponse.java similarity index 91% rename from src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskResponse.java rename to src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskResponse.java index d383605..ac6e7a1 100644 --- a/src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskResponse.java +++ b/src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskResponse.java @@ -1,8 +1,7 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.validation.constraints.NotBlank; import lombok.Data; @Data diff --git a/src/main/java/com/wms/entity/app/container/CreateInstoreTaskRequest.java b/src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskRequest.java similarity index 96% rename from src/main/java/com/wms/entity/app/container/CreateInstoreTaskRequest.java rename to src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskRequest.java index 93cd9da..c1cae7b 100644 --- a/src/main/java/com/wms/entity/app/container/CreateInstoreTaskRequest.java +++ b/src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/wms/entity/app/container/CreateInstoreTaskResponse.java b/src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskResponse.java similarity index 95% rename from src/main/java/com/wms/entity/app/container/CreateInstoreTaskResponse.java rename to src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskResponse.java index 2808b93..5b9f87f 100644 --- a/src/main/java/com/wms/entity/app/container/CreateInstoreTaskResponse.java +++ b/src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskResponse.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/container/SendContainerTaskRequest.java b/src/main/java/com/wms/model/entity/app/container/SendContainerTaskRequest.java similarity index 94% rename from src/main/java/com/wms/entity/app/container/SendContainerTaskRequest.java rename to src/main/java/com/wms/model/entity/app/container/SendContainerTaskRequest.java index bd1f11d..123a45d 100644 --- a/src/main/java/com/wms/entity/app/container/SendContainerTaskRequest.java +++ b/src/main/java/com/wms/model/entity/app/container/SendContainerTaskRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/container/TaskStateNoticeRequest.java b/src/main/java/com/wms/model/entity/app/container/TaskStateNoticeRequest.java similarity index 93% rename from src/main/java/com/wms/entity/app/container/TaskStateNoticeRequest.java rename to src/main/java/com/wms/model/entity/app/container/TaskStateNoticeRequest.java index 8f5d818..aaf0e42 100644 --- a/src/main/java/com/wms/entity/app/container/TaskStateNoticeRequest.java +++ b/src/main/java/com/wms/model/entity/app/container/TaskStateNoticeRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.container; +package com.wms.model.entity.app.container; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/wms/entity/app/display/LocationData.java b/src/main/java/com/wms/model/entity/app/display/LocationData.java similarity index 95% rename from src/main/java/com/wms/entity/app/display/LocationData.java rename to src/main/java/com/wms/model/entity/app/display/LocationData.java index 2c9f2b9..21bdea6 100644 --- a/src/main/java/com/wms/entity/app/display/LocationData.java +++ b/src/main/java/com/wms/model/entity/app/display/LocationData.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.display; +package com.wms.model.entity.app.display; /** * 大屏用数据详细类 diff --git a/src/main/java/com/wms/entity/app/display/LocationInfo.java b/src/main/java/com/wms/model/entity/app/display/LocationInfo.java similarity index 95% rename from src/main/java/com/wms/entity/app/display/LocationInfo.java rename to src/main/java/com/wms/model/entity/app/display/LocationInfo.java index 10eeee1..9b10599 100644 --- a/src/main/java/com/wms/entity/app/display/LocationInfo.java +++ b/src/main/java/com/wms/model/entity/app/display/LocationInfo.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.display; +package com.wms.model.entity.app.display; import java.util.List; diff --git a/src/main/java/com/wms/entity/app/mes/CheckNoticeRequest.java b/src/main/java/com/wms/model/entity/app/mes/CheckNoticeRequest.java similarity index 94% rename from src/main/java/com/wms/entity/app/mes/CheckNoticeRequest.java rename to src/main/java/com/wms/model/entity/app/mes/CheckNoticeRequest.java index bbe310e..f670864 100644 --- a/src/main/java/com/wms/entity/app/mes/CheckNoticeRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/CheckNoticeRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/wms/entity/app/mes/MesApiLocalResponse.java b/src/main/java/com/wms/model/entity/app/mes/MesApiLocalResponse.java similarity index 93% rename from src/main/java/com/wms/entity/app/mes/MesApiLocalResponse.java rename to src/main/java/com/wms/model/entity/app/mes/MesApiLocalResponse.java index 7b3372e..f858e23 100644 --- a/src/main/java/com/wms/entity/app/mes/MesApiLocalResponse.java +++ b/src/main/java/com/wms/model/entity/app/mes/MesApiLocalResponse.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/OutNoticeRequest.java b/src/main/java/com/wms/model/entity/app/mes/OutNoticeRequest.java similarity index 93% rename from src/main/java/com/wms/entity/app/mes/OutNoticeRequest.java rename to src/main/java/com/wms/model/entity/app/mes/OutNoticeRequest.java index 2052d5a..fe47f44 100644 --- a/src/main/java/com/wms/entity/app/mes/OutNoticeRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/OutNoticeRequest.java @@ -1,14 +1,11 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import lombok.Data; -import java.util.List; - /** * Mes 出货通单请求信息 */ diff --git a/src/main/java/com/wms/entity/app/mes/OutNoticeRequestRow.java b/src/main/java/com/wms/model/entity/app/mes/OutNoticeRequestRow.java similarity index 96% rename from src/main/java/com/wms/entity/app/mes/OutNoticeRequestRow.java rename to src/main/java/com/wms/model/entity/app/mes/OutNoticeRequestRow.java index 2f986e7..6920188 100644 --- a/src/main/java/com/wms/entity/app/mes/OutNoticeRequestRow.java +++ b/src/main/java/com/wms/model/entity/app/mes/OutNoticeRequestRow.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/wms/entity/app/mes/ReceiptInRequest.java b/src/main/java/com/wms/model/entity/app/mes/ReceiptInRequest.java similarity index 95% rename from src/main/java/com/wms/entity/app/mes/ReceiptInRequest.java rename to src/main/java/com/wms/model/entity/app/mes/ReceiptInRequest.java index 14a4ca9..60203c9 100644 --- a/src/main/java/com/wms/entity/app/mes/ReceiptInRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/ReceiptInRequest.java @@ -1,9 +1,8 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import lombok.Data; /** diff --git a/src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRequest.java b/src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRequest.java similarity index 90% rename from src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRequest.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRequest.java index cf32d22..9e3c2be 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRow.java b/src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRow.java similarity index 88% rename from src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRow.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRow.java index 2e90e21..42ef0bc 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRow.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRow.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/SendMesGoodsMoveRequest.java b/src/main/java/com/wms/model/entity/app/mes/SendMesGoodsMoveRequest.java similarity index 92% rename from src/main/java/com/wms/entity/app/mes/SendMesGoodsMoveRequest.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesGoodsMoveRequest.java index de048c8..cc5a090 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesGoodsMoveRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesGoodsMoveRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/SendMesPutInGoodsRequest.java b/src/main/java/com/wms/model/entity/app/mes/SendMesPutInGoodsRequest.java similarity index 93% rename from src/main/java/com/wms/entity/app/mes/SendMesPutInGoodsRequest.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesPutInGoodsRequest.java index cce0bc2..8e7ac30 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesPutInGoodsRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesPutInGoodsRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRequest.java b/src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRequest.java similarity index 91% rename from src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRequest.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRequest.java index 3e670b7..78f3578 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRow.java b/src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRow.java similarity index 92% rename from src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRow.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRow.java index c304c9d..eb2cca3 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRow.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRow.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/mes/SendMesStockRequest.java b/src/main/java/com/wms/model/entity/app/mes/SendMesStockRequest.java similarity index 93% rename from src/main/java/com/wms/entity/app/mes/SendMesStockRequest.java rename to src/main/java/com/wms/model/entity/app/mes/SendMesStockRequest.java index 2d9397f..78d00ed 100644 --- a/src/main/java/com/wms/entity/app/mes/SendMesStockRequest.java +++ b/src/main/java/com/wms/model/entity/app/mes/SendMesStockRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.mes; +package com.wms.model.entity.app.mes; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/app/wcs/DisposeStandRequest.java b/src/main/java/com/wms/model/entity/app/wcs/DisposeStandRequest.java similarity index 94% rename from src/main/java/com/wms/entity/app/wcs/DisposeStandRequest.java rename to src/main/java/com/wms/model/entity/app/wcs/DisposeStandRequest.java index 9de2ab6..ea7cd03 100644 --- a/src/main/java/com/wms/entity/app/wcs/DisposeStandRequest.java +++ b/src/main/java/com/wms/model/entity/app/wcs/DisposeStandRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; public class DisposeStandRequest { /** diff --git a/src/main/java/com/wms/entity/app/wcs/PickTaskRequest.java b/src/main/java/com/wms/model/entity/app/wcs/PickTaskRequest.java similarity index 95% rename from src/main/java/com/wms/entity/app/wcs/PickTaskRequest.java rename to src/main/java/com/wms/model/entity/app/wcs/PickTaskRequest.java index 036c48c..4236371 100644 --- a/src/main/java/com/wms/entity/app/wcs/PickTaskRequest.java +++ b/src/main/java/com/wms/model/entity/app/wcs/PickTaskRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; import java.util.List; diff --git a/src/main/java/com/wms/entity/app/wcs/PickTaskResponse.java b/src/main/java/com/wms/model/entity/app/wcs/PickTaskResponse.java similarity index 94% rename from src/main/java/com/wms/entity/app/wcs/PickTaskResponse.java rename to src/main/java/com/wms/model/entity/app/wcs/PickTaskResponse.java index 6d1f449..d0df4e8 100644 --- a/src/main/java/com/wms/entity/app/wcs/PickTaskResponse.java +++ b/src/main/java/com/wms/model/entity/app/wcs/PickTaskResponse.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; public class PickTaskResponse { /** diff --git a/src/main/java/com/wms/entity/app/wcs/RequireInRequest.java b/src/main/java/com/wms/model/entity/app/wcs/RequireInRequest.java similarity index 96% rename from src/main/java/com/wms/entity/app/wcs/RequireInRequest.java rename to src/main/java/com/wms/model/entity/app/wcs/RequireInRequest.java index 37972a6..cbf2c95 100644 --- a/src/main/java/com/wms/entity/app/wcs/RequireInRequest.java +++ b/src/main/java/com/wms/model/entity/app/wcs/RequireInRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/wms/entity/app/wcs/WcsGoods.java b/src/main/java/com/wms/model/entity/app/wcs/WcsGoods.java similarity index 94% rename from src/main/java/com/wms/entity/app/wcs/WcsGoods.java rename to src/main/java/com/wms/model/entity/app/wcs/WcsGoods.java index 227b094..1c39f29 100644 --- a/src/main/java/com/wms/entity/app/wcs/WcsGoods.java +++ b/src/main/java/com/wms/model/entity/app/wcs/WcsGoods.java @@ -1,6 +1,6 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import java.math.BigDecimal; diff --git a/src/main/java/com/wms/entity/app/wcs/WcsTask.java b/src/main/java/com/wms/model/entity/app/wcs/WcsTask.java similarity index 97% rename from src/main/java/com/wms/entity/app/wcs/WcsTask.java rename to src/main/java/com/wms/model/entity/app/wcs/WcsTask.java index f3d697f..173cebc 100644 --- a/src/main/java/com/wms/entity/app/wcs/WcsTask.java +++ b/src/main/java/com/wms/model/entity/app/wcs/WcsTask.java @@ -1,6 +1,6 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * WMS向WCS发送任务请求的实体类 diff --git a/src/main/java/com/wms/entity/app/wcs/WcsToWmsInspectVesselEntity.java b/src/main/java/com/wms/model/entity/app/wcs/WcsToWmsInspectVesselEntity.java similarity index 95% rename from src/main/java/com/wms/entity/app/wcs/WcsToWmsInspectVesselEntity.java rename to src/main/java/com/wms/model/entity/app/wcs/WcsToWmsInspectVesselEntity.java index dea894b..bc91d92 100644 --- a/src/main/java/com/wms/entity/app/wcs/WcsToWmsInspectVesselEntity.java +++ b/src/main/java/com/wms/model/entity/app/wcs/WcsToWmsInspectVesselEntity.java @@ -1,6 +1,6 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import java.math.BigDecimal; diff --git a/src/main/java/com/wms/entity/app/wcs/WmsReceiveTaskResultEntity.java b/src/main/java/com/wms/model/entity/app/wcs/WmsReceiveTaskResultEntity.java similarity index 94% rename from src/main/java/com/wms/entity/app/wcs/WmsReceiveTaskResultEntity.java rename to src/main/java/com/wms/model/entity/app/wcs/WmsReceiveTaskResultEntity.java index 96d0332..e9a9ae3 100644 --- a/src/main/java/com/wms/entity/app/wcs/WmsReceiveTaskResultEntity.java +++ b/src/main/java/com/wms/model/entity/app/wcs/WmsReceiveTaskResultEntity.java @@ -1,6 +1,6 @@ -package com.wms.entity.app.wcs; +package com.wms.model.entity.app.wcs; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/wms/entity/common/WmsApiResponse.java b/src/main/java/com/wms/model/entity/common/WmsApiResponse.java similarity index 92% rename from src/main/java/com/wms/entity/common/WmsApiResponse.java rename to src/main/java/com/wms/model/entity/common/WmsApiResponse.java index abb5ab7..2bd6aef 100644 --- a/src/main/java/com/wms/entity/common/WmsApiResponse.java +++ b/src/main/java/com/wms/model/entity/common/WmsApiResponse.java @@ -1,4 +1,4 @@ -package com.wms.entity.common; +package com.wms.model.entity.common; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/wms/entity/dto/locaiton/SelectArea.java b/src/main/java/com/wms/model/entity/dto/locaiton/SelectArea.java similarity index 97% rename from src/main/java/com/wms/entity/dto/locaiton/SelectArea.java rename to src/main/java/com/wms/model/entity/dto/locaiton/SelectArea.java index f0cbe50..75a056f 100644 --- a/src/main/java/com/wms/entity/dto/locaiton/SelectArea.java +++ b/src/main/java/com/wms/model/entity/dto/locaiton/SelectArea.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.locaiton; +package com.wms.model.entity.dto.locaiton; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/wms/entity/dto/orderCheck/queryOrderCheckRequest.java b/src/main/java/com/wms/model/entity/dto/orderCheck/queryOrderCheckRequest.java similarity index 88% rename from src/main/java/com/wms/entity/dto/orderCheck/queryOrderCheckRequest.java rename to src/main/java/com/wms/model/entity/dto/orderCheck/queryOrderCheckRequest.java index 722d27f..d932e8b 100644 --- a/src/main/java/com/wms/entity/dto/orderCheck/queryOrderCheckRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderCheck/queryOrderCheckRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.orderCheck; +package com.wms.model.entity.dto.orderCheck; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/dto/orderCheck/remarkOrderCheckRequest.java b/src/main/java/com/wms/model/entity/dto/orderCheck/remarkOrderCheckRequest.java similarity index 81% rename from src/main/java/com/wms/entity/dto/orderCheck/remarkOrderCheckRequest.java rename to src/main/java/com/wms/model/entity/dto/orderCheck/remarkOrderCheckRequest.java index a605975..76badc9 100644 --- a/src/main/java/com/wms/entity/dto/orderCheck/remarkOrderCheckRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderCheck/remarkOrderCheckRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.orderCheck; +package com.wms.model.entity.dto.orderCheck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/wms/entity/dto/orderIn/bindingVehicleRequest.java b/src/main/java/com/wms/model/entity/dto/orderIn/bindingVehicleRequest.java similarity index 88% rename from src/main/java/com/wms/entity/dto/orderIn/bindingVehicleRequest.java rename to src/main/java/com/wms/model/entity/dto/orderIn/bindingVehicleRequest.java index 062a0ce..13549c0 100644 --- a/src/main/java/com/wms/entity/dto/orderIn/bindingVehicleRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderIn/bindingVehicleRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.orderIn; +package com.wms.model.entity.dto.orderIn; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/dto/orderIn/downOrderInRequest.java b/src/main/java/com/wms/model/entity/dto/orderIn/downOrderInRequest.java similarity index 93% rename from src/main/java/com/wms/entity/dto/orderIn/downOrderInRequest.java rename to src/main/java/com/wms/model/entity/dto/orderIn/downOrderInRequest.java index 0e49553..5eb8cc4 100644 --- a/src/main/java/com/wms/entity/dto/orderIn/downOrderInRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderIn/downOrderInRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.orderIn; +package com.wms.model.entity.dto.orderIn; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/dto/orderIn/queryOrderInRequest.java b/src/main/java/com/wms/model/entity/dto/orderIn/queryOrderInRequest.java similarity index 84% rename from src/main/java/com/wms/entity/dto/orderIn/queryOrderInRequest.java rename to src/main/java/com/wms/model/entity/dto/orderIn/queryOrderInRequest.java index 64ab8d5..0b3c330 100644 --- a/src/main/java/com/wms/entity/dto/orderIn/queryOrderInRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderIn/queryOrderInRequest.java @@ -1,9 +1,8 @@ -package com.wms.entity.dto.orderIn; +package com.wms.model.entity.dto.orderIn; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import java.time.LocalDate; import java.util.List; @Data diff --git a/src/main/java/com/wms/entity/dto/orderIn/updateNumRequest.java b/src/main/java/com/wms/model/entity/dto/orderIn/updateNumRequest.java similarity index 86% rename from src/main/java/com/wms/entity/dto/orderIn/updateNumRequest.java rename to src/main/java/com/wms/model/entity/dto/orderIn/updateNumRequest.java index 34b5ac5..d2c2479 100644 --- a/src/main/java/com/wms/entity/dto/orderIn/updateNumRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderIn/updateNumRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.orderIn; +package com.wms.model.entity.dto.orderIn; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/dto/orderOut/handOrderOutRequest.java b/src/main/java/com/wms/model/entity/dto/orderOut/handOrderOutRequest.java similarity index 88% rename from src/main/java/com/wms/entity/dto/orderOut/handOrderOutRequest.java rename to src/main/java/com/wms/model/entity/dto/orderOut/handOrderOutRequest.java index 538eeb2..f2da3a8 100644 --- a/src/main/java/com/wms/entity/dto/orderOut/handOrderOutRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderOut/handOrderOutRequest.java @@ -1,9 +1,7 @@ -package com.wms.entity.dto.orderOut; +package com.wms.model.entity.dto.orderOut; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - public class handOrderOutRequest { diff --git a/src/main/java/com/wms/entity/dto/orderOut/queryOrderOutRequest.java b/src/main/java/com/wms/model/entity/dto/orderOut/queryOrderOutRequest.java similarity index 89% rename from src/main/java/com/wms/entity/dto/orderOut/queryOrderOutRequest.java rename to src/main/java/com/wms/model/entity/dto/orderOut/queryOrderOutRequest.java index d0fd764..023f24f 100644 --- a/src/main/java/com/wms/entity/dto/orderOut/queryOrderOutRequest.java +++ b/src/main/java/com/wms/model/entity/dto/orderOut/queryOrderOutRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.orderOut; +package com.wms.model.entity.dto.orderOut; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java b/src/main/java/com/wms/model/entity/dto/stock/StockQueryReuqest.java similarity index 87% rename from src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java rename to src/main/java/com/wms/model/entity/dto/stock/StockQueryReuqest.java index 7ed8c6f..7cc0e4e 100644 --- a/src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java +++ b/src/main/java/com/wms/model/entity/dto/stock/StockQueryReuqest.java @@ -1,4 +1,4 @@ -package com.wms.entity.dto.stock; +package com.wms.model.entity.dto.stock; import lombok.Data; diff --git a/src/main/java/com/wms/entity/excel/StockExcel.java b/src/main/java/com/wms/model/entity/excel/StockExcel.java similarity index 98% rename from src/main/java/com/wms/entity/excel/StockExcel.java rename to src/main/java/com/wms/model/entity/excel/StockExcel.java index eb5ba49..6a32b9e 100644 --- a/src/main/java/com/wms/entity/excel/StockExcel.java +++ b/src/main/java/com/wms/model/entity/excel/StockExcel.java @@ -1,4 +1,4 @@ -package com.wms.entity.excel; +package com.wms.model.entity.excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.wms.utils.excel.ExcelExport; diff --git a/src/main/java/com/wms/entity/page/PageDomain.java b/src/main/java/com/wms/model/entity/page/PageDomain.java similarity index 97% rename from src/main/java/com/wms/entity/page/PageDomain.java rename to src/main/java/com/wms/model/entity/page/PageDomain.java index dc6e300..0f05b0c 100644 --- a/src/main/java/com/wms/entity/page/PageDomain.java +++ b/src/main/java/com/wms/model/entity/page/PageDomain.java @@ -1,4 +1,4 @@ -package com.wms.entity.page; +package com.wms.model.entity.page; import com.wms.utils.StringUtils; diff --git a/src/main/java/com/wms/entity/page/TableRequest.java b/src/main/java/com/wms/model/entity/page/TableRequest.java similarity index 94% rename from src/main/java/com/wms/entity/page/TableRequest.java rename to src/main/java/com/wms/model/entity/page/TableRequest.java index a29b835..ad66db5 100644 --- a/src/main/java/com/wms/entity/page/TableRequest.java +++ b/src/main/java/com/wms/model/entity/page/TableRequest.java @@ -1,4 +1,4 @@ -package com.wms.entity.page; +package com.wms.model.entity.page; /** * 前端请求表格数据 diff --git a/src/main/java/com/wms/entity/page/TableResponse.java b/src/main/java/com/wms/model/entity/page/TableResponse.java similarity index 96% rename from src/main/java/com/wms/entity/page/TableResponse.java rename to src/main/java/com/wms/model/entity/page/TableResponse.java index 4ea4218..549e750 100644 --- a/src/main/java/com/wms/entity/page/TableResponse.java +++ b/src/main/java/com/wms/model/entity/page/TableResponse.java @@ -1,4 +1,4 @@ -package com.wms.entity.page; +package com.wms.model.entity.page; import java.util.List; diff --git a/src/main/java/com/wms/entity/table/AppOrderIn.java b/src/main/java/com/wms/model/entity/table/AppOrderIn.java similarity index 90% rename from src/main/java/com/wms/entity/table/AppOrderIn.java rename to src/main/java/com/wms/model/entity/table/AppOrderIn.java index f12ff3f..02cd39d 100644 --- a/src/main/java/com/wms/entity/table/AppOrderIn.java +++ b/src/main/java/com/wms/model/entity/table/AppOrderIn.java @@ -1,17 +1,12 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.wms.utils.excel.ExcelExport; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.poi.hpsf.Decimal; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; /** * tbl_app_order_in 的实体类 diff --git a/src/main/java/com/wms/entity/table/Config.java b/src/main/java/com/wms/model/entity/table/Config.java similarity index 94% rename from src/main/java/com/wms/entity/table/Config.java rename to src/main/java/com/wms/model/entity/table/Config.java index b0d5979..db25d0e 100644 --- a/src/main/java/com/wms/entity/table/Config.java +++ b/src/main/java/com/wms/model/entity/table/Config.java @@ -1,6 +1,6 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 配置 diff --git a/src/main/java/com/wms/entity/table/Goods.java b/src/main/java/com/wms/model/entity/table/Goods.java similarity index 91% rename from src/main/java/com/wms/entity/table/Goods.java rename to src/main/java/com/wms/model/entity/table/Goods.java index f16074f..641c428 100644 --- a/src/main/java/com/wms/entity/table/Goods.java +++ b/src/main/java/com/wms/model/entity/table/Goods.java @@ -1,8 +1,7 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import com.wms.utils.excel.ExcelExport; import com.wms.utils.excel.ExcelImport; import lombok.Data; diff --git a/src/main/java/com/wms/entity/table/Location.java b/src/main/java/com/wms/model/entity/table/Location.java similarity index 97% rename from src/main/java/com/wms/entity/table/Location.java rename to src/main/java/com/wms/model/entity/table/Location.java index e4f15cb..2830f8a 100644 --- a/src/main/java/com/wms/entity/table/Location.java +++ b/src/main/java/com/wms/model/entity/table/Location.java @@ -1,6 +1,6 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 库位 diff --git a/src/main/java/com/wms/entity/table/Menu.java b/src/main/java/com/wms/model/entity/table/Menu.java similarity index 93% rename from src/main/java/com/wms/entity/table/Menu.java rename to src/main/java/com/wms/model/entity/table/Menu.java index 641e220..09edc51 100644 --- a/src/main/java/com/wms/entity/table/Menu.java +++ b/src/main/java/com/wms/model/entity/table/Menu.java @@ -1,6 +1,6 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 菜单 diff --git a/src/main/java/com/wms/entity/table/OrderCheck.java b/src/main/java/com/wms/model/entity/table/OrderCheck.java similarity index 96% rename from src/main/java/com/wms/entity/table/OrderCheck.java rename to src/main/java/com/wms/model/entity/table/OrderCheck.java index 589fd7c..f424cc7 100644 --- a/src/main/java/com/wms/entity/table/OrderCheck.java +++ b/src/main/java/com/wms/model/entity/table/OrderCheck.java @@ -1,4 +1,4 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/wms/entity/table/OrderOut.java b/src/main/java/com/wms/model/entity/table/OrderOut.java similarity index 98% rename from src/main/java/com/wms/entity/table/OrderOut.java rename to src/main/java/com/wms/model/entity/table/OrderOut.java index 9ff8969..dd587d4 100644 --- a/src/main/java/com/wms/entity/table/OrderOut.java +++ b/src/main/java/com/wms/model/entity/table/OrderOut.java @@ -1,4 +1,4 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/wms/entity/table/PartInfo.java b/src/main/java/com/wms/model/entity/table/PartInfo.java similarity index 99% rename from src/main/java/com/wms/entity/table/PartInfo.java rename to src/main/java/com/wms/model/entity/table/PartInfo.java index cbc1c17..9dbde92 100644 --- a/src/main/java/com/wms/entity/table/PartInfo.java +++ b/src/main/java/com/wms/model/entity/table/PartInfo.java @@ -1,4 +1,4 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.wms.utils.excel.ExcelExport; import com.wms.utils.excel.ExcelImport; diff --git a/src/main/java/com/wms/entity/table/Stand.java b/src/main/java/com/wms/model/entity/table/Stand.java similarity index 97% rename from src/main/java/com/wms/entity/table/Stand.java rename to src/main/java/com/wms/model/entity/table/Stand.java index 35fe5f6..c2918fc 100644 --- a/src/main/java/com/wms/entity/table/Stand.java +++ b/src/main/java/com/wms/model/entity/table/Stand.java @@ -1,6 +1,6 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 站台表 diff --git a/src/main/java/com/wms/entity/table/Stock.java b/src/main/java/com/wms/model/entity/table/Stock.java similarity index 99% rename from src/main/java/com/wms/entity/table/Stock.java rename to src/main/java/com/wms/model/entity/table/Stock.java index 55c839c..7d4dfdf 100644 --- a/src/main/java/com/wms/entity/table/Stock.java +++ b/src/main/java/com/wms/model/entity/table/Stock.java @@ -1,7 +1,7 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.fasterxml.jackson.annotation.JsonFormat; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import com.wms.utils.excel.ExcelExport; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/wms/entity/table/Task.java b/src/main/java/com/wms/model/entity/table/Task.java similarity index 98% rename from src/main/java/com/wms/entity/table/Task.java rename to src/main/java/com/wms/model/entity/table/Task.java index 4e96924..3c40212 100644 --- a/src/main/java/com/wms/entity/table/Task.java +++ b/src/main/java/com/wms/model/entity/table/Task.java @@ -1,7 +1,7 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.fasterxml.jackson.annotation.JsonFormat; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import com.wms.utils.excel.ExcelExport; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/wms/entity/table/TaskBak.java b/src/main/java/com/wms/model/entity/table/TaskBak.java similarity index 98% rename from src/main/java/com/wms/entity/table/TaskBak.java rename to src/main/java/com/wms/model/entity/table/TaskBak.java index 3df6d5d..ad3b924 100644 --- a/src/main/java/com/wms/entity/table/TaskBak.java +++ b/src/main/java/com/wms/model/entity/table/TaskBak.java @@ -1,7 +1,7 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.fasterxml.jackson.annotation.JsonFormat; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import com.wms.utils.excel.ExcelExport; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/wms/entity/table/User.java b/src/main/java/com/wms/model/entity/table/User.java similarity index 96% rename from src/main/java/com/wms/entity/table/User.java rename to src/main/java/com/wms/model/entity/table/User.java index ee3c8ea..582378a 100644 --- a/src/main/java/com/wms/entity/table/User.java +++ b/src/main/java/com/wms/model/entity/table/User.java @@ -1,7 +1,7 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; import com.fasterxml.jackson.annotation.JsonFormat; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; import java.util.Date; diff --git a/src/main/java/com/wms/entity/table/Vehicle.java b/src/main/java/com/wms/model/entity/table/Vehicle.java similarity index 93% rename from src/main/java/com/wms/entity/table/Vehicle.java rename to src/main/java/com/wms/model/entity/table/Vehicle.java index 7ce4bad..a29bdde 100644 --- a/src/main/java/com/wms/entity/table/Vehicle.java +++ b/src/main/java/com/wms/model/entity/table/Vehicle.java @@ -1,6 +1,6 @@ -package com.wms.entity.table; +package com.wms.model.entity.table; -import com.wms.entity.BaseEntity; +import com.wms.model.entity.BaseEntity; /** * 载具 diff --git a/src/main/java/com/wms/entity/test/ExcelTest.java b/src/main/java/com/wms/model/entity/test/ExcelTest.java similarity index 95% rename from src/main/java/com/wms/entity/test/ExcelTest.java rename to src/main/java/com/wms/model/entity/test/ExcelTest.java index 03bead4..6e78c60 100644 --- a/src/main/java/com/wms/entity/test/ExcelTest.java +++ b/src/main/java/com/wms/model/entity/test/ExcelTest.java @@ -1,4 +1,4 @@ -package com.wms.entity.test; +package com.wms.model.entity.test; import com.wms.utils.excel.ExcelExport; import com.wms.utils.excel.ExcelImport; diff --git a/src/main/java/com/wms/entity/vo/StockVO.java b/src/main/java/com/wms/model/entity/vo/StockVO.java similarity index 96% rename from src/main/java/com/wms/entity/vo/StockVO.java rename to src/main/java/com/wms/model/entity/vo/StockVO.java index 5eac980..5356087 100644 --- a/src/main/java/com/wms/entity/vo/StockVO.java +++ b/src/main/java/com/wms/model/entity/vo/StockVO.java @@ -1,10 +1,9 @@ -package com.wms.entity.vo; +package com.wms.model.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.wms.entity.table.Stock; +import com.wms.model.entity.table.Stock; import com.wms.utils.excel.ExcelExport; import lombok.Data; -import org.apache.poi.poifs.property.Child; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/src/main/java/com/wms/model/enums/DestinationEnum.java b/src/main/java/com/wms/model/enums/DestinationEnum.java new file mode 100644 index 0000000..d51cda3 --- /dev/null +++ b/src/main/java/com/wms/model/enums/DestinationEnum.java @@ -0,0 +1,48 @@ +package com.wms.model.enums; + +import com.alibaba.fastjson2.JSON; +import com.wms.utils.StringUtils; +import lombok.Getter; + +import javax.print.attribute.standard.Destination; + +/** + * @Classname DestinationEnum + * @Date 2025-03-19 9:47 + * @Created by luyifan + */ +@Getter +public enum DestinationEnum { + EXIT_CODE("出库","111" ), + ENTRY_CODE("入库", "" ); + + private final String text; + private final String value; + + DestinationEnum(String text, String value) { + this.text = text; + this.value = value; + } + + + /** + * 根据值获取枚举 + */ + public static DestinationEnum getByValue(String value) { + if (StringUtils.isEmpty(value)) { + return null; + } + for (DestinationEnum item : values()) { + if (item.getValue().equals(value)) { + return item; + } + } + return null; + } + + public static void main(String[] args) { + System.out.println(DestinationEnum.getByValue("111")); + } + + +} diff --git a/src/main/java/com/wms/service/ConfigService.java b/src/main/java/com/wms/service/ConfigService.java index 397ecd9..7aad928 100644 --- a/src/main/java/com/wms/service/ConfigService.java +++ b/src/main/java/com/wms/service/ConfigService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Config; +import com.wms.model.entity.table.Config; import java.util.List; diff --git a/src/main/java/com/wms/service/ContainerService.java b/src/main/java/com/wms/service/ContainerService.java index 3f8c3c7..28e337f 100644 --- a/src/main/java/com/wms/service/ContainerService.java +++ b/src/main/java/com/wms/service/ContainerService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.app.container.*; +import com.wms.model.entity.app.container.*; /** * 四向车api的Service diff --git a/src/main/java/com/wms/service/GoodsService.java b/src/main/java/com/wms/service/GoodsService.java index c175681..f99ea7a 100644 --- a/src/main/java/com/wms/service/GoodsService.java +++ b/src/main/java/com/wms/service/GoodsService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Goods; +import com.wms.model.entity.table.Goods; import java.util.List; diff --git a/src/main/java/com/wms/service/IOrderCheckService.java b/src/main/java/com/wms/service/IOrderCheckService.java index 731228e..48f8a80 100644 --- a/src/main/java/com/wms/service/IOrderCheckService.java +++ b/src/main/java/com/wms/service/IOrderCheckService.java @@ -1,8 +1,8 @@ package com.wms.service; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderCheck.queryOrderCheckRequest; -import com.wms.entity.table.OrderCheck; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderCheck.queryOrderCheckRequest; +import com.wms.model.entity.table.OrderCheck; import java.util.List; diff --git a/src/main/java/com/wms/service/IOrderInService.java b/src/main/java/com/wms/service/IOrderInService.java index efb2656..d30f832 100644 --- a/src/main/java/com/wms/service/IOrderInService.java +++ b/src/main/java/com/wms/service/IOrderInService.java @@ -1,13 +1,12 @@ package com.wms.service; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderIn.bindingVehicleRequest; -import com.wms.entity.dto.orderIn.downOrderInRequest; -import com.wms.entity.dto.orderIn.queryOrderInRequest; -import com.wms.entity.dto.orderIn.updateNumRequest; -import com.wms.entity.table.AppOrderIn; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderIn.bindingVehicleRequest; +import com.wms.model.entity.dto.orderIn.downOrderInRequest; +import com.wms.model.entity.dto.orderIn.queryOrderInRequest; +import com.wms.model.entity.dto.orderIn.updateNumRequest; +import com.wms.model.entity.table.AppOrderIn; -import java.math.BigDecimal; import java.util.List; public interface IOrderInService { diff --git a/src/main/java/com/wms/service/IOrderOutService.java b/src/main/java/com/wms/service/IOrderOutService.java index 8e60a20..3dbeb9c 100644 --- a/src/main/java/com/wms/service/IOrderOutService.java +++ b/src/main/java/com/wms/service/IOrderOutService.java @@ -1,9 +1,9 @@ package com.wms.service; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderOut.handOrderOutRequest; -import com.wms.entity.dto.orderOut.queryOrderOutRequest; -import com.wms.entity.table.OrderOut; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderOut.handOrderOutRequest; +import com.wms.model.entity.dto.orderOut.queryOrderOutRequest; +import com.wms.model.entity.table.OrderOut; import java.util.List; diff --git a/src/main/java/com/wms/service/LocationService.java b/src/main/java/com/wms/service/LocationService.java index 1bebf5a..7fd110f 100644 --- a/src/main/java/com/wms/service/LocationService.java +++ b/src/main/java/com/wms/service/LocationService.java @@ -1,7 +1,7 @@ package com.wms.service; -import com.wms.entity.dto.locaiton.SelectArea; -import com.wms.entity.table.Location; +import com.wms.model.entity.dto.locaiton.SelectArea; +import com.wms.model.entity.table.Location; import java.util.List; diff --git a/src/main/java/com/wms/service/MenuService.java b/src/main/java/com/wms/service/MenuService.java index c69626a..a4b0648 100644 --- a/src/main/java/com/wms/service/MenuService.java +++ b/src/main/java/com/wms/service/MenuService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Menu; +import com.wms.model.entity.table.Menu; import java.util.List; diff --git a/src/main/java/com/wms/service/MesService.java b/src/main/java/com/wms/service/MesService.java index 1944d68..3406ef6 100644 --- a/src/main/java/com/wms/service/MesService.java +++ b/src/main/java/com/wms/service/MesService.java @@ -1,9 +1,9 @@ package com.wms.service; -import com.wms.entity.app.mes.CheckNoticeRequest; -import com.wms.entity.app.mes.MesApiLocalResponse; -import com.wms.entity.app.mes.OutNoticeRequest; -import com.wms.entity.app.mes.ReceiptInRequest; +import com.wms.model.entity.app.mes.CheckNoticeRequest; +import com.wms.model.entity.app.mes.MesApiLocalResponse; +import com.wms.model.entity.app.mes.OutNoticeRequest; +import com.wms.model.entity.app.mes.ReceiptInRequest; /** * 上位系统交互 diff --git a/src/main/java/com/wms/service/PartInfoService.java b/src/main/java/com/wms/service/PartInfoService.java index af752b0..f5190e7 100644 --- a/src/main/java/com/wms/service/PartInfoService.java +++ b/src/main/java/com/wms/service/PartInfoService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.PartInfo; +import com.wms.model.entity.table.PartInfo; import java.util.List; diff --git a/src/main/java/com/wms/service/StandService.java b/src/main/java/com/wms/service/StandService.java index 23d6f42..e6c2296 100644 --- a/src/main/java/com/wms/service/StandService.java +++ b/src/main/java/com/wms/service/StandService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Stand; +import com.wms.model.entity.table.Stand; import java.util.List; diff --git a/src/main/java/com/wms/service/StockService.java b/src/main/java/com/wms/service/StockService.java index d280645..0586c45 100644 --- a/src/main/java/com/wms/service/StockService.java +++ b/src/main/java/com/wms/service/StockService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Stock; +import com.wms.model.entity.table.Stock; import java.util.List; diff --git a/src/main/java/com/wms/service/TaskRecordService.java b/src/main/java/com/wms/service/TaskRecordService.java index b362f80..cdd0a53 100644 --- a/src/main/java/com/wms/service/TaskRecordService.java +++ b/src/main/java/com/wms/service/TaskRecordService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Task; import java.util.List; diff --git a/src/main/java/com/wms/service/TaskService.java b/src/main/java/com/wms/service/TaskService.java index d41f79d..51a8671 100644 --- a/src/main/java/com/wms/service/TaskService.java +++ b/src/main/java/com/wms/service/TaskService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Task; import java.util.List; diff --git a/src/main/java/com/wms/service/UserService.java b/src/main/java/com/wms/service/UserService.java index 31b9141..9663d09 100644 --- a/src/main/java/com/wms/service/UserService.java +++ b/src/main/java/com/wms/service/UserService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.User; +import com.wms.model.entity.table.User; import java.util.List; diff --git a/src/main/java/com/wms/service/VehicleService.java b/src/main/java/com/wms/service/VehicleService.java index ad6c29c..f0b9213 100644 --- a/src/main/java/com/wms/service/VehicleService.java +++ b/src/main/java/com/wms/service/VehicleService.java @@ -1,6 +1,6 @@ package com.wms.service; -import com.wms.entity.table.Vehicle; +import com.wms.model.entity.table.Vehicle; import java.util.List; diff --git a/src/main/java/com/wms/service/serviceImplements/ConfigServiceImplement.java b/src/main/java/com/wms/service/serviceImplements/ConfigServiceImplement.java index e2eff9f..acfb3b0 100644 --- a/src/main/java/com/wms/service/serviceImplements/ConfigServiceImplement.java +++ b/src/main/java/com/wms/service/serviceImplements/ConfigServiceImplement.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Config; +import com.wms.model.entity.table.Config; import com.wms.mapper.ConfigMapper; import com.wms.service.ConfigService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java index dbbf012..2c2caa0 100644 --- a/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/GoodsServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Goods; +import com.wms.model.entity.table.Goods; import com.wms.mapper.GoodsMapper; import com.wms.service.GoodsService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/LocationServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/LocationServiceImplements.java index ddcb72b..1963804 100644 --- a/src/main/java/com/wms/service/serviceImplements/LocationServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/LocationServiceImplements.java @@ -1,7 +1,7 @@ package com.wms.service.serviceImplements; -import com.wms.entity.dto.locaiton.SelectArea; -import com.wms.entity.table.Location; +import com.wms.model.entity.dto.locaiton.SelectArea; +import com.wms.model.entity.table.Location; import com.wms.mapper.LocationMapper; import com.wms.service.LocationService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/MenuServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/MenuServiceImplements.java index f4ca5b1..e38197e 100644 --- a/src/main/java/com/wms/service/serviceImplements/MenuServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/MenuServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Menu; +import com.wms.model.entity.table.Menu; import com.wms.mapper.MenuMapper; import com.wms.service.MenuService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/OrderCheckImplements.java b/src/main/java/com/wms/service/serviceImplements/OrderCheckImplements.java index d160dc0..f40c8c6 100644 --- a/src/main/java/com/wms/service/serviceImplements/OrderCheckImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/OrderCheckImplements.java @@ -3,13 +3,11 @@ package com.wms.service.serviceImplements; import com.wms.constants.enums.OrderCheckStatusEnum; import com.wms.constants.enums.OrderOutStatusEnum; import com.wms.constants.enums.TaskType; -import com.wms.entity.app.mes.MesApiLocalResponse; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderCheck.queryOrderCheckRequest; -import com.wms.entity.table.AppOrderIn; -import com.wms.entity.table.OrderCheck; -import com.wms.entity.table.Stock; -import com.wms.entity.table.Task; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderCheck.queryOrderCheckRequest; +import com.wms.model.entity.table.OrderCheck; +import com.wms.model.entity.table.Stock; +import com.wms.model.entity.table.Task; import com.wms.mapper.AppOrderInMapper; import com.wms.mapper.OrderCheckMapper; import com.wms.mapper.StockMapper; diff --git a/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java b/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java index 7344826..b8f5f40 100644 --- a/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java +++ b/src/main/java/com/wms/service/serviceImplements/OrderInImplement.java @@ -2,17 +2,14 @@ package com.wms.service.serviceImplements; import com.wms.constants.WmsConstants; import com.wms.constants.enums.OrderInStatusEnum; -import com.wms.constants.enums.OrderOutStatusEnum; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderIn.bindingVehicleRequest; -import com.wms.entity.dto.orderIn.downOrderInRequest; -import com.wms.entity.dto.orderIn.queryOrderInRequest; -import com.wms.entity.dto.orderIn.updateNumRequest; -import com.wms.entity.table.AppOrderIn; -import com.wms.entity.table.OrderOut; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderIn.bindingVehicleRequest; +import com.wms.model.entity.dto.orderIn.downOrderInRequest; +import com.wms.model.entity.dto.orderIn.queryOrderInRequest; +import com.wms.model.entity.dto.orderIn.updateNumRequest; +import com.wms.model.entity.table.AppOrderIn; import com.wms.service.IOrderInService; import com.wms.utils.StringUtils; -import com.wms.utils.WmsUtils; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,12 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; @Service diff --git a/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java b/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java index c64a1c4..b093af2 100644 --- a/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java @@ -3,11 +3,12 @@ package com.wms.service.serviceImplements; import com.wms.constants.enums.LocationStatus; import com.wms.constants.enums.OrderOutStatusEnum; import com.wms.constants.enums.StockStatus; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.dto.orderOut.handOrderOutRequest; -import com.wms.entity.dto.orderOut.queryOrderOutRequest; -import com.wms.entity.table.*; +import com.wms.model.entity.common.WmsApiResponse; +import com.wms.model.entity.dto.orderOut.handOrderOutRequest; +import com.wms.model.entity.dto.orderOut.queryOrderOutRequest; +import com.wms.model.entity.table.*; import com.wms.mapper.*; +import com.wms.model.enums.DestinationEnum; import com.wms.service.IOrderOutService; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -17,7 +18,6 @@ import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.util.*; -import java.util.stream.Collectors; @Service @RequiredArgsConstructor(onConstructor = @__(@Autowired)) @@ -118,7 +118,7 @@ public class OrderOutImplements implements IOrderOutService { task.setTaskGroup(orderOut.getOrderId()); task.setTaskStatus(OrderOutStatusEnum.CREATED.getCode()); task.setOrigin(outStock.getLocationId()); - task.setDestination("111"); + task.setDestination(DestinationEnum.EXIT_CODE.getValue()); task.setPickStand(orderOut.getRowId()); task.setWeight(0.0); task.setVehicleNo(outStock.getVehicleId()); diff --git a/src/main/java/com/wms/service/serviceImplements/PartInfoServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/PartInfoServiceImplements.java index 77e1ac8..71b8aa2 100644 --- a/src/main/java/com/wms/service/serviceImplements/PartInfoServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/PartInfoServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.PartInfo; +import com.wms.model.entity.table.PartInfo; import com.wms.mapper.PartInfoMapper; import com.wms.service.PartInfoService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/wms/service/serviceImplements/StandServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/StandServiceImplements.java index effa96f..c46f43a 100644 --- a/src/main/java/com/wms/service/serviceImplements/StandServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/StandServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Stand; +import com.wms.model.entity.table.Stand; import com.wms.mapper.StandMapper; import com.wms.service.StandService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/StockServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/StockServiceImplements.java index c23398c..9152f81 100644 --- a/src/main/java/com/wms/service/serviceImplements/StockServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/StockServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Stock; +import com.wms.model.entity.table.Stock; import com.wms.mapper.StockMapper; import com.wms.service.StockService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/wms/service/serviceImplements/TaskRecordServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/TaskRecordServiceImplements.java index 7fe4718..512f56a 100644 --- a/src/main/java/com/wms/service/serviceImplements/TaskRecordServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/TaskRecordServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Task; import com.wms.mapper.TaskRecordMapper; import com.wms.service.TaskRecordService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/TaskServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/TaskServiceImplements.java index 24c5e90..815abac 100644 --- a/src/main/java/com/wms/service/serviceImplements/TaskServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/TaskServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.Task; import com.wms.mapper.TaskMapper; import com.wms.service.TaskService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/UserServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/UserServiceImplements.java index c601321..9b51a22 100644 --- a/src/main/java/com/wms/service/serviceImplements/UserServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/UserServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.User; +import com.wms.model.entity.table.User; import com.wms.mapper.UserMapper; import com.wms.service.UserService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/VehicleServiceImplements.java b/src/main/java/com/wms/service/serviceImplements/VehicleServiceImplements.java index 4987863..49c86ea 100644 --- a/src/main/java/com/wms/service/serviceImplements/VehicleServiceImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/VehicleServiceImplements.java @@ -1,6 +1,6 @@ package com.wms.service.serviceImplements; -import com.wms.entity.table.Vehicle; +import com.wms.model.entity.table.Vehicle; import com.wms.mapper.VehicleMapper; import com.wms.service.VehicleService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/wms/service/serviceImplements/parent/ContainerImplement.java b/src/main/java/com/wms/service/serviceImplements/parent/ContainerImplement.java index 684c79f..66056e1 100644 --- a/src/main/java/com/wms/service/serviceImplements/parent/ContainerImplement.java +++ b/src/main/java/com/wms/service/serviceImplements/parent/ContainerImplement.java @@ -3,10 +3,8 @@ package com.wms.service.serviceImplements.parent; import com.wms.bussiness.TaskOperation; import com.wms.constants.WmsConstants; import com.wms.constants.enums.*; -import com.wms.entity.app.ResponseEntity; -import com.wms.entity.app.container.*; -import com.wms.entity.common.WmsApiResponse; -import com.wms.entity.table.*; +import com.wms.model.entity.app.container.*; +import com.wms.model.entity.table.*; import com.wms.mapper.*; import com.wms.service.ContainerService; import com.wms.utils.StringUtils; @@ -15,20 +13,15 @@ import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; -import com.wms.utils.WmsUtils; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.sql.Timestamp; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; -import java.util.stream.Collectors; /** * 四向车 api service 的实现 diff --git a/src/main/java/com/wms/service/serviceImplements/parent/MesServiceImplement.java b/src/main/java/com/wms/service/serviceImplements/parent/MesServiceImplement.java index 3cf843d..08a0a4d 100644 --- a/src/main/java/com/wms/service/serviceImplements/parent/MesServiceImplement.java +++ b/src/main/java/com/wms/service/serviceImplements/parent/MesServiceImplement.java @@ -1,15 +1,14 @@ package com.wms.service.serviceImplements.parent; import com.wms.constants.enums.*; -import com.wms.entity.app.mes.CheckNoticeRequest; -import com.wms.entity.app.mes.MesApiLocalResponse; -import com.wms.entity.app.mes.OutNoticeRequest; -import com.wms.entity.app.mes.ReceiptInRequest; -import com.wms.entity.table.*; +import com.wms.model.entity.app.mes.CheckNoticeRequest; +import com.wms.model.entity.app.mes.MesApiLocalResponse; +import com.wms.model.entity.app.mes.OutNoticeRequest; +import com.wms.model.entity.app.mes.ReceiptInRequest; +import com.wms.model.entity.table.*; import com.wms.mapper.*; import com.wms.service.MesService; import com.wms.utils.StringUtils; -import com.wms.utils.WmsUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/wms/utils/storage/LocationUtils.java b/src/main/java/com/wms/utils/storage/LocationUtils.java index b917912..f91e303 100644 --- a/src/main/java/com/wms/utils/storage/LocationUtils.java +++ b/src/main/java/com/wms/utils/storage/LocationUtils.java @@ -2,12 +2,10 @@ package com.wms.utils.storage; import com.alibaba.fastjson2.JSON; import com.wms.constants.enums.LocationStatus; -import com.wms.entity.app.container.CreateInstoreTaskResponse; -import com.wms.entity.app.display.LocationInfo; -import com.wms.entity.table.AppOrderIn; -import com.wms.entity.table.Location; -import com.wms.entity.table.Stock; -import com.wms.entity.table.Task; +import com.wms.model.entity.table.AppOrderIn; +import com.wms.model.entity.table.Location; +import com.wms.model.entity.table.Stock; +import com.wms.model.entity.table.Task; import com.wms.mapper.LocationMapper; import com.wms.mapper.StockMapper; import com.wms.mapper.TaskMapper; @@ -17,9 +15,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -186,8 +182,8 @@ public class LocationUtils { if(canUseLocations == null || canUseLocations.isEmpty()) { return null; } - boolean canUse = true; for (Location location : canUseLocations) { + boolean canUse = true; /* 校验此位置是否有遮挡 */ /* 如果这位置有库存（可能出现记错导致有库存），或者这位置其他深度（不论深度大小）有任务则不采用此位置 */ /* 1 判断库存 */ Stock checkStock = new Stock(); @@ -200,24 +196,25 @@ public class LocationUtils { // 判断低深度是否有库存 for (int i = 1; i < location.getDepth(); i++) { Location queryLowDepthLocation = new Location(); - queryLowDepthLocation.setLine(location.getLine()); queryLowDepthLocation.setLayer(location.getLayer()); queryLowDepthLocation.setQueue(location.getQueue()); queryLowDepthLocation.setDepth(i); queryLowDepthLocation.setTunnelId(location.getTunnelId()); List locations = locationMapper.selLocations(queryLowDepthLocation); - if (locations.get(0).getLocationStatus() == 1) { + if (!locations.isEmpty() && locations.get(0).getLocationStatus() == 1) { log.info("入库时低深度存在占用", locations.get(0).getLocationId()); canUse = false; } - // 查询是否有库存 - Stock queryStock = new Stock(); - queryStock.setLocationId(locations.get(0).getLocationId()); - List stockList = stockMapper.selStocks(queryStock); - if (!stockList.isEmpty()) { - log.info("入库时低深度存在库存", locations.get(0).getLocationId()); - canUse = false; + if (!locations.isEmpty()) { + // 查询是否有库存 + Stock queryStock = new Stock(); + queryStock.setLocationId(locations.get(0).getLocationId()); + List stockList = stockMapper.selStocks(queryStock); + if (!stockList.isEmpty()) { + log.info("入库时低深度存在库存", locations.get(0).getLocationId()); + canUse = false; + } } } /* 2 判断同位置不同深度是否有任务 */ diff --git a/src/main/java/com/wms/utils/storage/StockUtils.java b/src/main/java/com/wms/utils/storage/StockUtils.java index 091a15c..d685c37 100644 --- a/src/main/java/com/wms/utils/storage/StockUtils.java +++ b/src/main/java/com/wms/utils/storage/StockUtils.java @@ -1,6 +1,6 @@ package com.wms.utils.storage; -import com.wms.entity.table.Stock; +import com.wms.model.entity.table.Stock; import java.util.List; diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 7081fd9..cca2ec1 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -120,5 +120,5 @@ - + diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index fd311aa..5ab96dd 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -167,7 +167,7 @@ where location_id = #{locationId} - + update tbl_app_location ware_area = #{chooseArea}, diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/mybatis-config.xml index 91ea525..c03912e 100644 --- a/src/main/resources/mybatis-config.xml +++ b/src/main/resources/mybatis-config.xml @@ -3,7 +3,7 @@ - +