huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-10-17 13:28:21 +08:00
parent f9467dffb8
commit b25372c65d
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
View File

@ -269,7 +269,7 @@ public class StockServiceImpl implements StockService {
String firstItemCode = barCodeVos.iterator().next().getItemCode(); String firstItemCode = barCodeVos.iterator().next().getItemCode();
Item item = validateItem(firstItemCode); Item item = validateItem(firstItemCode);
/*容器类型：托盘*/ /**容器类型：托盘*/
validateStockType(stock.getStockType()); validateStockType(stock.getStockType());
/**验证起点点位*/ /**验证起点点位*/

4
youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java
View File

@ -27,6 +27,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @author huojin * @author huojin
@ -107,6 +108,9 @@ public class Pick extends BaseEntity implements Serializable {
@ApiModelProperty(value = "仓库") @ApiModelProperty(value = "仓库")
private Dept dept; private Dept dept;
@OneToMany(mappedBy = "pick", cascade={CascadeType.PERSIST,CascadeType.REMOVE})
private List<PickDetail> pickDetails;
public void copy(Pick source) { public void copy(Pick source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
} }

3
youchain-system/src/main/java/com/youchain/businessdata/domain/PickDetail.java
View File

@ -15,6 +15,7 @@
*/ */
package com.youchain.businessdata.domain; package com.youchain.businessdata.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.youchain.base.BaseEntity; import com.youchain.base.BaseEntity;
import com.youchain.basicdata.domain.Item; import com.youchain.basicdata.domain.Item;
import com.youchain.basicdata.domain.Stock; import com.youchain.basicdata.domain.Stock;
@ -46,7 +47,7 @@ public class PickDetail extends BaseEntity implements Serializable {
@ApiModelProperty(value = "ID") @ApiModelProperty(value = "ID")
private Long id; private Long id;
@OneToOne @ManyToOne
@JoinColumn(name = "`pick_id`") @JoinColumn(name = "`pick_id`")
@ApiModelProperty(value = "出库单") @ApiModelProperty(value = "出库单")
private Pick pick; private Pick pick;

3
youchain-system/src/main/java/com/youchain/businessdata/service/dto/PickDto.java
View File

@ -17,11 +17,13 @@ package com.youchain.businessdata.service.dto;
import com.youchain.basicdata.domain.Point; import com.youchain.basicdata.domain.Point;
import com.youchain.basicdata.domain.Stock; import com.youchain.basicdata.domain.Stock;
import com.youchain.businessdata.domain.PickDetail;
import com.youchain.modules.system.domain.Dept; import com.youchain.modules.system.domain.Dept;
import lombok.Data; import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @author huojin * @author huojin
@ -108,6 +110,7 @@ public class PickDto implements Serializable {
*/ */
private Dept dept; private Dept dept;
/** /**
* 创建人 * 创建人
*/ */