luyifan/wms-serve-mule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: luyifan:3564c6bcc31c80376674430cd07e4c6aeba1ad90
Branches Tags
luyifan:master
..
compare: luyifan:3d1f0ec758f3b173fc09d8124fb694fff1b1c7cd
Branches Tags
luyifan:master

No commits in common. "3564c6bcc31c80376674430cd07e4c6aeba1ad90" and "3d1f0ec758f3b173fc09d8124fb694fff1b1c7cd" have entirely different histories.
3564c6bcc3 ... 3d1f0ec758

147 changed files with 660 additions and 4267 deletions
Show Stats Expand all files Collapse all files

43
src/main/java/com/wms/bussiness/JobComponent.java
View File

@ -1,13 +1,15 @@
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.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.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.mapper.LocationMapper;
import com.wms.mapper.StockMapper;
import com.wms.mapper.TaskMapper;
@ -78,7 +80,7 @@ public class JobComponent extends BaseController {
private final VehicleMapper vehicleMapper;
@Scheduled(fixedDelay = 2000)
@Scheduled(fixedDelay = 1000)
public void sendTasksToWcs() {
try {
// 查找待下发的任务
@ -94,14 +96,14 @@ public class JobComponent extends BaseController {
sendTasksInToWcs(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;
}
if(task.getTaskType().equals(TaskType.MOVE.getCode())){
sendTasksMoveToWcs(task);
return;
}
}
}catch (Exception exception){
logger.error("定时器下发任务发生异常：{}", exception.toString());
@ -204,11 +206,10 @@ public class JobComponent extends BaseController {
return;
}
if(beforLocations.isEmpty()) {
logger.info("beforeLocations.isEmpty()");
logger.info("beforLocations.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");
@ -252,12 +253,11 @@ public class JobComponent extends BaseController {
logger.info("移库没有可用库位");
return; // 移库没有可用库位
}
Location emptyLocationItem = locationUtils.checkCanUseChangeLocation(emptyLocations,beforLocation); // 取得新库位
Location emptyLocationItem = locationUtils.checkCanUseChangeLocation(emptyLocations); // 取得新库位
if(emptyLocationItem == null) {
logger.info("没有可移动库位,移动库位存在任务");
return; // 没有可用库位或者m库位存在干涉
}
logger.info("查找到可用移动库位{},原库位{}", emptyLocationItem.getLocationId(),beforLocation.getLocationId());
// 锁定旧库位库存
stockMapper.updateStockStatusWithLocationId(beforLocation.getLocationId(), StockStatus.LOCK.getCode());
@ -333,6 +333,7 @@ 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());
@ -352,7 +353,6 @@ 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,23 +385,18 @@ public class JobComponent extends BaseController {
}
if (desDeepLocations.isEmpty()) {
logger.info("后一个库位信息为空");
}else {
Location desDeepLocation = desDeepLocations.get(0); // 移动目标库位后一个库位
return;
}
Location desDeepLocation = desDeepLocations.get(0); // 前一个库位
List<Task> desNotCompleteTasks = taskMapper.haveNotCompleteTask(desDeepLocation.getLocationId());
if (desNotCompleteTasks == null) {
logger.info("查询任务异常");
return;
}
// for (Task desNotCompleteTask : desNotCompleteTasks) {&& desNotCompleteTask.getTaskType() != 9
if (!desNotCompleteTasks.isEmpty()) {
logger.info("发送移库任务时目标库位,高深度存在未完成的任务，退出函数");
return;
}
// }
}
/* 检查该库位前一个深度是否存在库存，若存在库存则生成一个移库任务，此任务暂不下发 */
List<Location> thisLocations = locationService.selLocations(new Location(task.getOrigin()));

11
src/main/java/com/wms/bussiness/TaskOperation.java
View File

@ -1,7 +1,12 @@
package com.wms.bussiness;
import com.alibaba.fastjson2.JSON;
import com.wms.constants.enums.*;
import com.wms.model.entity.table.*;
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.mapper.*;
import com.wms.service.PartInfoService;
import com.wms.utils.WmsUtils;
@ -136,6 +141,7 @@ 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("");
@ -144,8 +150,9 @@ public class TaskOperation {
addStock.setRealNum(appOrderIn.getGoodsNum().intValue());
addStock.setProviderId("");
addStock.setProviderName("");
//addStock.setProductionDate(null);
addStock.setExpirationDate(null);
addStock.setStockStatus(StockStatus.OK.getCode());
addStock.setStockStatus(0);
addStock.setGoodsStatus(null);
addStock.setCreateTime(new Date());
addStock.setLastUpdateTime(null);

24
src/main/java/com/wms/bussiness/TaskTimer.java Normal file
View File

@ -0,0 +1,24 @@
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 {
}

12
src/main/java/com/wms/controller/ConfigController.java
View File

@ -1,10 +1,17 @@
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.model.entity.app.ResponseEntity;
import com.wms.model.entity.table.Config;
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.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;
@ -15,6 +22,7 @@ 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;
/**

10
src/main/java/com/wms/controller/DisplayController.java
View File

@ -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.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.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.service.LocationService;
import com.wms.service.StockService;
import com.wms.utils.HttpUtils;

23
src/main/java/com/wms/controller/ExcelController.java
View File

@ -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.model.entity.app.ResponseEntity;
import com.wms.model.entity.excel.StockExcel;
import com.wms.model.entity.table.*;
import com.wms.entity.app.ResponseEntity;
import com.wms.entity.excel.StockExcel;
import com.wms.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.selGoodsByGoodsName(goods.getGoodsName()) != null) {
if (goodsService.selGoodsByGoodsId(goods.getGoodsId()) != null) {
goodsService.modifyGoods(goods);
}else {
goodsService.addGoods(goods);
@ -86,17 +86,6 @@ 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);

37
src/main/java/com/wms/controller/GoodsController.java
View File

@ -3,16 +3,15 @@ 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.exception.ErrorCode;
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.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.service.GoodsService;
import com.wms.service.PartInfoService;
import com.wms.utils.HttpUtils;
import com.wms.utils.StringUtils;
import jakarta.servlet.http.HttpServletRequest;
@ -81,28 +80,6 @@ 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);
}
/**
* 更新零件信息
*

19
src/main/java/com/wms/controller/LocationController.java
View File

@ -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.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.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.constants.WmsConstants;
import com.wms.constants.enums.LocationStatus;
import com.wms.service.LocationService;
@ -31,6 +31,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
/**
* WMS库位控制类

6
src/main/java/com/wms/controller/OrderCheckController.java
View File

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

14
src/main/java/com/wms/controller/OrderInController.java
View File

@ -1,17 +1,19 @@
package com.wms.controller;
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.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.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

8
src/main/java/com/wms/controller/OrderOutController.java
View File

@ -1,10 +1,10 @@
package com.wms.controller;
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.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.service.IOrderOutService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

9
src/main/java/com/wms/controller/RecordController.java
View File

@ -4,10 +4,11 @@ import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.wms.constants.enums.ResponseCode;
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.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.service.TaskService;
import com.wms.utils.HttpUtils;
import jakarta.servlet.http.HttpServletRequest;

10
src/main/java/com/wms/controller/StandController.java
View File

@ -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.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.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.service.StandService;
import com.wms.utils.HttpUtils;
import jakarta.servlet.http.HttpServletRequest;

19
src/main/java/com/wms/controller/StockController.java
View File

@ -5,15 +5,18 @@ 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.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.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.mapper.LocationMapper;
import com.wms.mapper.StockMapper;
import com.wms.service.StockService;
import com.wms.utils.HttpUtils;
import com.wms.utils.StringUtils;

12
src/main/java/com/wms/controller/TaskController.java
View File

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

12
src/main/java/com/wms/controller/TaskDealController.java
View File

@ -2,11 +2,11 @@ package com.wms.controller;
import com.alibaba.fastjson2.JSON;
import com.wms.constants.enums.*;
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.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.service.LocationService;
import com.wms.service.StockService;
import com.wms.service.TaskService;
@ -20,8 +20,10 @@ 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;

10
src/main/java/com/wms/controller/TestController.java
View File

@ -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.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.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.service.LocationService;
import com.wms.service.VehicleService;
import com.wms.utils.MyPassword;

10
src/main/java/com/wms/controller/UserController.java
View File

@ -2,11 +2,11 @@ package com.wms.controller;
import com.alibaba.fastjson2.JSON;
import com.wms.constants.enums.ResponseCode;
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.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.service.MenuService;
import com.wms.service.UserService;
import com.wms.utils.MyPassword;

4
src/main/java/com/wms/controller/others/ContainerController.java
View File

@ -2,7 +2,7 @@ package com.wms.controller.others;
import com.alibaba.fastjson2.JSON;
import com.wms.controller.BaseController;
import com.wms.model.entity.app.container.*;
import com.wms.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.error("四向车扫码入库失败，出现异常，请稍后再试",e);
log.info("四向车扫码入库失败，出现异常，请稍后再试");
return new CreateInstoreTaskResponse("400", "四向车扫码入库异常,请稍后再试");
}

8
src/main/java/com/wms/controller/others/MesController.java
View File

@ -1,10 +1,10 @@
package com.wms.controller.others;
import com.wms.controller.BaseController;
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.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.service.MesService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;

15
src/main/java/com/wms/controller/others/WcsController.java
View File

@ -1,11 +1,16 @@
package com.wms.controller.others;
import com.alibaba.fastjson2.JSON;
import com.wms.bussiness.TaskOperation;
import com.wms.constants.enums.*;
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.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.mapper.LocationMapper;
import com.wms.mapper.StockMapper;
import com.wms.mapper.TaskMapper;
@ -26,7 +31,9 @@ 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

2
src/main/java/com/wms/model/entity/BaseEntity.java → src/main/java/com/wms/entity/BaseEntity.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity;
package com.wms.entity;
import com.alibaba.fastjson2.JSON;

2
src/main/java/com/wms/model/entity/app/FinishPickTaskRequest.java → src/main/java/com/wms/entity/app/FinishPickTaskRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
/**
* 完成当前载具拣货任务实体类

2
src/main/java/com/wms/model/entity/app/FinishVehicleAndPartRequest.java → src/main/java/com/wms/entity/app/FinishVehicleAndPartRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
/**
* 完成当前载具的当次拣货任务

4
src/main/java/com/wms/model/entity/app/InventoryTask.java → src/main/java/com/wms/entity/app/InventoryTask.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 盘点任务信息

4
src/main/java/com/wms/model/entity/app/LayerLocation.java → src/main/java/com/wms/entity/app/LayerLocation.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import com.wms.model.entity.table.Location;
import com.wms.entity.table.Location;
import java.util.List;

2
src/main/java/com/wms/model/entity/app/MenuEntity.java → src/main/java/com/wms/entity/app/MenuEntity.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import java.util.List;

4
src/main/java/com/wms/model/entity/app/ResponseEntity.java → src/main/java/com/wms/entity/app/ResponseEntity.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 接口响应实体类

2
src/main/java/com/wms/model/entity/app/RowLocation.java → src/main/java/com/wms/entity/app/RowLocation.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import java.util.List;

4
src/main/java/com/wms/model/entity/app/TaskInRequestEntity.java → src/main/java/com/wms/entity/app/TaskInRequestEntity.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import java.util.Date;

4
src/main/java/com/wms/model/entity/app/TaskOutRequestEntity.java → src/main/java/com/wms/entity/app/TaskOutRequestEntity.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 前台向后台发送出库请求实体类

6
src/main/java/com/wms/model/entity/app/UserConfigEntity.java → src/main/java/com/wms/entity/app/UserConfigEntity.java
View File

@ -1,7 +1,7 @@
package com.wms.model.entity.app;
package com.wms.entity.app;
import com.wms.model.entity.table.User;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.table.User;
import com.wms.entity.BaseEntity;
import java.util.List;

2
src/main/java/com/wms/model/entity/app/container/ContainerApiLocalResponse.java → src/main/java/com/wms/entity/app/container/ContainerApiLocalResponse.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskRequest.java → src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;

3
src/main/java/com/wms/model/entity/app/container/CreateFeedPalletTaskResponse.java → src/main/java/com/wms/entity/app/container/CreateFeedPalletTaskResponse.java
View File

@ -1,7 +1,8 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@Data

2
src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskRequest.java → src/main/java/com/wms/entity/app/container/CreateInstoreTaskRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;

2
src/main/java/com/wms/model/entity/app/container/CreateInstoreTaskResponse.java → src/main/java/com/wms/entity/app/container/CreateInstoreTaskResponse.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/container/SendContainerTaskRequest.java → src/main/java/com/wms/entity/app/container/SendContainerTaskRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/container/TaskStateNoticeRequest.java → src/main/java/com/wms/entity/app/container/TaskStateNoticeRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.container;
package com.wms.entity.app.container;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/wms/model/entity/app/display/LocationData.java → src/main/java/com/wms/entity/app/display/LocationData.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.display;
package com.wms.entity.app.display;
/**
* 大屏用数据详细类

2
src/main/java/com/wms/model/entity/app/display/LocationInfo.java → src/main/java/com/wms/entity/app/display/LocationInfo.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.display;
package com.wms.entity.app.display;
import java.util.List;

2
src/main/java/com/wms/model/entity/app/mes/CheckNoticeRequest.java → src/main/java/com/wms/entity/app/mes/CheckNoticeRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;

2
src/main/java/com/wms/model/entity/app/mes/MesApiLocalResponse.java → src/main/java/com/wms/entity/app/mes/MesApiLocalResponse.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

5
src/main/java/com/wms/model/entity/app/mes/OutNoticeRequest.java → src/main/java/com/wms/entity/app/mes/OutNoticeRequest.java
View File

@ -1,11 +1,14 @@
package com.wms.model.entity.app.mes;
package com.wms.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 出货通单请求信息
*/

2
src/main/java/com/wms/model/entity/app/mes/OutNoticeRequestRow.java → src/main/java/com/wms/entity/app/mes/OutNoticeRequestRow.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;

3
src/main/java/com/wms/model/entity/app/mes/ReceiptInRequest.java → src/main/java/com/wms/entity/app/mes/ReceiptInRequest.java
View File

@ -1,8 +1,9 @@
package com.wms.model.entity.app.mes;
package com.wms.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;
/**

2
src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRequest.java → src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/mes/SendMesGoodsInventoryRow.java → src/main/java/com/wms/entity/app/mes/SendMesGoodsInventoryRow.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/mes/SendMesGoodsMoveRequest.java → src/main/java/com/wms/entity/app/mes/SendMesGoodsMoveRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/mes/SendMesPutInGoodsRequest.java → src/main/java/com/wms/entity/app/mes/SendMesPutInGoodsRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRequest.java → src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/mes/SendMesPutOutGoodsRow.java → src/main/java/com/wms/entity/app/mes/SendMesPutOutGoodsRow.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/mes/SendMesStockRequest.java → src/main/java/com/wms/entity/app/mes/SendMesStockRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.mes;
package com.wms.entity.app.mes;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/app/wcs/DisposeStandRequest.java → src/main/java/com/wms/entity/app/wcs/DisposeStandRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
public class DisposeStandRequest {
/**

2
src/main/java/com/wms/model/entity/app/wcs/PickTaskRequest.java → src/main/java/com/wms/entity/app/wcs/PickTaskRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
import java.util.List;

2
src/main/java/com/wms/model/entity/app/wcs/PickTaskResponse.java → src/main/java/com/wms/entity/app/wcs/PickTaskResponse.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
public class PickTaskResponse {
/**

2
src/main/java/com/wms/model/entity/app/wcs/RequireInRequest.java → src/main/java/com/wms/entity/app/wcs/RequireInRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
import jakarta.validation.constraints.NotBlank;

4
src/main/java/com/wms/model/entity/app/wcs/WcsGoods.java → src/main/java/com/wms/entity/app/wcs/WcsGoods.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import java.math.BigDecimal;

4
src/main/java/com/wms/model/entity/app/wcs/WcsTask.java → src/main/java/com/wms/entity/app/wcs/WcsTask.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* WMS向WCS发送任务请求的实体类

4
src/main/java/com/wms/model/entity/app/wcs/WcsToWmsInspectVesselEntity.java → src/main/java/com/wms/entity/app/wcs/WcsToWmsInspectVesselEntity.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import java.math.BigDecimal;

4
src/main/java/com/wms/model/entity/app/wcs/WmsReceiveTaskResultEntity.java → src/main/java/com/wms/entity/app/wcs/WmsReceiveTaskResultEntity.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.app.wcs;
package com.wms.entity.app.wcs;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

2
src/main/java/com/wms/model/entity/common/WmsApiResponse.java → src/main/java/com/wms/entity/common/WmsApiResponse.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.common;
package com.wms.entity.common;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;

2
src/main/java/com/wms/model/entity/dto/locaiton/SelectArea.java → src/main/java/com/wms/entity/dto/locaiton/SelectArea.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.locaiton;
package com.wms.entity.dto.locaiton;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;

2
src/main/java/com/wms/model/entity/dto/orderCheck/queryOrderCheckRequest.java → src/main/java/com/wms/entity/dto/orderCheck/queryOrderCheckRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.orderCheck;
package com.wms.entity.dto.orderCheck;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/dto/orderCheck/remarkOrderCheckRequest.java → src/main/java/com/wms/entity/dto/orderCheck/remarkOrderCheckRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.orderCheck;
package com.wms.entity.dto.orderCheck;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/wms/model/entity/dto/orderIn/bindingVehicleRequest.java → src/main/java/com/wms/entity/dto/orderIn/bindingVehicleRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.orderIn;
package com.wms.entity.dto.orderIn;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/dto/orderIn/downOrderInRequest.java → src/main/java/com/wms/entity/dto/orderIn/downOrderInRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.orderIn;
package com.wms.entity.dto.orderIn;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

3
src/main/java/com/wms/model/entity/dto/orderIn/queryOrderInRequest.java → src/main/java/com/wms/entity/dto/orderIn/queryOrderInRequest.java
View File

@ -1,8 +1,9 @@
package com.wms.model.entity.dto.orderIn;
package com.wms.entity.dto.orderIn;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data

2
src/main/java/com/wms/model/entity/dto/orderIn/updateNumRequest.java → src/main/java/com/wms/entity/dto/orderIn/updateNumRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.orderIn;
package com.wms.entity.dto.orderIn;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

4
src/main/java/com/wms/model/entity/dto/orderOut/handOrderOutRequest.java → src/main/java/com/wms/entity/dto/orderOut/handOrderOutRequest.java
View File

@ -1,7 +1,9 @@
package com.wms.model.entity.dto.orderOut;
package com.wms.entity.dto.orderOut;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
public class handOrderOutRequest {

2
src/main/java/com/wms/model/entity/dto/orderOut/queryOrderOutRequest.java → src/main/java/com/wms/entity/dto/orderOut/queryOrderOutRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.orderOut;
package com.wms.entity.dto.orderOut;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/dto/stock/StockQueryReuqest.java → src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.dto.stock;
package com.wms.entity.dto.stock;
import lombok.Data;

83
src/main/java/com/wms/model/entity/excel/StockExcel.java → src/main/java/com/wms/entity/excel/StockExcel.java
View File

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

2
src/main/java/com/wms/model/entity/page/PageDomain.java → src/main/java/com/wms/entity/page/PageDomain.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.page;
package com.wms.entity.page;
import com.wms.utils.StringUtils;

2
src/main/java/com/wms/model/entity/page/TableRequest.java → src/main/java/com/wms/entity/page/TableRequest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.page;
package com.wms.entity.page;
/**
* 前端请求表格数据

2
src/main/java/com/wms/model/entity/page/TableResponse.java → src/main/java/com/wms/entity/page/TableResponse.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.page;
package com.wms.entity.page;
import java.util.List;

7
src/main/java/com/wms/model/entity/table/AppOrderIn.java → src/main/java/com/wms/entity/table/AppOrderIn.java
View File

@ -1,12 +1,17 @@
package com.wms.model.entity.table;
package com.wms.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 的实体类

4
src/main/java/com/wms/model/entity/table/Config.java → src/main/java/com/wms/entity/table/Config.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 配置

10
src/main/java/com/wms/model/entity/table/Goods.java → src/main/java/com/wms/entity/table/Goods.java
View File

@ -1,7 +1,8 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import com.wms.utils.excel.ExcelExport;
import com.wms.utils.excel.ExcelImport;
import lombok.Data;
@ -18,11 +19,10 @@ public class Goods extends BaseEntity implements Serializable {
/**
* 物料编号
*/
private String goodsId;
@ExcelImport("模具号")
@ExcelExport("模具号")
private String goodsName;
private String goodsId;
/**

4
src/main/java/com/wms/model/entity/table/Location.java → src/main/java/com/wms/entity/table/Location.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 库位

4
src/main/java/com/wms/model/entity/table/Menu.java → src/main/java/com/wms/entity/table/Menu.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 菜单

2
src/main/java/com/wms/model/entity/table/OrderCheck.java → src/main/java/com/wms/entity/table/OrderCheck.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/wms/model/entity/table/OrderOut.java → src/main/java/com/wms/entity/table/OrderOut.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;

2
src/main/java/com/wms/model/entity/table/PartInfo.java → src/main/java/com/wms/entity/table/PartInfo.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.wms.utils.excel.ExcelExport;
import com.wms.utils.excel.ExcelImport;

4
src/main/java/com/wms/model/entity/table/Stand.java → src/main/java/com/wms/entity/table/Stand.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 站台表

4
src/main/java/com/wms/model/entity/table/Stock.java → src/main/java/com/wms/entity/table/Stock.java
View File

@ -1,7 +1,7 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import com.wms.utils.excel.ExcelExport;
import org.springframework.format.annotation.DateTimeFormat;

4
src/main/java/com/wms/model/entity/table/Task.java → src/main/java/com/wms/entity/table/Task.java
View File

@ -1,7 +1,7 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import com.wms.utils.excel.ExcelExport;
import org.springframework.format.annotation.DateTimeFormat;

4
src/main/java/com/wms/model/entity/table/TaskBak.java → src/main/java/com/wms/entity/table/TaskBak.java
View File

@ -1,7 +1,7 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import com.wms.utils.excel.ExcelExport;
import org.springframework.format.annotation.DateTimeFormat;

4
src/main/java/com/wms/model/entity/table/User.java → src/main/java/com/wms/entity/table/User.java
View File

@ -1,7 +1,7 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
import java.util.Date;

4
src/main/java/com/wms/model/entity/table/Vehicle.java → src/main/java/com/wms/entity/table/Vehicle.java
View File

@ -1,6 +1,6 @@
package com.wms.model.entity.table;
package com.wms.entity.table;
import com.wms.model.entity.BaseEntity;
import com.wms.entity.BaseEntity;
/**
* 载具

2
src/main/java/com/wms/model/entity/test/ExcelTest.java → src/main/java/com/wms/entity/test/ExcelTest.java
View File

@ -1,4 +1,4 @@
package com.wms.model.entity.test;
package com.wms.entity.test;
import com.wms.utils.excel.ExcelExport;
import com.wms.utils.excel.ExcelImport;

5
src/main/java/com/wms/model/entity/vo/StockVO.java → src/main/java/com/wms/entity/vo/StockVO.java
View File

@ -1,9 +1,10 @@
package com.wms.model.entity.vo;
package com.wms.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wms.model.entity.table.Stock;
import com.wms.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;

5
src/main/java/com/wms/filter/GlobalExceptionHandler.java
View File

@ -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.model.entity.app.container.ContainerApiLocalResponse;
import com.wms.model.entity.app.mes.MesApiLocalResponse;
import com.wms.entity.app.container.ContainerApiLocalResponse;
import com.wms.entity.app.mes.MesApiLocalResponse;
import com.wms.exception.BusinessException;
import jakarta.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
@ -12,6 +12,7 @@ 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;

7
src/main/java/com/wms/mapper/AppOrderInMapper.java
View File

@ -1,10 +1,13 @@
package com.wms.mapper;
import com.wms.model.entity.table.AppOrderIn;
import com.wms.model.entity.table.Location;
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 org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

2
src/main/java/com/wms/mapper/ConfigMapper.java
View File

@ -1,6 +1,6 @@
package com.wms.mapper;
import com.wms.model.entity.table.Config;
import com.wms.entity.table.Config;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

4
src/main/java/com/wms/mapper/GoodsMapper.java
View File

@ -1,6 +1,6 @@
package com.wms.mapper;
import com.wms.model.entity.table.Goods;
import com.wms.entity.table.Goods;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -20,7 +20,7 @@ public interface GoodsMapper {
* @param goodsId
* @return
*/
Goods selGoodsByGoodsName(String goodsId);
Goods selGoodsByGoodsId(String goodsId);
/**
* 添加物料信息

4
src/main/java/com/wms/mapper/LocationMapper.java
View File

@ -1,7 +1,7 @@
package com.wms.mapper;
import com.wms.model.entity.dto.locaiton.SelectArea;
import com.wms.model.entity.table.Location;
import com.wms.entity.dto.locaiton.SelectArea;
import com.wms.entity.table.Location;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

2
src/main/java/com/wms/mapper/MenuMapper.java
View File

@ -1,6 +1,6 @@
package com.wms.mapper;
import com.wms.model.entity.table.Menu;
import com.wms.entity.table.Menu;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

2
src/main/java/com/wms/mapper/OrderCheckMapper.java
View File

@ -1,6 +1,6 @@
package com.wms.mapper;
import com.wms.model.entity.table.OrderCheck;
import com.wms.entity.table.OrderCheck;
import org.mapstruct.Mapper;
import java.util.List;

2
src/main/java/com/wms/mapper/OrderOutMapper.java
View File

@ -1,6 +1,6 @@
package com.wms.mapper;
import com.wms.model.entity.table.OrderOut;
import com.wms.entity.table.OrderOut;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;

Some files were not shown because too many files have changed in this diff Show More