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 effef69..39f066b 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 @@ -269,7 +269,7 @@ public class StockServiceImpl implements StockService { String firstItemCode = barCodeVos.iterator().next().getItemCode(); Item item = validateItem(firstItemCode); - /*容器类型:托盘*/ + /**容器类型:托盘*/ validateStockType(stock.getStockType()); /**验证起点点位*/ diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java index 1ffaa9c..fd66d11 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java @@ -27,6 +27,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; import javax.validation.constraints.*; import java.io.Serializable; +import java.util.List; /** * @author huojin @@ -107,6 +108,9 @@ public class Pick extends BaseEntity implements Serializable { @ApiModelProperty(value = "仓库") private Dept dept; + @OneToMany(mappedBy = "pick", cascade={CascadeType.PERSIST,CascadeType.REMOVE}) + private List pickDetails; + public void copy(Pick source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java index 968315c..afc2d60 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java @@ -15,6 +15,7 @@ */ package com.youchain.businessdata.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.youchain.base.BaseEntity; import com.youchain.basicdata.domain.Item; import com.youchain.basicdata.domain.Stock; @@ -46,7 +47,7 @@ public class PickDetail extends BaseEntity implements Serializable { @ApiModelProperty(value = "ID") private Long id; - @OneToOne + @ManyToOne @JoinColumn(name = "`pick_id`") @ApiModelProperty(value = "出库单") private Pick pick; diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/dto/PickDto.java b/youchain-system/src/main/java/com/youchain/businessdata/service/dto/PickDto.java index ee25284..985a3f8 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/dto/PickDto.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/dto/PickDto.java @@ -17,11 +17,13 @@ package com.youchain.businessdata.service.dto; import com.youchain.basicdata.domain.Point; import com.youchain.basicdata.domain.Stock; +import com.youchain.businessdata.domain.PickDetail; import com.youchain.modules.system.domain.Dept; import lombok.Data; import java.sql.Timestamp; import java.io.Serializable; +import java.util.List; /** * @author huojin @@ -108,6 +110,7 @@ public class PickDto implements Serializable { */ private Dept dept; + /** * 创建人 */