Skip to content

D
data-acquisition
Commit 7e9d62bc authored by renchao's avatar renchao
Browse files
Options

生产工序业务修改

parent 1a078c2f
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 48 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
View file @ 7e9d62bc
......@@ -87,7 +87,7 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
if (update > 0) {
return R.ok("辅助工序中->修改成功");
} else {
log.info(JSON.toJSONString(tSampleList));
log.error("辅助工序中->修改失败:{}",JSON.toJSONString(tSampleList));
return R.failed("辅助工序中->修改失败");
}
......@@ -121,7 +121,7 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
if (insert > 0) {
return R.ok("辅助工序中->增加成功");
} else {
log.info(JSON.toJSONString(tProcessesAuxiliary));
log.error("辅助工序中->增加失败: {}",JSON.toJSONString(tProcessesAuxiliary));
return R.failed("辅助工序中->增加失败");
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
View file @ 7e9d62bc
......@@ -168,7 +168,7 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
if (insert > 0) {
return R.ok("爆破设计中->增加成功");
} else {
log.info(JSON.toJSONString(tProcessesDrilling));
log.error("爆破设计中->增加失败:{}",JSON.toJSONString(tProcessesDrilling));
return R.failed("爆破设计中->增加失败");
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
View file @ 7e9d62bc
......@@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
/**
......@@ -89,11 +88,11 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
return R.failed("炮孔设计中->数据不存在：uid：" + query.getUid());
}
//判断炮孔编号是否存在
// if (StringUtils.isNotBlank(query.getBlastHoleID()) && !temp.getBlastHoleID().equals(query.getBlastHoleID())) {
// R r = getByBlastHoleID(query);
// if (r.getData() != null) {
// return R.failed("炮孔设计中->炮孔编号已存在: BlastHoleID:" + 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.setUid(temp.getUid());
......@@ -112,7 +111,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
// log.error("炮孔设计中->修改爆破设计炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastQuery));
// return R.failed(r2.getMsg());
// }
// }
}
//判断是否需要修改关联的 设计爆区爆破量
if (StringUtils.isNotBlank(query.getStepName())
|| StringUtils.isNotBlank(query.getBlastAreaName())
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignVolumeServiceImpl.java
View file @ 7e9d62bc
......@@ -54,7 +54,7 @@ public class TProcessesBlastdesignVolumeServiceImpl extends ServiceImpl<TProcess
//判断数据是否存在
R volume = getByQuery(query);
if (volume.getData() == null) {
return R.failed("设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
return R.failed("设计爆区爆破量表中->设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
}
//条件封装
TProcessesBlastdesignVolume tProcessesBlastdesignVolume = new TProcessesBlastdesignVolume();
......@@ -67,10 +67,10 @@ public class TProcessesBlastdesignVolumeServiceImpl extends ServiceImpl<TProcess
//修改
int update = baseMapper.update(tProcessesBlastdesignVolume, queryWrapper);
if (update > 0) {
return R.ok("修改成功");
return R.ok("设计爆区爆破量表中->修改成功");
} else {
log.info(JSON.toJSONString(tProcessesBlastdesignVolume));
return R.failed("修改失败");
log.error("设计爆区爆破量表中->修改失败: {}",JSON.toJSONString(tProcessesBlastdesignVolume));
return R.failed("设计爆区爆破量表中->修改失败");
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java
View file @ 7e9d62bc
......@@ -91,7 +91,7 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
if (update > 0) {
return R.ok("破碎工序中->修改成功");
} else {
log.info(JSON.toJSONString(tSampleList));
log.error("破碎工序中->修改失败:{}",JSON.toJSONString(tSampleList));
return R.failed("破碎工序中->修改失败");
}
......@@ -124,7 +124,7 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
if (insert > 0) {
return R.ok("破碎工序中->增加成功");
} else {
log.info(JSON.toJSONString(tProcessesCrusher));
log.error("破碎工序中->增加失败 : {}",JSON.toJSONString(tProcessesCrusher));
return R.failed("破碎工序中->增加失败");
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
View file @ 7e9d62bc
......@@ -125,7 +125,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if (insert > 0) {
return R.ok("穿孔工序中->增加成功");
} else {
log.info(JSON.toJSONString(tProcessesDrilling));
log.error("穿孔工序中->增加失败,{}",JSON.toJSONString(tProcessesDrilling));
return R.failed("穿孔工序中->增加失败");
}
}
......@@ -231,7 +231,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if (update > 0) {
return R.ok("穿孔工序中->修改成功");
} else {
log.info(JSON.toJSONString(temp));
log.error("穿孔工序中->修改失败:{}",JSON.toJSONString(temp));
return R.failed("穿孔工序中->修改失败");
}
}
......@@ -258,7 +258,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if (update > 0) {
return R.ok("穿孔工序中->修改成功");
} else {
log.info(JSON.toJSONString(temp));
log.error("穿孔工序中->修改失败:{}",JSON.toJSONString(temp));
return R.failed("穿孔工序中->修改失败");
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java
View file @ 7e9d62bc
......@@ -56,17 +56,17 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//查询数据
TSampleLaboratorysheet tSampleLaboratorysheet = baseMapper.selectById(query.getYh());
if (tSampleLaboratorysheet == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("结果分析单中->数据不存在，样号：" + query.getYh());
}
//封装
tSampleLaboratorysheet = new TSampleLaboratorysheet();
BeanUtils.copyProperties(query, tSampleLaboratorysheet);
int update = baseMapper.updateById(tSampleLaboratorysheet);
if (update > 0) {
return R.ok("修改成功");
return R.ok("结果分析单中->修改成功");
} else {
log.info(JSON.toJSONString(tSampleLaboratorysheet));
return R.failed("修改失败");
log.error("结果分析单中->修改失败: {}",JSON.toJSONString(tSampleLaboratorysheet));
return R.failed("结果分析单中->修改失败");
}
}
......@@ -79,14 +79,14 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//查询数据
TSampleLaboratorysheet tSampleLaboratorysheet = baseMapper.selectById(query.getYh());
if (tSampleLaboratorysheet == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("结果分析单中->数据不存在，样号：" + query.getYh());
}
//删除
int delete = baseMapper.deleteById(query.getYh());
if (delete > 0) {
return R.ok("修改成功");
return R.ok("结果分析单中->修改成功");
} else {
return R.failed("修改失败");
return R.failed("结果分析单中->修改失败");
}
}
......@@ -99,12 +99,12 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//判断是否存在送样号
R temp = tSampleListService.getByYh(new TSampleListQuery(query.getYh()));
if (temp.getData() == null) {
return R.failed("送验单不存在，样号：" + query.getYh());
return R.failed("结果分析单中->送验单不存在，样号：" + query.getYh());
}
//判断是否已经存在分析结果单
R temp1 = getByYh(query);
if (temp1.getData() != null) {
return R.failed("分析结果样号已存在，样号：" + query.getYh());
return R.failed("结果分析单中->分析结果样号已存在，样号：" + query.getYh());
}
//继续判断参数
......@@ -131,10 +131,10 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//保存
int insert = baseMapper.insert(tSampleLaboratorysheet);
if (insert > 0) {
return R.ok("添加成功");
return R.ok("结果分析单中->添加成功");
} else {
log.info(JSON.toJSONString(tSampleLaboratorysheet));
return R.failed("添加失败");
return R.failed("结果分析单中->添加失败");
}
}
......@@ -155,7 +155,7 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//查询
TSampleLaboratorysheet tSampleLaboratorysheet = baseMapper.selectById(query.getYh());
if (tSampleLaboratorysheet == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("结果分析单中->数据不存在，样号：" + query.getYh());
}
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String content = "";
......@@ -187,6 +187,6 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//下载图片
ImageUtil.getImage(ProjectEnum.ImageType.QR_CODE.getValue(), tSampleLaboratorysheet, response);
//如果下载失败才会执行return
return R.failed("该条数据没有图片");
return R.failed("结果分析单中->该条数据没有图片");
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java
View file @ 7e9d62bc
......@@ -85,7 +85,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
//判断数据是否存在
TSampleList temp = baseMapper.selectById(query.getYh());
if (temp == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("送样单中->数据不存在，样号：" + query.getYh());
}
//条件封装
TSampleList tSampleList = new TSampleList();
......@@ -96,10 +96,10 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
//修改
int update = baseMapper.update(tSampleList, queryWrapper);
if (update > 0) {
return R.ok("修改成功");
return R.ok("送样单中->修改成功");
} else {
log.info(JSON.toJSONString(tSampleList));
return R.failed("修改失败");
log.error("送样单中->修改失败 {}",JSON.toJSONString(tSampleList));
return R.failed("送样单中->修改失败");
}
}
......@@ -115,7 +115,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
//判断数据是否已存在，如果存在不能添加
TSampleList temp = baseMapper.selectById(query.getYh());
if (temp != null) {
return R.failed("送验单样号已存在，样号：" + query.getYh());
return R.failed("送样单中->送验单样号已存在，样号：" + query.getYh());
}
//继续判断参数
Rcode.NOT_PARAM.assertNotEmpty(query.getHolesID());
......@@ -136,10 +136,10 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
log.info(JSON.toJSONString(tSampleList));
int insert = baseMapper.insert(tSampleList);
if (insert > 0) {
return R.ok("增加成功");
return R.ok("送样单中->增加成功");
} else {
log.info(JSON.toJSONString(tSampleList));
return R.failed("增加失败");
log.error("送样单中->增加失败：{}",JSON.toJSONString(tSampleList));
return R.failed("送样单中->增加失败");
}
}
......@@ -154,14 +154,14 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
Rcode.NOT_PARAM.assertNotEmpty(query.getYh());
TSampleList temp = baseMapper.selectById(query.getYh());
if (temp == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("送样单中->数据不存在，样号：" + query.getYh());
}
//删除
int delete = baseMapper.delete(new QueryWrapper<TSampleList>().eq(ProjectEnum.TSampleListType.YH.getLabel(), query.getYh()));
if (delete > 0) {
return R.ok("删除成功");
return R.ok("送样单中->删除成功");
} else {
return R.failed("删除失败");
return R.failed("送样单中->删除失败");
}
}
......@@ -176,7 +176,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
//判断数据是否存在
TSampleList temp = baseMapper.selectById(query.getYh());
if (temp == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("送样单中->数据不存在，样号：" + query.getYh());
}
Rcode.NOT_PARAM.assertNotNull(file);
//封装
......@@ -187,9 +187,9 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
//保存
int update = baseMapper.updateById(tSampleList);
if (update > 0) {
return R.ok("保存成功");
return R.ok("送样单中->保存成功");
} else {
return R.failed("保存失败");
return R.failed("送样单中->保存失败");
}
}
......@@ -209,12 +209,12 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
Rcode.NOT_PARAM.assertNotEmpty(query.getYh());
TSampleList tSampleList = baseMapper.selectById(query.getYh());
if (tSampleList == null) {
return R.failed("数据不存在，样号：" + query.getYh());
return R.failed("送样单中->数据不存在，样号：" + query.getYh());
}
//获取二维码或者记录形式
ImageUtil.getImage(ProjectEnum.ImageType.RECORD_CODE.getValue(), tSampleList, response);
//如果下载失败才会执行return
return R.failed("该条数据没有图片");
return R.failed("送样单中->该条数据没有图片");
}
......
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