no message

main
HUOJIN\92525 2024-09-25 11:25:54 +08:00
parent 1905f8d8e3
commit 557ed2a9f6
5 changed files with 3 additions and 10 deletions

View File

@ -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));
}

View File

@ -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 = "子容器数量")

View File

@ -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;
}
}

View File

@ -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());

View File

@ -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);