添加sql

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.model.entity.app.ResponseEntity;
-import com.wms.entity.app.container.ContainerApiLocalResponse;
+import com.wms.model.entity.app.container.ContainerApiLocalResponse;
-import com.wms.entity.app.container.CreateInstoreTaskRequest;
+import com.wms.model.entity.app.container.SendContainerTaskRequest;
-import com.wms.entity.app.container.SendContainerTaskRequest;
+import com.wms.model.entity.app.wcs.WcsTask;
-import com.wms.entity.app.wcs.WcsTask;
+import com.wms.model.entity.table.*;
-import com.wms.entity.table.*;
 import com.wms.mapper.LocationMapper;
 import com.wms.mapper.StockMapper;
 import com.wms.mapper.TaskMapper;
@@ -80,7 +78,7 @@ public class JobComponent extends BaseController {
     private final VehicleMapper vehicleMapper;
 
 
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 2000)
     public void sendTasksToWcs() {
         try {
             // 查找待下发的任务
@@ -96,14 +94,14 @@ public class JobComponent extends BaseController {
                     sendTasksInToWcs(task);
                     return;
                 }
-                if(task.getTaskType().equals(TaskType.OUT.getCode()) || task.getTaskType().equals(TaskType.INVENTORY.getCode())){
-                    sendTasksOutToWcs(task);
-                    return;
-                }
                 if(task.getTaskType().equals(TaskType.MOVE.getCode())){
                     sendTasksMoveToWcs(task);
                     return;
                 }
+                if(task.getTaskType().equals(TaskType.OUT.getCode()) || task.getTaskType().equals(TaskType.INVENTORY.getCode())){
+                    sendTasksOutToWcs(task);
+                    return;
+                }
             }
         }catch (Exception exception){
             logger.error("定时器下发任务发生异常：{}", exception.toString());
@@ -206,10 +204,11 @@ public class JobComponent extends BaseController {
                 return;
             }
             if(beforLocations.isEmpty()) {
-                logger.info("beforLocations.isEmpty()");
+                logger.info("beforeLocations.isEmpty()");
                 return;
             }
-            Location beforLocation = beforLocations.get(0); // 前一个库位
+            // 前一个库位
+            Location beforLocation = beforLocations.get(0);
             List<Task> notCompleteTasks = taskMapper.haveNotCompleteTask(beforLocation.getLocationId());
             if(notCompleteTasks == null) {
                 logger.info("notCompleteTasks为null");
@@ -253,11 +252,12 @@ public class JobComponent extends BaseController {
                 logger.info("移库没有可用库位");
                 return; // 移库没有可用库位
             }
-            Location emptyLocationItem = locationUtils.checkCanUseChangeLocation(emptyLocations); // 取得新库位
+            Location emptyLocationItem = locationUtils.checkCanUseChangeLocation(emptyLocations,beforLocation); // 取得新库位
             if(emptyLocationItem == null) {
                 logger.info("没有可移动库位,移动库位存在任务");
                 return; // 没有可用库位或者m库位存在干涉
             }
+            logger.info("查找到可用移动库位{},原库位{}", emptyLocationItem.getLocationId(),beforLocation.getLocationId());
             // 锁定旧库位库存
             stockMapper.updateStockStatusWithLocationId(beforLocation.getLocationId(), StockStatus.LOCK.getCode());
 
@@ -333,7 +333,6 @@ public class JobComponent extends BaseController {
             request.setTocellno("111");
             String requestString = JSON.toJSONString(request);
             String responseString = HttpUtils.sendHttpPostWithoutToken(UrlEnums.URL_WMS_TO_WCS_CONTAINER_TASK.getValue(), requestString);
-            //JSONObject jsonResponse = JSON.parseObject(responseString);
             ContainerApiLocalResponse result = JSON.parseObject(responseString, ContainerApiLocalResponse.class);
             if(result != null && result.getCode().equals("200")) {
                 logger.info("下发四向车出库任务成功，任务ID：{}", task.getTaskId());
@@ -353,6 +352,7 @@ public class JobComponent extends BaseController {
      */
     @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
     public void sendTasksMoveToWcs(Task task){
+        // 目标库位
         List<Location> desLocations = locationService.selLocations(new Location(task.getDestination()));
         if(desLocations == null) {
             logger.info("下发移库任务查询库位详细信息失败，数据库网络连接异常");
@@ -385,18 +385,23 @@ public class JobComponent extends BaseController {
         }
         if (desDeepLocations.isEmpty()) {
             logger.info("后一个库位信息为空");
-            return;
+        }else {
-        }
+            Location desDeepLocation = desDeepLocations.get(0); // 移动目标库位后一个库位
-        Location desDeepLocation = desDeepLocations.get(0); // 前一个库位
             List<Task> desNotCompleteTasks = taskMapper.haveNotCompleteTask(desDeepLocation.getLocationId());
             if (desNotCompleteTasks == null) {
                 logger.info("查询任务异常");
                 return;
             }
-        if (!desNotCompleteTasks.isEmpty()) {
+
+//            for (Task desNotCompleteTask : desNotCompleteTasks) {&& desNotCompleteTask.getTaskType() != 9
+                if (!desNotCompleteTasks.isEmpty() ) {
                     logger.info("发送移库任务时目标库位,高深度存在未完成的任务，退出函数");
                     return;
                 }
+//            }
+
+        }
+
 
         /* 检查该库位前一个深度是否存在库存，若存在库存则生成一个移库任务，此任务暂不下发 */
         List<Location> thisLocations = locationService.selLocations(new Location(task.getOrigin()));

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.model.entity.table.*;
-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.mapper.*;
 import com.wms.service.PartInfoService;
 import com.wms.utils.WmsUtils;
@@ -141,7 +136,6 @@ public class TaskOperation {
                 addStock.setStockId(WmsUtils.generateUUIDString());
                 addStock.setWarehouseName("四向车立体库");
                 addStock.setLocationId(task.getDestination());
-                //addStock.setLocationId(appOrderIn.getVehicleNo());
                 addStock.setVehicleId(appOrderIn.getVehicleNo());
                 addStock.setGoodsId(appOrderIn.getGoodsId());
                 addStock.setGoodsName("");
@@ -150,9 +144,8 @@ public class TaskOperation {
                 addStock.setRealNum(appOrderIn.getGoodsNum().intValue());
                 addStock.setProviderId("");
                 addStock.setProviderName("");
-                //addStock.setProductionDate(null);
                 addStock.setExpirationDate(null);
-                addStock.setStockStatus(0);
+                addStock.setStockStatus(StockStatus.OK.getCode());
                 addStock.setGoodsStatus(null);
                 addStock.setCreateTime(new Date());
                 addStock.setLastUpdateTime(null);

src/main/java/com/wms/bussiness/TaskTimer.java

@@ -1,24 +0,0 @@
-package com.wms.bussiness;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-
-/**
- * 任务定时器
- */
-@Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
-public class TaskTimer {
-
-
-
-
-
-
-
-
-
-
-}

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.model.entity.app.ResponseEntity;
-import com.wms.entity.page.PageDomain;
+import com.wms.model.entity.table.Config;
-import com.wms.entity.page.TableRequest;
-import com.wms.entity.page.TableResponse;
-import com.wms.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;
 
 /**

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.model.entity.app.ResponseEntity;
-import com.wms.entity.app.display.LocationData;
+import com.wms.model.entity.app.display.LocationData;
-import com.wms.entity.app.display.LocationInfo;
+import com.wms.model.entity.app.display.LocationInfo;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Location;
-import com.wms.entity.table.Stock;
+import com.wms.model.entity.table.Stock;
 import com.wms.service.LocationService;
 import com.wms.service.StockService;
 import com.wms.utils.HttpUtils;

src/main/java/com/wms/controller/ExcelController.java

@@ -1,26 +1,26 @@
 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.model.entity.app.ResponseEntity;
-import com.wms.entity.excel.StockExcel;
+import com.wms.model.entity.excel.StockExcel;
-import com.wms.entity.table.*;
+import com.wms.model.entity.table.*;
 import com.wms.service.*;
 import com.wms.utils.HttpUtils;
 
+import com.wms.utils.StringUtils;
 import com.wms.utils.excel.ExcelUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 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;
 
@@ -55,7 +55,7 @@ public class ExcelController extends BaseController {
             List<Goods> files = ExcelUtils.readMultipartFile(file, Goods.class);
             // 添加进物料表
             for (Goods goods : files) {
-                if (goodsService.selGoodsByGoodsId(goods.getGoodsId()) != null) {
+                if (goodsService.selGoodsByGoodsName(goods.getGoodsName()) != null) {
                     goodsService.modifyGoods(goods);
                 }else {
                     goodsService.addGoods(goods);
@@ -86,6 +86,17 @@ public class ExcelController extends BaseController {
         for (Stock stock : stocks) {
             StockExcel stockExcel = new StockExcel();
             BeanUtils.copyProperties(stock,stockExcel);
+            // 查询零件信息
+            Goods goods = goodsService.selGoodsByGoodsId(stock.getGoodsId());
+            // 设置零件信息
+            if (goods != null){
+                if (!StringUtils.isEmpty(goods.getGoodsName()) ) {
+                    stockExcel.setGoodsUnit(goods.getGoodsUnit());
+                }
+                if (!StringUtils.isEmpty(goods.getSingleWeight())){
+                    stockExcel.setSingleWeight(Double.valueOf(goods.getSingleWeight()));
+                }
+            }
             stockExcelList.add(stockExcel);
         }
         ExcelUtils.export(response, "库存报表", stockExcelList,StockExcel.class);

src/main/java/com/wms/controller/GoodsController.java

@@ -3,15 +3,16 @@ package com.wms.controller;
 import com.alibaba.fastjson2.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.wms.common.BaseResponse;
+import com.wms.common.ResultUtils;
 import com.wms.constants.enums.ResponseCode;
-import com.wms.entity.app.ResponseEntity;
+import com.wms.exception.ErrorCode;
-import com.wms.entity.page.PageDomain;
+import com.wms.model.entity.app.ResponseEntity;
-import com.wms.entity.page.TableRequest;
+import com.wms.model.entity.page.PageDomain;
-import com.wms.entity.page.TableResponse;
+import com.wms.model.entity.page.TableRequest;
-import com.wms.entity.table.Goods;
+import com.wms.model.entity.page.TableResponse;
-import com.wms.entity.table.PartInfo;
+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;
@@ -80,6 +81,28 @@ public class GoodsController extends BaseController{
         return JSON.toJSONString(tblResp);
     }
 
+    /**
+     * 查找所有零件信息
+     */
+    @PostMapping("/getPartInfoList")
+    @ResponseBody
+    public BaseResponse getPartInfoList(@RequestBody Goods goods){
+        logger.info("请求的ip地址：{}", HttpUtils.getIpAddr(servletRequest));
+        logger.info("接收到查询物料数据请求：{}", JSON.toJSONString(goods));
+
+        if (StringUtils.isEmpty(goods.getGoodsName())){
+            logger.info("请求参数错误");
+           return ResultUtils.error(ErrorCode.PARAMS_ERROR);
+        }
+
+        List<Goods> goodsList = goodsService.selGoods(goods);
+        if (goodsList.isEmpty()) {
+            return ResultUtils.error(999, "未查询到物料信息");
+        }
+        return ResultUtils.success(goodsList);
+    }
+
+
     /**
      * 更新零件信息
      *

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.model.entity.app.LayerLocation;
-import com.wms.entity.app.ResponseEntity;
+import com.wms.model.entity.app.ResponseEntity;
-import com.wms.entity.app.RowLocation;
+import com.wms.model.entity.app.RowLocation;
-import com.wms.entity.dto.locaiton.SelectArea;
+import com.wms.model.entity.dto.locaiton.SelectArea;
-import com.wms.entity.page.PageDomain;
+import com.wms.model.entity.page.PageDomain;
-import com.wms.entity.page.TableRequest;
+import com.wms.model.entity.page.TableRequest;
-import com.wms.entity.page.TableResponse;
+import com.wms.model.entity.page.TableResponse;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Location;
-import com.wms.entity.table.Vehicle;
+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库位控制类

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.model.entity.common.WmsApiResponse;
-import com.wms.entity.dto.orderCheck.queryOrderCheckRequest;
+import com.wms.model.entity.dto.orderCheck.queryOrderCheckRequest;
-import com.wms.entity.table.OrderCheck;
+import com.wms.model.entity.table.OrderCheck;
 import com.wms.service.IOrderCheckService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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.model.entity.common.WmsApiResponse;
-import com.wms.entity.dto.orderIn.bindingVehicleRequest;
+import com.wms.model.entity.dto.orderIn.bindingVehicleRequest;
-import com.wms.entity.dto.orderIn.downOrderInRequest;
+import com.wms.model.entity.dto.orderIn.downOrderInRequest;
-import com.wms.entity.dto.orderIn.queryOrderInRequest;
+import com.wms.model.entity.dto.orderIn.queryOrderInRequest;
-import com.wms.entity.dto.orderIn.updateNumRequest;
+import com.wms.model.entity.dto.orderIn.updateNumRequest;
-import com.wms.entity.table.AppOrderIn;
+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

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.model.entity.common.WmsApiResponse;
-import com.wms.entity.dto.orderOut.handOrderOutRequest;
+import com.wms.model.entity.dto.orderOut.handOrderOutRequest;
-import com.wms.entity.dto.orderOut.queryOrderOutRequest;
+import com.wms.model.entity.dto.orderOut.queryOrderOutRequest;
-import com.wms.entity.table.OrderOut;
+import com.wms.model.entity.table.OrderOut;
 import com.wms.service.IOrderOutService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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.model.entity.page.PageDomain;
-import com.wms.entity.page.TableRequest;
+import com.wms.model.entity.page.TableRequest;
-import com.wms.entity.page.TableResponse;
+import com.wms.model.entity.page.TableResponse;
-import com.wms.entity.table.Task;
+import com.wms.model.entity.table.Task;
-import com.wms.service.TaskRecordService;
 import com.wms.service.TaskService;
 import com.wms.utils.HttpUtils;
 import jakarta.servlet.http.HttpServletRequest;

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.model.entity.app.ResponseEntity;
-import com.wms.entity.page.PageDomain;
+import com.wms.model.entity.page.PageDomain;
-import com.wms.entity.page.TableRequest;
+import com.wms.model.entity.page.TableRequest;
-import com.wms.entity.page.TableResponse;
+import com.wms.model.entity.page.TableResponse;
-import com.wms.entity.table.Stand;
+import com.wms.model.entity.table.Stand;
 import com.wms.service.StandService;
 import com.wms.utils.HttpUtils;
 import jakarta.servlet.http.HttpServletRequest;

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.model.entity.app.ResponseEntity;
-import com.wms.entity.dto.stock.StockQueryReuqest;
+import com.wms.model.entity.dto.stock.StockQueryReuqest;
-import com.wms.entity.page.PageDomain;
+import com.wms.model.entity.page.PageDomain;
-import com.wms.entity.page.TableRequest;
+import com.wms.model.entity.page.TableRequest;
-import com.wms.entity.page.TableResponse;
+import com.wms.model.entity.page.TableResponse;
-import com.wms.entity.table.Goods;
+import com.wms.model.entity.table.Location;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Stock;
-import com.wms.entity.table.PartInfo;
+import com.wms.model.entity.vo.StockVO;
-import com.wms.entity.table.Stock;
-import com.wms.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;

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.model.entity.app.*;
-import com.wms.entity.app.wcs.*;
+import com.wms.model.entity.app.wcs.*;
-import com.wms.entity.page.PageDomain;
+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.model.entity.page.TableRequest;
-import com.wms.entity.page.TableResponse;
+import com.wms.model.entity.page.TableResponse;
-import com.wms.entity.table.*;
+import com.wms.model.entity.table.*;
 import com.wms.constants.WmsConstants;
 import com.wms.utils.storage.LocationUtils;
 import com.wms.service.*;

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.model.entity.app.ResponseEntity;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Location;
-import com.wms.entity.app.wcs.WmsReceiveTaskResultEntity;
+import com.wms.model.entity.app.wcs.WmsReceiveTaskResultEntity;
-import com.wms.entity.table.Stock;
+import com.wms.model.entity.table.Stock;
-import com.wms.entity.table.Task;
+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;
 

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.model.entity.app.ResponseEntity;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Location;
-import com.wms.entity.table.User;
+import com.wms.model.entity.table.User;
-import com.wms.entity.table.Vehicle;
+import com.wms.model.entity.table.Vehicle;
-import com.wms.entity.test.ExcelTest;
+import com.wms.model.entity.test.ExcelTest;
 import com.wms.service.LocationService;
 import com.wms.service.VehicleService;
 import com.wms.utils.MyPassword;

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.model.entity.app.MenuEntity;
-import com.wms.entity.app.ResponseEntity;
+import com.wms.model.entity.app.ResponseEntity;
-import com.wms.entity.app.UserConfigEntity;
+import com.wms.model.entity.app.UserConfigEntity;
-import com.wms.entity.table.Menu;
+import com.wms.model.entity.table.Menu;
-import com.wms.entity.table.User;
+import com.wms.model.entity.table.User;
 import com.wms.service.MenuService;
 import com.wms.service.UserService;
 import com.wms.utils.MyPassword;

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", "四向车扫码入库异常,请稍后再试");
         }
 

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.model.entity.app.mes.CheckNoticeRequest;
-import com.wms.entity.app.mes.MesApiLocalResponse;
+import com.wms.model.entity.app.mes.MesApiLocalResponse;
-import com.wms.entity.app.mes.OutNoticeRequest;
+import com.wms.model.entity.app.mes.OutNoticeRequest;
-import com.wms.entity.app.mes.ReceiptInRequest;
+import com.wms.model.entity.app.mes.ReceiptInRequest;
 import com.wms.service.MesService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

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.model.entity.app.ResponseEntity;
-import com.wms.entity.app.container.ContainerApiLocalResponse;
+import com.wms.model.entity.app.wcs.RequireInRequest;
-import com.wms.entity.app.mes.MesApiLocalResponse;
+import com.wms.model.entity.app.wcs.WmsReceiveTaskResultEntity;
-import com.wms.entity.app.mes.SendMesPutInGoodsRequest;
+import com.wms.model.entity.table.*;
-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.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

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.model.entity.app.container.ContainerApiLocalResponse;
-import com.wms.entity.app.mes.MesApiLocalResponse;
+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;

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.model.entity.table.AppOrderIn;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Location;
-import com.wms.entity.table.OrderOut;
-import com.wms.entity.table.Vehicle;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

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;

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;
@@ -20,7 +20,7 @@ public interface GoodsMapper {
      * @param goodsId
      * @return
      */
-    Goods selGoodsByGoodsId(String goodsId);
+    Goods selGoodsByGoodsName(String goodsId);
 
     /**
      * 添加物料信息

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.model.entity.dto.locaiton.SelectArea;
-import com.wms.entity.table.Location;
+import com.wms.model.entity.table.Location;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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;

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;

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;
 

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;

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;

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.model.entity.table.Stock;
-import com.wms.entity.table.Stock;
-import com.wms.entity.table.Task;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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;

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;

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;

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;

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;
 

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;
 
 /**
  * 完成当前载具拣货任务实体类

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;
 
 /**
  * 完成当前载具的当次拣货任务

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;
 
 /**
  * 盘点任务信息

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;
 

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;
 

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;
 
 /**
  * 接口响应实体类

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;
 

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;
 

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;
 
 /**
  * 前台向后台发送出库请求实体类

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.model.entity.table.User;
-import com.wms.entity.BaseEntity;
+import com.wms.model.entity.BaseEntity;
 
 import java.util.List;
 

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;

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;

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

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;

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;

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;

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;

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;
 
 /**
  * 大屏用数据详细类

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;
 

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;

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;

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 出货通单请求信息
  */

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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 {
     /**

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;
 

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 {
     /**

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;
 

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;
 

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发送任务请求的实体类

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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

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;

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 {
 
 

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;

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;
 

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;
@@ -47,51 +47,34 @@ public class StockExcel {
     @ExcelExport("物料号")
     private String goodsId;
 
-//    /**
+    /**
-//     * 物料名称
+     * 规格型号
-//     */
+     */
-//    @ExcelExport("零件名称")
+    @ExcelExport("规格型号")
-//    private String goodsName;
+    private String goodsUnit;
 
-//    /**
-//     * 批次号
-//     */
-//    @ExcelExport("批次号")
-//    private String batchNo;
 
     /**
      * 可用数量
      */
-    @ExcelExport("可用数量")
+    @ExcelExport("库存数量")
     private Integer availableNum;
 
-//    /**
-//     * 剩余数量
-//     */
-//    @ExcelExport("剩余数量")
-//    private Integer remainNum;
 
 //    /**
-//     * 实际数量
+//     * 生产日期
 //     */
-//    @ExcelExport("实际数量")
+//    @ExcelExport("生产日期")
-//    private Integer realNum;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-
+//    @JsonFormat(pattern = "yyyy-MM-dd")
-
+//    private Date productionDate;
-    /**
+//    /**
-     * 生产日期
+//     * 过期日期
-     */
+//     */
-    @ExcelExport("生产日期")
+//    @ExcelExport("过期日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date productionDate;
+//    private Date expirationDate;
-    /**
-     * 过期日期
-     */
-    @ExcelExport("过期日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expirationDate;
     /**
      * 库存状态
      * 正常、出库中、锁定 等
@@ -106,23 +89,17 @@ public class StockExcel {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    /**
+
-     * 最后更新时间
+//    /**
-     */
+//     * 最后更新用户
-    @ExcelExport("最后更新时间")
+//     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @ExcelExport("上架人")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private String lastUpdateUser;
-    private Date lastUpdateTime;
+//    /**
-    /**
+//     * 备注
-     * 最后更新用户
+//     */
-     */
+//    @ExcelExport("备注")
-    @ExcelExport("上架人")
+//    private String remark;
-    private String lastUpdateUser;
-    /**
-     * 备注
-     */
-    @ExcelExport("备注")
-    private String remark;
 
 
     @ExcelExport("单重")

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;
 

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;
 
 /**
  * 前端请求表格数据

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;
 

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 的实体类

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;
 
 /**
  * 配置

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;
@@ -19,10 +18,11 @@ public class Goods extends BaseEntity implements Serializable {
     /**
      * 物料编号
      */
-    @ExcelImport("模具号")
-    @ExcelExport("模具号")
     private String goodsId;
 
+    @ExcelImport("模具号")
+    @ExcelExport("模具号")
+    private String goodsName;
 
 
     /**

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;
 
 /**
  * 库位

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;
 
 /**
  * 菜单

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;

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;

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;

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;
 
 /**
  * 站台表