Skip to content

D
data-acquisition
Commit 994afce8 authored by renchao's avatar renchao
Browse files
Options

生产工序业务修改

parent 2b633958
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 22 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
View file @ 994afce8
......@@ -77,7 +77,7 @@ public class ProjectEnum {
CONSUME_DATE(1, "ConsumeDate","材料消耗日期"),
PROCESSES_NAME(2, "processesName","工序名称");
PROCESSES_NAME(2, "ProcessesName","工序名称");
// 成员变量
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml
View file @ 994afce8
......@@ -50,8 +50,6 @@
a.Price,
a.TotalMoney,
b.Wcdw
<include refid="TWeightColumns"/>
<include refid="TProcessesCrusherColumns"/>
FROM T_Processes_Crusher a
<include refid="TProcessesCrusherJoins"/>
<where>
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastQuery.java
View file @ 994afce8
......@@ -123,4 +123,10 @@ public class TProcessesBlastQuery {
@ApiModelProperty("单孔爆破量")
private Double HoleBlastVolume;
//以下为业务增加字段
/**
* 炮孔编号 修改新的时候会用的
*/
@ApiModelProperty("NewHoleID")
private String NewHoleID;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignHoleQuery.java
View file @ 994afce8
......@@ -137,4 +137,11 @@ public class TProcessesBlastdesignHoleQuery extends TProcessesBlastdesignVolume
*/
@ApiModelProperty("设计日期")
private LocalDateTime DesignDate;
//以下为业务增加字段
/**
* 炮孔编号 修改新的时候会用的
*/
@ApiModelProperty("NewBlastHoleID")
private String NewBlastHoleID;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesDrillingQuery.java
View file @ 994afce8
......@@ -229,4 +229,11 @@ public class TProcessesDrillingQuery {
@ApiModelProperty("设计时间")
private LocalDateTime DesignDate;
//以下为业务增加字段
/**
* 炮孔编号 修改新的时候会用的
*/
@ApiModelProperty("NewHoleID")
private String NewHoleID;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java
View file @ 994afce8
......@@ -20,6 +20,8 @@ public interface ITProcessesBlastService extends IService<TProcessesBlast> {
R updateByUid(TProcessesBlastQuery query);
R updateByHoleId(TProcessesBlastQuery query);
R insertTProcessesBlast(TProcessesBlastQuery query);
R getByUid(TProcessesBlastQuery query);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java
View file @ 994afce8
......@@ -128,7 +128,7 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
}
queryWrapper.eq(StringUtils.isNotBlank(tMaterialOutQuery.getProcessesName()),
ProjectEnum.TMaterialOut.PROCESSES_NAME.getLabel(),
tMaterialOutQuery.getConsumeType());
tMaterialOutQuery.getProcessesName());
//查询
Page<TMaterialOut> tMaterialOutPage = baseMapper.selectPage(page, queryWrapper);
return R.ok(tMaterialOutPage);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
View file @ 994afce8
......@@ -38,6 +38,7 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
//条件封装
QueryWrapper<TProcessesAuxiliary> queryWrapper = new QueryWrapper<>();
queryWrapper.select(
ProjectEnum.TProcessesAuxiliary.UID.getLabel(),
ProjectEnum.TProcessesAuxiliary.EQUIPMENT_ID.getLabel(),
ProjectEnum.TProcessesAuxiliary.EQUIPMENT_NAME.getLabel(),
ProjectEnum.TProcessesAuxiliary.LJYL.getLabel(),
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
View file @ 994afce8
......@@ -87,12 +87,30 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
if (temp == null) {
return R.failed("数据不存在：uid：" + query.getUid());
}
//判断炮孔编号是否已经存在
if (StringUtils.isNotBlank(query.getHoleID())) {
//判断炮孔编号是否已经存在 如果不存在，需要修改其他关联工序的炮孔编号
if (StringUtils.isNotBlank(query.getHoleID()) && !temp.getHoleID().equals(query.getHoleID())) {
R r = getByHoleId(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: HoleID:" + query.getHoleID());
}
//修改炮孔设计的炮孔编号
TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery = new TProcessesBlastdesignHoleQuery();
tProcessesBlastdesignHoleQuery.setBlastHoleID(temp.getHoleID());
tProcessesBlastdesignHoleQuery.setNewBlastHoleID(query.getHoleID());
R r1 = itProcessesBlastdesignHoleService.getByBlastHoleID(tProcessesBlastdesignHoleQuery);
if (r1.getCode()!=0){
log.error("修改炮孔设计的炮孔编号失败", JSON.toJSONString(tProcessesBlastdesignHoleQuery));
return R.failed(r1.getMsg());
}
//修改穿孔工序的炮孔编号
TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
tProcessesDrillingQuery.setHoleID(temp.getHoleID());
tProcessesDrillingQuery.setNewHoleID(query.getNewHoleID());
R r2 = itProcessesDrillingService.getByHoleId(tProcessesDrillingQuery);
if (r2.getCode()!=0){
log.error("修改穿孔工序的炮孔编号失败", JSON.toJSONString(tProcessesDrillingQuery));
return R.failed(r2.getMsg());
}
}
//条件封装
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
......@@ -144,6 +162,35 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
}
}
@Override
public R updateByHoleId(TProcessesBlastQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getHoleID());
//判断数据是否存在
QueryWrapper<TProcessesBlast> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlast.HOLE_ID.getLabel(), query.getHoleID());
TProcessesBlast temp = baseMapper.selectOne(queryWrapper);
if (temp == null) {
return R.failed("数据不存在：HOLE_ID: " + query.getHoleID());
}
//判断是否将炮孔编号修改为新的炮孔编号 如果是，直接修改，不能调用基础方法，避免循环
if (StringUtils.isNotBlank(query.getHoleID())) {
temp.setHoleID(query.getNewHoleID());
int update = baseMapper.updateById(temp);
if (update > 0) {
return R.ok("修改成功");
} else {
return R.failed("修改失败");
}
}
//条件封装
query.setUid(temp.getUid());
//调用基础方法修改
return updateByUid(query);
}
@Override
public R insertTProcessesBlast(TProcessesBlastQuery query) {
log.info(JSON.toJSONString(query));
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
View file @ 994afce8
......@@ -89,11 +89,29 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
return R.failed("数据不存在：uid：" + query.getUid());
}
//判断炮孔编号是否存在
if (StringUtils.isNotBlank(query.getBlastHoleID())) {
if (StringUtils.isNotBlank(query.getBlastHoleID()) && !temp.getBlastHoleID().equals(query.getBlastHoleID())) {
R r = getByBlastHoleID(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: BlastHoleID:" + query.getBlastHoleID());
}
//修改穿孔工序炮孔编号
TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
tProcessesDrillingQuery.setHoleID(temp.getBlastHoleID());
tProcessesDrillingQuery.setNewHoleID(query.getBlastHoleID());
R r1 = itProcessesDrillingService.updateByHoleId(tProcessesDrillingQuery);
if (r1.getCode() != 0) {
log.error("修改穿孔工序炮孔编号失败：{}", JSON.toJSONString(tProcessesDrillingQuery));
return R.failed(r1.getMsg());
}
//修改爆破设计炮孔编号
TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
tProcessesBlastQuery.setHoleID(temp.getBlastHoleID());
tProcessesBlastQuery.setNewHoleID(query.getBlastHoleID());
R r2 = itProcessesBlastService.updateByHoleId(tProcessesBlastQuery);
if (r2.getCode() != 0) {
log.error("修改爆破设计炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastQuery));
return R.failed(r2.getMsg());
}
}
//判断是否需要修改关联的 设计爆区爆破量
if (StringUtils.isNotBlank(query.getStepName())
......@@ -136,7 +154,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
calculateHoleBlastVolume(temp);
}
//如果修改了台阶高度，需要通知爆破设计重新计算设计区爆破量
if (query.getStepHeight()!=null){
if (query.getStepHeight() != null) {
TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
tProcessesDrillingQuery.setHoleID(temp.getBlastHoleID());
tProcessesDrillingQuery.setStepHeight(query.getStepHeight());
......@@ -169,6 +187,17 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
if (temp == null) {
return R.failed("数据不存在：BLAST_HOLE_ID：" + query.getBlastHoleID());
}
//判断是否将炮孔编号修改为新的炮孔编号 如果是，直接修改，不能调用基础方法，避免循环
if (StringUtils.isNotBlank(query.getNewBlastHoleID())) {
temp.setBlastHoleID(query.getNewBlastHoleID());
int update = baseMapper.updateById(temp);
if (update > 0) {
return R.ok("修改成功");
} else {
return R.failed("修改失败");
}
}
query.setUid(temp.getUid());
//调用基础方法修改
return updateByUid(query);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
View file @ 994afce8
......@@ -5,16 +5,10 @@ import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesDrillingMapper;
import cn.wise.sc.acquisition.business.model.query.TMineStopeQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesDrillingQuery;
import cn.wise.sc.acquisition.business.model.query.*;
import cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo;
import cn.wise.sc.acquisition.business.model.vo.TProcessesProductVo;
import cn.wise.sc.acquisition.business.service.ITMineStopeService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
import cn.wise.sc.acquisition.business.service.ITProcessesDrillingService;
import cn.wise.sc.acquisition.business.service.*;
import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
import cn.wise.sc.acquisition.business.util.DateUtil;
import cn.wise.sc.acquisition.business.wrapper.page.Query;
......@@ -53,6 +47,9 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
@Autowired
private ITProcessesBlastdesignVolumeService itProcessesBlastdesignVolumeService;
@Autowired
private ITProcessesBlastService itProcessesBlastService;
@Override
public R getPage(TProcessesDrillingQuery tProcessesDrillingQuery, Query query) {
log.info(JSON.toJSONString(tProcessesDrillingQuery));
......@@ -147,12 +144,31 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if (temp == null) {
return R.failed("数据不存在：uid: " + query.getUid());
}
//判断炮孔编号是否已经存在
if (StringUtils.isNotBlank(query.getHoleID())) {
//判断炮孔编号是否已经存在 如果不存在需要修改关联工序的炮孔编号
if (StringUtils.isNotBlank(query.getHoleID())
&& !temp.getHoleID().equals(query.getHoleID())) {
R r = getByHoleId(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: HoleID:" + query.getHoleID());
}
//修改炮孔设计的炮孔编号
TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery = new TProcessesBlastdesignHoleQuery();
tProcessesBlastdesignHoleQuery.setBlastHoleID(temp.getHoleID());
tProcessesBlastdesignHoleQuery.setNewBlastHoleID(query.getHoleID());
R r1 = itProcessesBlastdesignHoleService.updateByBlastHoleID(tProcessesBlastdesignHoleQuery);
if (r1.getCode() != 0) {
log.error("修改炮孔设计的炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastdesignHoleQuery));
return R.failed(r1.getMsg());
}
//修改爆破工序的炮孔编号
TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
tProcessesBlastQuery.setHoleID(temp.getHoleID());
tProcessesBlastQuery.setNewHoleID(query.getHoleID());
R r2 = itProcessesBlastService.updateByHoleId(tProcessesBlastQuery);
if (r2.getCode() != 0) {
log.error("修改爆破工序的炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastQuery));
return R.failed(r2.getMsg());
}
}
//条件封装
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
......@@ -245,12 +261,21 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
Rcode.NOT_PARAM.assertNotNull(query.getHoleID());
//判断数据是否存在
QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlast.HOLE_ID.getLabel(), query.getHoleID());
queryWrapper.eq(ProjectEnum.TProcessesDrilling.HOLE_ID.getLabel(), query.getHoleID());
TProcessesDrilling temp = baseMapper.selectOne(queryWrapper);
if (temp == null) {
return R.failed("数据不存在：HOLE_ID: " + query.getHoleID());
}
//判断是否将炮孔编号修改为新的炮孔编号 如果是，直接修改，不能调用基础方法，避免循环
if (StringUtils.isNotBlank(query.getHoleID())) {
temp.setHoleID(query.getNewHoleID());
int update = baseMapper.updateById(temp);
if (update > 0) {
return R.ok("修改成功");
} else {
return R.failed("修改失败");
}
}
//条件封装
query.setUid(temp.getUid());
//调用基础方法修改
......
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.xml
View file @ 994afce8
......@@ -50,8 +50,6 @@
a.Price,
a.TotalMoney,
b.Wcdw
<include refid="TWeightColumns"/>
<include refid="TProcessesCrusherColumns"/>
FROM T_Processes_Crusher a
<include refid="TProcessesCrusherJoins"/>
<where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment