Skip to content

D
device-back
提交 d330cd87 authored 作者: 133's avatar 133
浏览文件
操作

fix(解决冲突): 解决冲突

解决冲突
上级 a69b63bf 222bc81a
隐藏空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 35 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ d330cd87
......@@ -700,18 +700,17 @@ public class BackController {
@PostMapping(value = "/addDirectlyUnderBackBill")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity addDirectlyUnderBackBill(@RequestBody @Validated AllotBillSaveVo allotBillSaveVo) {
//当前登录单位的级别
Integer currentUnitLevel = userUtils.getCurrentUnitLevel();
AllotBackBill allotBackBill1 = new AllotBackBill();
if (currentUnitLevel == 1){
//判断发起退回的装备的生命状态
if (allotBillSaveVo.getAllotCheckDetail()!=null&&allotBillSaveVo.getAllotCheckDetail().length()>0) {
deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(allotBillSaveVo.getAllotCheckDetail()));
}
//1.添加退回单
AllotBackBill a = allotBillSaveVo.toBackDo();
//保存后的实体
AllotBackBill allotBackBill;
AllotBackBill allotBackBill = new AllotBackBill();
allotBackBill.setSenderUserB(userPublicService.getOne(allotBillSaveVo.getSendUserbId()).getName());
allotBackBill.setAgent(userPublicService.getOne(allotBillSaveVo.getSendUserbId()).getName());
//如果是直接发起（不是草稿，没有taskId）,当前操作人为发件方A岗,添加账单
if (allotBillSaveVo.getTaskId()==null){
// a.setSendUseraId(userUtils.getCurrentUserId());
......@@ -724,12 +723,15 @@ public class BackController {
//copy非null相同字段值
MapperUtils.copyNoNullProperties(a,allotBackBill);
//判断是否取消上传申请单和批复单据
if (a.getApplyFiles()==null||"".equals(a.getApplyFiles())){
allotBackBill.setApplyFiles(null);
if (a.getApplyFiles()!=null ){
allotBackBill.setApplyFiles(a.getApplyFiles());
}
if (a.getReplyFiles()==null||"".equals(a.getReplyFiles())){
allotBackBill.setReplyFiles(null);
if (a.getReplyFiles()!=null){
allotBackBill.setReplyFiles(a.getReplyFiles());
}
allotBackBill.setReceiveFiles(FilesUtil.stringFileToList(allotBillSaveVo.getReceiveFiles()));
allotBackBill.setAgent(userPublicService.getOne(allotBillSaveVo.getSendUserbId()).getName());
allotBackBill.setSenderUserB(userPublicService.getOne(allotBillSaveVo.getSendUserbId()).getName());
allotBackBill = allotBackBillService.update(allotBackBill);
}
//按照当前时间和保存账单的id拼接生成退回单号并保存
......@@ -738,9 +740,6 @@ public class BackController {
int year = calendar.get(Calendar.YEAR);
String num = "NO:第" + year + "TH" + allotBackBill.getId() + "号";
allotBackBill.setNum(num);
//进行赋值
BeanUtils.copyProperties(allotBillSaveVo,allotBackBill);
allotBackBill1 = allotBackBillService.update(allotBackBill);
Integer billId = allotBackBill.getId();
Integer userId = userUtils.getCurrentUserId();
String deviceIdDetail = allotBackBill.getBackCheckDetail();
......@@ -807,10 +806,9 @@ public class BackController {
messageService.add(messageBto);
log.info("[退回模块]:" + allotBackBill.getSendUnit() + "对" + allotBackBill.getReceiveUnit() + "发起退回");
//添加taskId
allotBackBill1.setTaskId(saveEntity.getId());
allotBackBill.setTaskId(saveEntity.getId());
myWebSocket.sendMessage1();
}
return ResponseEntity.ok(new ResultObj(allotBackBill1, "发起成功"));
return ResponseEntity.ok(new ResultObj(allotBackBill, "发起成功"));
}
@ApiOperation(value = "保存省直属退回操作(草稿)", notes = "可以通过这个接口保存退回操作")
......@@ -842,6 +840,8 @@ public class BackController {
int year = calendar.get(Calendar.YEAR);
String num = "NO:第" + year + "TH" + allotBackBill.getId() + "号";
allotBackBill.setNum(num);
//赋值操作人
AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
//发起草稿任务
// TaskBto taskBto = new TaskBto(StatusEnum.BACK_UNDER_DRAFT.id, "["+allotBillSaveVo.getReceiveUnit().substring(0,3)+"]型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备共有"+allotBillSaveVo.getAllotCount()+"件", null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, "country", userIds);
......
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java
浏览文件 @ d330cd87
......@@ -114,6 +114,9 @@ public class AllotBillSaveVo {
@ApiModelProperty(value = "配用范围")
private Integer matchingRange;
@ApiModelProperty(value = "接收单")
private List<FileRet> receiveFiles;
/**
* 转为配发单实体
*/
......
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java
浏览文件 @ d330cd87
......@@ -314,7 +314,6 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
List<Integer> topIdList = topStatList.stream()
.filter(taskBto -> taskBto.getParentTaskId().equals(0) || taskBto.getParentTaskId() == null)
.filter(taskBto -> "check".equals(taskBto.getCustomInfo()) || "exam".equals(taskBto.getCustomInfo()))
.map(TaskBto::getBillId)
.collect(toList());
......
dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingLibraryController.java
浏览文件 @ d330cd87
......@@ -149,7 +149,7 @@ public class PackingLibraryController {
//model在models出现的次数
int count = Collections.frequency(models, model);
if (count > 1) {
//取出list<PackingLibrary>
//取出list<PackingLibrary> 拿到所有该型号的列装id
List<Integer> allByModel = packingLibraryDao.findAllByModel(model).stream().map(PackingLibrary::getId).collect(Collectors.toList());
//取出交集
defectList = resultList2.stream().filter(packingLibrary -> allByModel.contains(packingLibrary.getId())).sorted(Comparator.comparing(PackingLibrary::getId)).collect(Collectors.toList());
......@@ -430,13 +430,15 @@ public class PackingLibraryController {
//取出目录
PackingLibrary packingLibrary = packingLibraries.get(0);
packingLibraries.remove(packingLibrary);
List<PackingLibrary> finalPackingList = new ArrayList<>();
// List<PackingLibrary> finalPackingList = new ArrayList<>();
for (int i = 0; i < packingLibraries.size(); i++) {
List<PackingLibrary> finalPackingList = new ArrayList<>();
//会造成覆盖
if (packingLibrary.getChilds() != null){
List<PackingLibrary> childs = packingLibrary.getChilds();
finalPackingList.addAll(childs);
finalPackingList.addAll(packingLibraries);
// finalPackingList.stream().distinct().collect(Collectors.toList());
packingLibrary.setChilds(finalPackingList);
}else {
//直接赋值
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ d330cd87
......@@ -1479,6 +1479,7 @@ public class RepairController {
//获取维修单
RepairBill repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
repairBillDetailVo.setRepairBill(repairBill);
//获取装备列表
RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
//set需要转换的字段
......@@ -1488,6 +1489,9 @@ public class RepairController {
repairSendBill.setStartUserA(userPublicService.getOne(repairSendBill.getStartUseraId()).getName());
}
repairSendBill.setStartUserB(repairSendBill.getAgent());
if (repairSendBill.getStartUserbId() != null) {
repairSendBill.setStartUserB(userPublicService.getOne(repairSendBill.getStartUserbId()).getName());
}
if (repairSendBill.getRepairUseraId() != null) {
repairSendBill.setRepairUserA(userPublicService.getOne(repairSendBill.getRepairUseraId()).getName());
}
......@@ -1498,6 +1502,9 @@ public class RepairController {
repairSendBill.setScripts(JacksonUtil.readValue(repairSendBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
}));
}
//将sendBill中人名进行赋值
repairBill.setStartUserB(repairSendBill.getStartUserB());
repairBillService.addEntity(repairBill);
repairBillDetailVo.setRepairSendBill(repairSendBill);
List<DeviceLibrary> deviceLibraries = new ArrayList<>();
if (repairSendBill.getRepairDeviceCheckDetail() != null) {
......@@ -2508,31 +2515,44 @@ public class RepairController {
Integer userId = userUtils.getCurrentUserId();
Integer level = userUtils.getCurrentUnitLevel();
//添加维修单和送修单
RepairBill repairBill;
RepairSendBill deviceRepairSendBillEntity;
RepairBill repairBill = null;
RepairSendBill deviceRepairSendBillEntity = null;
//草稿发起的
if (repairBillSaveVo.getTaskId() != null) {
repairBill = deviceRepairBillService.getOne(taskService.get(repairBillSaveVo.getTaskId()).getBillId());
deviceRepairSendBillEntity = deviceRepairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
MapperUtils.copyNoNullProperties(repairBillSaveVo, repairBill);
MapperUtils.copyNoNullProperties(repairBillSaveVo, deviceRepairSendBillEntity);
} else {
RepairBill repairBill1 = new RepairBill();
RepairSendBill deviceRepairSendBillEntity1 = new RepairSendBill();
BeanUtils.copyProperties(repairBillSaveVo, repairBill1);
BeanUtils.copyProperties(repairBillSaveVo, deviceRepairSendBillEntity1);
repairBill = deviceRepairBillService.addEntity(repairBill1);
deviceRepairSendBillEntity1.setDeviceRepairBillId(repairBill.getId());
deviceRepairSendBillEntity = deviceRepairSendBillService.addEntity(deviceRepairSendBillEntity1);
}
BeanUtils.copyProperties(repairBillSaveVo,repairBill);
BeanUtils.copyProperties(repairBillSaveVo,deviceRepairSendBillEntity);
deviceRepairSendBillEntity.setRepairUserbId(repairBillSaveVo.getRepairUseraId());
deviceRepairSendBillEntity.setRepairUseraId(userId);
// deviceRepairSendBillEntity.setRepairUseraId(repairBillSaveVo.getRepairUseraId());
// deviceRepairSendBillEntity.setRepairUserbId(userId);
deviceRepairSendBillEntity.setReceiveFiles(FilesUtil.stringFileToList(repairBillSaveVo.getReceiveFiles()));
}
// else {
// RepairBill repairBill1 = new RepairBill();
// RepairSendBill deviceRepairSendBillEntity1 = new RepairSendBill();
// BeanUtils.copyProperties(repairBillSaveVo, repairBill1);
// BeanUtils.copyProperties(repairBillSaveVo, deviceRepairSendBillEntity1);
// //进行赋值
//// repairBill1.setRepairUserB(repairBillSaveVo.getRepairUserA());
// repairBill = deviceRepairBillService.addEntity(repairBill1);
// deviceRepairSendBillEntity1.setDeviceRepairBillId(repairBill.getId());
// //进行赋值
// deviceRepairSendBillEntity1.setReceiveFiles(FilesUtil.stringFileToList(repairBillSaveVo.getReceiveFiles()));
// deviceRepairSendBillEntity1.setAgent(userPublicService.getOne(repairBillSaveVo.getStartUseraId()).getName());
// deviceRepairSendBillEntity = deviceRepairSendBillService.addEntity(deviceRepairSendBillEntity1);
// }
if (repairBillSaveVo.getScriptSaveVos() != null) {
deviceRepairSendBillEntity.setScriptJson(JacksonUtil.toJSon(repairBillSaveVo.getScriptSaveVos()));
}
repairBill.setRepairStatus(2);//运输中
deviceRepairSendBillEntity.setRepairStatus(2);
if (repairBillSaveVo.getRepairUseraId() != null) {
repairBill.setRepairUserA(userPublicService.getOne(repairBillSaveVo.getRepairUseraId()).getName());
// repairBill.setRepairUserA(userPublicService.getOne(repairBillSaveVo.getRepairUseraId()).getName());
repairBill.setRepairUserB(userPublicService.getOne(repairBillSaveVo.getRepairUseraId()).getName());
}
repairBill.setRepairUserA(userPublicService.getOne(userId).getName());
repairBill.setStartUserB(repairBillSaveVo.getAgent());
repairBill.setStartUserA(userPublicService.getOne(repairBillSaveVo.getStartUseraId()).getName());
//生成单据号
......@@ -2609,7 +2629,6 @@ public class RepairController {
deviceRepairSendBillEntity.setRepairDeviceDetail(stringBuffer.toString());
deviceRepairSendBillEntity.setDeviceRepairBillId(repairBill1.getId());
deviceRepairSendBillEntity.setAgent(repairBillSaveVo.getAgent());
// deviceRepairSendBillEntity.setTitle("["+repairBillSaveVo.getReceiveUnit().substring(0,3) + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件");
deviceRepairSendBillEntity.setTitle("["+DeviceModelSort.unitNameToDisName(repairBillSaveVo.getReceiveUnit()) + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件");
if (repairBillSaveVo.getSendFileList() != null && repairBillSaveVo.getSendFileList().size() > 0) {
deviceRepairSendBillEntity.setSendFiles(FilesUtil.stringFileToList(repairBillSaveVo.getSendFileList()));
......@@ -2853,6 +2872,8 @@ public class RepairController {
//相同字段直接拷贝
BeanUtils.copyProperties(repairBillSaveVo, repairBill);
BeanUtils.copyProperties(repairBillSaveVo, deviceRepairSendBillEntity);
deviceRepairSendBillEntity.setRepairUseraId(userId);
deviceRepairSendBillEntity.setRepairUserbId(repairBillSaveVo.getRepairUseraId());
//维修状态为草稿
repairBill.setRepairStatus(0);
deviceRepairSendBillEntity.setRepairStatus(0);
......@@ -2861,9 +2882,11 @@ public class RepairController {
deviceRepairSendBillEntity.setScriptJson(JacksonUtil.toJSon(repairBillSaveVo.getScriptSaveVos()));
}
if (repairBillSaveVo.getRepairUseraId() != null) {
repairBill.setRepairUserA(userPublicService.getOne(repairBillSaveVo.getRepairUseraId()).getName());
// repairBill.setRepairUserA(userPublicService.getOne(repairBillSaveVo.getRepairUseraId()).getName());
repairBill.setRepairUserB(userPublicService.getOne(repairBillSaveVo.getRepairUseraId()).getName());
}
repairBill.setRepairUserB(userUtils.getCurrentName());
// repairBill.setRepairUserB(userUtils.getCurrentName());
repairBill.setRepairUserA(userUtils.getCurrentName());
repairBill.setStartUserB(userPublicService.getOne(repairBillSaveVo.getStartUserbId()).getName());
repairBill.setStartUserA(userPublicService.getOne(repairBillSaveVo.getStartUseraId()).getName());
RepairBill repairBill1 = deviceRepairBillService.addEntity(repairBill);
......
dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/RepairBillSaveVo.java
浏览文件 @ d330cd87
......@@ -100,4 +100,7 @@ public class RepairBillSaveVo {
@ApiModelProperty(value = "单据保存vo")
private List<ScriptSaveVo> scriptSaveVos;
@ApiModelProperty(value = "省直属")
private List<FileRet> receiveFiles;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论