提交 20241b56 authored 作者: zhoushaopan's avatar zhoushaopan

fix(区块链模块): 修复配发,退回,入库问题

修复了入库接收人为null,修复了配发,退回验证为假
上级 9d1cc644
......@@ -917,6 +917,7 @@ public class BackController {
//添加taskId
allotBackBill.setTaskId(saveEntity.getId());
myWebSocket.sendMessage1();
allotBackBillService.update(allotBackBill);
return ResponseEntity.ok(new ResultObj(allotBackBill, "发起成功"));
}
......@@ -965,6 +966,7 @@ public class BackController {
//返回保存成功的id
Integer id = taskBto1.getId();
myWebSocket.sendMessage1();
allotBackBillService.update(allotBackBill);
return ResponseEntity.ok("保存成功"+id);
}
else {
......
......@@ -178,6 +178,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
BcRecord bcRecord = blockService.fetchRecord(BlockBusinessEnum.REPAIR_BACK.subCode, billTypeAndBillId.getRecordID());
RepairBackBill repairBackBill = queryRepairBackBill(billId);
RepairBackBill repairBackBill1 = JSON.parseObject(bcRecord.getData().getContent(), RepairBackBill.class);
BlockTraceabilityParsing blockTraceabilityParsing = bcRecord.getData().toBlockTraceabilityParsing();
// RepairBill repairBill = repairBillService.getOne();
blockTraceabilityParsing.setBusinessTraceabilityParsingData(TraceabilityParsingData.builder()
......@@ -189,7 +190,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
.initiateUnitName(repairBackBill.getSendUnit())//发起单位
.receiveUnitName(repairBackBill.getReceiveUnit())//接收单位
.documentNo(repairBackBill.getDocNum()) //单据号
.operationTime(DateUtil.getLocalDateTime(repairBackBill.getSendTime()))//发起时间
.operationTime(repairBackBill.getSendTime() != null ?DateUtil.getLocalDateTime(repairBackBill.getSendTime()):null)//发起时间
.operatorUserName(operatorName(repairBackBill)) //相关人员
.leftSignatureId(repairBackBill.getLeftSignatureId())
.rightSignatureId(repairBackBill.getRightSignatureId())
......@@ -204,7 +205,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
.initiateUnitName(repairBackBill1.getSendUnit())
.receiveUnitName(repairBackBill1.getReceiveUnit())
.documentNo(repairBackBill1.getDocNum())
.operationTime(DateUtil.getLocalDateTime(repairBackBill1.getSendTime()))
.operationTime(repairBackBill1.getSendTime() != null ?DateUtil.getLocalDateTime(repairBackBill1.getSendTime()):null)
.operatorUserName(operatorName(repairBackBill1))
.leftSignatureId(repairBackBill1.getLeftSignatureId())
.rightSignatureId(repairBackBill1.getRightSignatureId())
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论