houjianlan
/
kams4_test_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2024-10-11 16:11:58 +08:00
parent 07ec36733f
commit 47deab07bc
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
youchain-system/src/main/java/com/youchain/basicdata/domain/WorkPoint.java
View File

@ -16,6 +16,7 @@
package com.youchain.basicdata.domain;
import com.youchain.base.BaseEntity;
import com.youchain.modules.system.domain.Dept;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@ -92,9 +93,10 @@ public class WorkPoint extends BaseEntity implements Serializable {
@ApiModelProperty(value = "最大料箱任务数")
private Integer maxStockNumber;
@Column(name = "`dept_id`")
@OneToOne
@JoinColumn(name = "dept_id",nullable = false)
@ApiModelProperty(value = "仓库ID")
private Long deptId;
private Dept dept;
@Column(name = "`description`")
@ApiModelProperty(value = "描述")
@ -102,23 +104,7 @@ public class WorkPoint extends BaseEntity implements Serializable {
@Column(name = "`enabled`")
@ApiModelProperty(value = "是否启用")
private Boolean enabled;
@Column(name = "`create_by`")
@ApiModelProperty(value = "创建人")
private String createBy;
@Column(name = "`update_by`")
@ApiModelProperty(value = "修改人")
private String updateBy;
@Column(name = "`create_time`")
@ApiModelProperty(value = "创建时间")
private Timestamp createTime;
@Column(name = "`update_time`")
@ApiModelProperty(value = "修改时间")
private Timestamp updateTime;
private Boolean enabled=true;
public void copy(WorkPoint source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

12
youchain-system/src/main/java/com/youchain/basicdata/service/dto/WorkPointDto.java
View File

@ -75,16 +75,4 @@ public class WorkPointDto implements Serializable {
/** 是否启用 */
private Boolean enabled;
/** 创建人 */
private String createBy;
/** 修改人 */
private String updateBy;
/** 创建时间 */
private Timestamp createTime;
/** 修改时间 */
private Timestamp updateTime;
}

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

@ -73,6 +73,8 @@ public class PointServiceImpl implements PointService {
pointList = pointRepository.getPointList(BaseStatus.BHZC);
} else if (type.equals("5")) {//ZZKW
pointList = pointRepository.getPointList(BaseStatus.ZZKW);
} else if (type.equals("0")) {
pointList=pointRepository.findAll();
}
return pointMapper.toDto(pointList);
}

1
youchain-system/src/main/java/com/youchain/basicdata/service/impl/WorkPointServiceImpl.java
View File

@ -73,6 +73,7 @@ public class WorkPointServiceImpl implements WorkPointService {
if(workPointRepository.findByCode(resources.getCode()) != null){
throw new EntityExistException(WorkPoint.class,"code",resources.getCode());
}
resources.setDept(UserUtils.getDept());
return workPointMapper.toDto(workPointRepository.save(resources));
}