Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
QisdaNew
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit ea2473f1
由
sunke
编写于
2023-02-23 17:36:05 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加获取产线料架日志
1 个父辈
07e69815
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
8 行增加
和
3 行删除
myproject/src/main/java/com/myproject/util/QisdaApi.java
myproject/src/main/java/com/myproject/webapp/controller/qisda/util/OutInfoCache.java
myproject/src/main/java/com/myproject/util/QisdaApi.java
查看文件 @
ea2473f
...
@@ -695,10 +695,13 @@ public class QisdaApi {
...
@@ -695,10 +695,13 @@ public class QisdaApi {
}
}
}
}
public
static
String
GetSerialData
(
String
line
,
String
hserial
){
return
GetSerialData
(
line
,
hserial
,
false
);
}
/**
/**
* 检查工单料架是否解绑 [{"data":[{"Serial":"58890","VehicleID":"D15","Status":""},{"Serial":"58890","VehicleID":"D44","Status":""},{"Serial":"58890","VehicleID":"D83","Status":""},{"Serial":"58890","VehicleID":"D90","Status":""},{"Serial":"58890","VehicleID":"D98","Status":""}]}]
* 检查工单料架是否解绑 [{"data":[{"Serial":"58890","VehicleID":"D15","Status":""},{"Serial":"58890","VehicleID":"D44","Status":""},{"Serial":"58890","VehicleID":"D83","Status":""},{"Serial":"58890","VehicleID":"D90","Status":""},{"Serial":"58890","VehicleID":"D98","Status":""}]}]
*/
*/
public
static
String
GetSerialData
(
String
line
,
String
hserial
){
public
static
String
GetSerialData
(
String
line
,
String
hserial
,
boolean
showLog
){
if
(
DataCache
.
isProductionFor
(
DataCache
.
CUSTOMER
.
DEBUG
)){
if
(
DataCache
.
isProductionFor
(
DataCache
.
CUSTOMER
.
DEBUG
)){
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
""
;
return
""
;
...
@@ -709,7 +712,9 @@ public class QisdaApi {
...
@@ -709,7 +712,9 @@ public class QisdaApi {
paramMap
.
put
(
"hserial"
,
hserial
);
paramMap
.
put
(
"hserial"
,
hserial
);
try
{
try
{
String
result
=
HttpHelper
.
postParam
(
url
,
paramMap
);
String
result
=
HttpHelper
.
postParam
(
url
,
paramMap
);
log
.
debug
(
"从Qisda检查工单料架是否解绑["
+
line
+
"](GetSerialData)返回:"
+
result
);
if
(
showLog
){
log
.
info
(
"从Qisda检查工单["
+
hserial
+
"]料架是否解绑["
+
line
+
"](GetSerialData)返回:"
+
result
);
}
if
(
result
.
contains
(
"VehicleID"
)){
if
(
result
.
contains
(
"VehicleID"
)){
return
result
;
return
result
;
}
}
...
...
myproject/src/main/java/com/myproject/webapp/controller/qisda/util/OutInfoCache.java
查看文件 @
ea2473f
...
@@ -216,7 +216,7 @@ public class OutInfoCache {
...
@@ -216,7 +216,7 @@ public class OutInfoCache {
//补料检查是否有未解绑的料架
//补料检查是否有未解绑的料架
String
lineHasBindShelf
=
""
;
String
lineHasBindShelf
=
""
;
if
(
firstOutInfoToExecute
.
isTailAction
()){
if
(
firstOutInfoToExecute
.
isTailAction
()){
lineHasBindShelf
=
QisdaApi
.
GetSerialData
(
firstOutInfoToExecute
.
getLine
(),
firstOutInfoToExecute
.
gethSerial
());
lineHasBindShelf
=
QisdaApi
.
GetSerialData
(
firstOutInfoToExecute
.
getLine
(),
firstOutInfoToExecute
.
gethSerial
()
,
true
);
}
}
firstOutInfoToExecute
.
setLineBindShelfInfo
(
lineHasBindShelf
);
firstOutInfoToExecute
.
setLineBindShelfInfo
(
lineHasBindShelf
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论