Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 8ff69f74
由
zshaohui
编写于
2024-07-31 09:58:43 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1.工单出库调用批量禁用料接口
1 个父辈
be5f0b65
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
88 行增加
和
3 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java
src/main/resources/config/application-21088prod.yml
src/main/resources/config/application-21088test.yml
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
查看文件 @
8ff69f7
...
...
@@ -1014,7 +1014,22 @@ public class LiteOrderCache {
subCodeList
=
subCodeList
.
stream
().
sorted
(
Comparator
.
comparing
(
Barcode:
:
getAmount
)).
collect
(
Collectors
.
toList
());
//判断禁用料信息
//禁用的物料信息
List
<
String
>
batchCheckReelList
=
LuxsanApi
.
batchCheckReel
(
subCodeList
);
if
(
batchCheckReelList
!=
null
&&
!
batchCheckReelList
.
isEmpty
()){
for
(
Barcode
subCode
:
subCodeList
){
if
(
disablePosNameList
.
contains
(
subCode
.
getPosName
()))
{
continue
;
}
if
(
batchCheckReelList
.
contains
(
subCode
.
getBarcode
())){
log
.
info
(
subCode
.
getBarcode
()+
"为禁用料,禁用库位为:"
+
subCode
.
getPosName
());
disablePosNameList
.
add
(
subCode
.
getPosName
());
}
}
}
/* //判断禁用料信息
for (Barcode subCode : subCodeList) {
if (disablePosNameList != null && !disablePosNameList.isEmpty()) {
if (disablePosNameList.contains(subCode.getPosName())) {
...
...
@@ -1036,7 +1051,7 @@ public class LiteOrderCache {
if (DisableBarcodeUtil.isDisable(subCode.getBarcode())){
disablePosNameList.add(subCode.getPosName());
}
}
}
*/
List
<
String
>
subCodeIds
=
new
ArrayList
<>();
...
...
src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java
查看文件 @
8ff69f7
...
...
@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.luxsan.api;
import
cn.hutool.core.util.NumberUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.neotel.smfcore.common.exception.ApiException
;
import
com.neotel.smfcore.common.exception.ValidateException
;
...
...
@@ -1079,6 +1080,62 @@ public class LuxsanApi extends DefaultSmfApiListener {
return
result
;
}
public
static
void
main
(
String
[]
args
)
{
List
<
String
>
batchCheckReel
=
batchCheckReel
(
new
ArrayList
<>());
System
.
out
.
println
(
JSON
.
toJSONString
(
batchCheckReel
));
}
public
static
List
<
String
>
batchCheckReel
(
List
<
Barcode
>
barcodeList
)
{
List
<
Map
<
String
,
Object
>>
paramList
=
new
ArrayList
<>();
for
(
Barcode
barcode
:
barcodeList
)
{
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"ipn"
,
barcode
.
getPartNumber
());
paramMap
.
put
(
"reelId"
,
barcode
.
getBarcode
());
paramMap
.
put
(
"wo"
,
""
);
paramMap
.
put
(
"datecode"
,
barcode
.
getDateCode
());
paramMap
.
put
(
"lot"
,
barcode
.
getBatch
());
paramMap
.
put
(
"vendor"
,
barcode
.
getProvider
());
paramMap
.
put
(
"remark"
,
"ALL"
);
paramMap
.
put
(
"werks"
,
"ALL"
);
paramMap
.
put
(
"model"
,
"ALL"
);
paramMap
.
put
(
"picking"
,
"ALL"
);
paramList
.
add
(
paramMap
);
}
log
.
info
(
"批量禁用入参为:"
+
JSON
.
toJSONString
(
paramList
));
List
<
String
>
reelList
=
new
ArrayList
<>();
try
{
String
resultStr
=
HttpHelper
.
postJson
(
batchCheckReelUrl
,
paramList
);
log
.
info
(
"批量禁用接口返回结果为:"
+
resultStr
);
JSONObject
resultObj
=
JSONObject
.
parseObject
(
resultStr
);
String
status
=
resultObj
.
getString
(
"status"
);
if
(
"200"
.
equals
(
status
)){
JSONArray
dataArr
=
resultObj
.
getJSONArray
(
"data"
);
if
(
dataArr
!=
null
&&
!
dataArr
.
isEmpty
()){
for
(
int
i
=
0
;
i
<
dataArr
.
size
();
i
++)
{
JSONObject
data
=
dataArr
.
getJSONObject
(
i
);
JSONArray
resultList
=
data
.
getJSONArray
(
"resultList"
);
if
(
resultList
!=
null
&&
!
resultList
.
isEmpty
()){
for
(
int
j
=
0
;
j
<
resultList
.
size
();
j
++)
{
JSONObject
result
=
resultList
.
getJSONObject
(
j
);
String
reelId
=
result
.
getString
(
"reelId"
);
if
(
StringUtils
.
isNotBlank
(
reelId
)){
reelList
.
add
(
reelId
);
}
}
}
}
}
}
}
catch
(
Exception
e
){
log
.
info
(
"批量禁用接口调用失败:"
+
e
.
getMessage
());
}
return
reelList
;
}
@Override
public
void
outTaskStatusChange
(
String
outNotifyUrl
,
DataLog
task
)
{
...
...
@@ -1091,6 +1148,13 @@ public class LuxsanApi extends DefaultSmfApiListener {
}
private
static
String
batchCheckReelUrl
;
@Value
(
"${api.batchCheckReel}"
)
public
void
setBatchCheckReelUrl
(
String
url
)
{
LuxsanApi
.
batchCheckReelUrl
=
url
;
}
private
static
String
queryBinUrl
;
@Value
(
"${api.queryBin}"
)
...
...
src/main/resources/config/application-21088prod.yml
查看文件 @
8ff69f7
...
...
@@ -176,3 +176,6 @@ api:
#自动仓手动绑定栈板
manualPallet
:
http://10.68.30.22:8082/api/mlb/manualPallet
#批量禁用料
batchCheckReel
:
http://10.68.27.68:8001/Npm/CheckReelBatch
src/main/resources/config/application-21088test.yml
查看文件 @
8ff69f7
...
...
@@ -175,4 +175,7 @@ api:
ticketPickPost
:
http://10.42.220.171:8082/api/mlb/TicketPickPost
#自动仓手动绑定栈板
manualPallet
:
http://10.42.220.171:8082/api/mlb/manualPallet
\ No newline at end of file
manualPallet
:
http://10.42.220.171:8082/api/mlb/manualPallet
#批量禁用料
batchCheckReel
:
http://10.68.27.68:8001/Npm/CheckReelBatch
\ No newline at end of file
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论