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 ab4e2d7..edda992 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 @@ -122,7 +122,7 @@ public class Point extends BaseEntity implements Serializable { @OneToOne @JoinColumn(name = "`stock_id`") @ApiModelProperty(value = "容器") - private transient Stock stock; + private Stock stock; public void copy(Point source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/youchain-system/src/main/java/com/youchain/basicdata/domain/Stock.java b/youchain-system/src/main/java/com/youchain/basicdata/domain/Stock.java index 95f6b83..1988323 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/domain/Stock.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/domain/Stock.java @@ -60,10 +60,6 @@ public class Stock extends BaseEntity implements Serializable { @ApiModelProperty(value = "仓库") private Dept dept; - @OneToOne - @JoinColumn(name = "point_id") - @ApiModelProperty(value = "点位") - private Point point; @Column(name = "`sub_count`") @ApiModelProperty(value = "子容器数量") diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/dto/StockDto.java b/youchain-system/src/main/java/com/youchain/basicdata/service/dto/StockDto.java index a7bd4b5..80b9975 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/dto/StockDto.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/dto/StockDto.java @@ -44,8 +44,7 @@ public class StockDto implements Serializable { /** 仓库ID */ private DeptSmallDto dept; - /** 地标ID */ - private PointSmallDto point; + /** 子容器数量 */ private Integer subCount; @@ -86,4 +85,4 @@ public class StockDto implements Serializable { /** 顶级容器ID */ private Long topId; -} \ No newline at end of file +} 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 caf19da..43da8ac 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 @@ -129,7 +129,6 @@ public class StockServiceImpl implements StockService { map.put("容器代码", stock.getCode()); map.put("上级容器ID", stock.getPid()); map.put("仓库ID", stock.getDept().getName()); - map.put("地标ID", stock.getPoint().getName()); map.put("子容器数量", stock.getSubCount()); map.put("容器名称", stock.getName()); map.put("类型名称", stock.getStockType().getName()); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java index 642f9cd..737b07a 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java @@ -266,7 +266,6 @@ public class AsnDetailServiceImpl implements AsnDetailService { asnDetailRepository.save(asnDetail); //容器绑定 - stock.setPoint(point); stock.setStatus(BaseStatus.USED); stock.setDept(item.getDept()); stockRepository.save(stock);