diff --git a/youchain-system/src/main/java/com/youchain/appupdate/service/impl/ContainerServiceImpl.java b/youchain-system/src/main/java/com/youchain/appupdate/service/impl/ContainerServiceImpl.java index bc953d4..a0d9711 100644 --- a/youchain-system/src/main/java/com/youchain/appupdate/service/impl/ContainerServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/appupdate/service/impl/ContainerServiceImpl.java @@ -110,7 +110,7 @@ public class ContainerServiceImpl implements ContainerService { log.error("请扫描正确点位，操作失败！"); return false; } - String areaName = point.getArea().getName();//库区名称 + String areaName = point.getArea().getCode();//库区 String code = "0"; String message = null; String agv_on_off = "OFF"; diff --git a/youchain-system/src/main/java/com/youchain/basicdata/domain/Point.java b/youchain-system/src/main/java/com/youchain/basicdata/domain/Point.java index ff218c8..f1aa9f8 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/domain/Point.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/domain/Point.java @@ -112,7 +112,7 @@ public class Point extends BaseEntity implements Serializable { @Column(name = "`item_height`") @ApiModelProperty(value = "高度") - private Double itemHeight; + private Double itemHeight=0d; public void copy(Point source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/dto/PointDto.java b/youchain-system/src/main/java/com/youchain/basicdata/service/dto/PointDto.java index 4de9bdd..13a8b41 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/dto/PointDto.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/dto/PointDto.java @@ -80,7 +80,7 @@ public class PointDto implements Serializable { private int rows; /** 高度 */ - private Double itemHeight; + private Double itemHeight=0d; /** 创建人 */ private String createBy; diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java index b73ba15..c7b3d89 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java @@ -150,7 +150,7 @@ public class PointServiceImpl implements PointService { map.put("描述", point.getDescription()); map.put("区域编码", point.getBeatCode()); map.put("物料编码", point.getItemCode()); - map.put("库区名称", point.getArea().getName()); + map.put("库区名称", .getName()); map.put("是否启用", point.getEnabled()); map.put("仓库名称", point.getDept().getName()); map.put("坐标X", point.getPosX()); diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java index 87ff8f6..39b79c4 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java @@ -215,11 +215,11 @@ public class StockServiceImpl implements StockService { public void containerIn(String containerCode, String position, String itemCode) { Stock stock = validateStock(containerCode);//验证容器 Point point = validateSrcPoint(position);//验证点位 - if (!isRestrictedArea(point.getArea().getName())) { + if (!isRestrictedArea(.getCode())) { throw new RuntimeException(point.getCode() + "点位不能入场!"); } - switch (point.getArea().getName()) { + switch (.getCode()) { case AreaNameDic.XJQ: case AreaNameDic.DJQ: if (StringUtils.isEmpty(itemCode)) { @@ -288,7 +288,7 @@ public class StockServiceImpl implements StockService { validateStockStatus(stock);//验证容器状态 validateStockAndItem(stock, item);//验证容器类型和物料类型是否匹配 Point srcPoint = validateSrcPoint(pointCode);//验证点位 - String srcPointAreaName = srcPoint.getArea().getName(); + String srcPointAreaName = src.getCode(); if (!isValidMCArea(srcPointAreaName)) { throw new RuntimeException(srcPoint.getCode() + "为" + srcPointAreaName + "不能入库!"); } @@ -439,7 +439,7 @@ public class StockServiceImpl implements StockService { private void handleFullContainerCall(String itemCode, Point endPoint) { Item item = validateItem(itemCode);//验证物料 - String endPointAreaName = endPoint.getArea().getName(); + String endPointAreaName = end.getCode(); //只允许叫料区叫满车 if (!isValidMCJLArea(endPointAreaName)) { throw new RuntimeException(endPoint.getCode() + "点位不能叫满车!"); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java index a108e65..281fdf0 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java @@ -159,7 +159,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { String viewBoardType = ""; Point point = pointService.findByCode(agvTasks.getStartSlotCode(), null, null, null, null,null); //到达上视自动识别 - if (AreaNameDic.CPRKQ.equals(point.getArea().getName())) { + if (AreaNameDic.CPRKQ.equals(point.getArea().getCode())) { viewBoardType = "IDENTIFY_REQUIRE"; } objMap.put("viewBoardType", viewBoardType);//上视识别类型；需要 IDENTIFY_REQUIRE 不需要NORMAL @@ -444,7 +444,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { private void handleComContainer(AgvTask agvTask, String containerCode) { //任务完成；根据AGV任务的目标点位走对应流程 Point endPoint = pointService.findByCode(agvTask.getEndSlotCode(), null, null, null, null,null); - String endAreaName = endPoint.getArea().getName(); + String endAreaName = endPoint.getArea().getCode(); Stock stock = stockRepository.findByCode(containerCode, null); if (stock == null) { throw new RuntimeException(containerCode + "容器不存在! 请维护"); @@ -637,7 +637,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { private void handleCanceledTask(AgvTask agvTask, String containerCode) { //任务取消完成 Point endPoint = pointService.findByCode(agvTask.getEndSlotCode(), null, null, null, null,null); - String endAreaName = endPoint.getArea().getName(); + String endAreaName = endPoint.getArea().getCode(); Stock stock = stockRepository.findByCode(containerCode, null); if (stock == null) { throw new RuntimeException(containerCode + "容器不存在! 请维护"); diff --git a/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java b/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java index ddbd5a3..e4c2687 100644 --- a/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java +++ b/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java @@ -10,36 +10,41 @@ public interface AreaNameDic { /** * 大小件入库区 */ - public static String DXJRKQ = "大小件入库区"; + public static String DXJRKQ = "DXJRKQ"; /** * 大件存储区 */ - public static String DJQ = "大件存储区"; + public static String DJQ = "DJQ"; /** * 小件存储区 */ - public static String XJQ = "小件存储区"; + public static String XJQ = "XJQ"; /** * 翻包区 */ - public static String FBQ = "翻包区"; + public static String FBQ = "FBQ"; + + /** + * 翻包存储区 + */ + public static String FBCQ = "FBCQ"; /** * 成品入库区 */ - public static String CPRKQ = "成品入库区"; + public static String CPRKQ = "CPRKQ"; /** * 返修区 */ - public static String FXQ = "返修区"; + public static String FXQ = "FXQ"; /** * 叫料区 */ - public static String JLQ = "叫料区"; + public static String JLQ = "JLQ"; }