Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
20241b56
提交
20241b56
authored
3月 28, 2023
作者:
zhoushaopan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(区块链模块): 修复配发,退回,入库问题
修复了入库接收人为null,修复了配发,退回验证为假
上级
9d1cc644
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
5 行增加
和
2 行删除
+5
-2
BackController.java
.../com/tykj/dev/device/allot/controller/BackController.java
+2
-0
RepairBackBillServiceImpl.java
...device/repair/service/impl/RepairBackBillServiceImpl.java
+3
-2
没有找到文件。
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @
20241b56
...
@@ -917,6 +917,7 @@ public class BackController {
...
@@ -917,6 +917,7 @@ public class BackController {
//添加taskId
//添加taskId
allotBackBill
.
setTaskId
(
saveEntity
.
getId
());
allotBackBill
.
setTaskId
(
saveEntity
.
getId
());
myWebSocket
.
sendMessage1
();
myWebSocket
.
sendMessage1
();
allotBackBillService
.
update
(
allotBackBill
);
return
ResponseEntity
.
ok
(
new
ResultObj
(
allotBackBill
,
"发起成功"
));
return
ResponseEntity
.
ok
(
new
ResultObj
(
allotBackBill
,
"发起成功"
));
}
}
...
@@ -965,6 +966,7 @@ public class BackController {
...
@@ -965,6 +966,7 @@ public class BackController {
//返回保存成功的id
//返回保存成功的id
Integer
id
=
taskBto1
.
getId
();
Integer
id
=
taskBto1
.
getId
();
myWebSocket
.
sendMessage1
();
myWebSocket
.
sendMessage1
();
allotBackBillService
.
update
(
allotBackBill
);
return
ResponseEntity
.
ok
(
"保存成功"
+
id
);
return
ResponseEntity
.
ok
(
"保存成功"
+
id
);
}
}
else
{
else
{
...
...
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java
浏览文件 @
20241b56
...
@@ -178,6 +178,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
...
@@ -178,6 +178,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
BcRecord
bcRecord
=
blockService
.
fetchRecord
(
BlockBusinessEnum
.
REPAIR_BACK
.
subCode
,
billTypeAndBillId
.
getRecordID
());
BcRecord
bcRecord
=
blockService
.
fetchRecord
(
BlockBusinessEnum
.
REPAIR_BACK
.
subCode
,
billTypeAndBillId
.
getRecordID
());
RepairBackBill
repairBackBill
=
queryRepairBackBill
(
billId
);
RepairBackBill
repairBackBill
=
queryRepairBackBill
(
billId
);
RepairBackBill
repairBackBill1
=
JSON
.
parseObject
(
bcRecord
.
getData
().
getContent
(),
RepairBackBill
.
class
);
RepairBackBill
repairBackBill1
=
JSON
.
parseObject
(
bcRecord
.
getData
().
getContent
(),
RepairBackBill
.
class
);
BlockTraceabilityParsing
blockTraceabilityParsing
=
bcRecord
.
getData
().
toBlockTraceabilityParsing
();
BlockTraceabilityParsing
blockTraceabilityParsing
=
bcRecord
.
getData
().
toBlockTraceabilityParsing
();
// RepairBill repairBill = repairBillService.getOne();
// RepairBill repairBill = repairBillService.getOne();
blockTraceabilityParsing
.
setBusinessTraceabilityParsingData
(
TraceabilityParsingData
.
builder
()
blockTraceabilityParsing
.
setBusinessTraceabilityParsingData
(
TraceabilityParsingData
.
builder
()
...
@@ -189,7 +190,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
...
@@ -189,7 +190,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
.
initiateUnitName
(
repairBackBill
.
getSendUnit
())
//发起单位
.
initiateUnitName
(
repairBackBill
.
getSendUnit
())
//发起单位
.
receiveUnitName
(
repairBackBill
.
getReceiveUnit
())
//接收单位
.
receiveUnitName
(
repairBackBill
.
getReceiveUnit
())
//接收单位
.
documentNo
(
repairBackBill
.
getDocNum
())
//单据号
.
documentNo
(
repairBackBill
.
getDocNum
())
//单据号
.
operationTime
(
DateUtil
.
getLocalDateTime
(
repairBackBill
.
getSendTime
())
)
//发起时间
.
operationTime
(
repairBackBill
.
getSendTime
()
!=
null
?
DateUtil
.
getLocalDateTime
(
repairBackBill
.
getSendTime
()):
null
)
//发起时间
.
operatorUserName
(
operatorName
(
repairBackBill
))
//相关人员
.
operatorUserName
(
operatorName
(
repairBackBill
))
//相关人员
.
leftSignatureId
(
repairBackBill
.
getLeftSignatureId
())
.
leftSignatureId
(
repairBackBill
.
getLeftSignatureId
())
.
rightSignatureId
(
repairBackBill
.
getRightSignatureId
())
.
rightSignatureId
(
repairBackBill
.
getRightSignatureId
())
...
@@ -204,7 +205,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
...
@@ -204,7 +205,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
.
initiateUnitName
(
repairBackBill1
.
getSendUnit
())
.
initiateUnitName
(
repairBackBill1
.
getSendUnit
())
.
receiveUnitName
(
repairBackBill1
.
getReceiveUnit
())
.
receiveUnitName
(
repairBackBill1
.
getReceiveUnit
())
.
documentNo
(
repairBackBill1
.
getDocNum
())
.
documentNo
(
repairBackBill1
.
getDocNum
())
.
operationTime
(
DateUtil
.
getLocalDateTime
(
repairBackBill1
.
getSendTime
())
)
.
operationTime
(
repairBackBill1
.
getSendTime
()
!=
null
?
DateUtil
.
getLocalDateTime
(
repairBackBill1
.
getSendTime
()):
null
)
.
operatorUserName
(
operatorName
(
repairBackBill1
))
.
operatorUserName
(
operatorName
(
repairBackBill1
))
.
leftSignatureId
(
repairBackBill1
.
getLeftSignatureId
())
.
leftSignatureId
(
repairBackBill1
.
getLeftSignatureId
())
.
rightSignatureId
(
repairBackBill1
.
getRightSignatureId
())
.
rightSignatureId
(
repairBackBill1
.
getRightSignatureId
())
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论