Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit a769defa
由
sunke
编写于
2022-10-12 14:13:20 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
条码规则修正
1 个父辈
0f9be23a
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
9 行增加
和
4 行删除
src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java
src/main/java/com/neotel/smfcore/custom/neotel/NeotelController.java
src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java
查看文件 @
a769def
此文件的差异被折叠,
点击展开。
src/main/java/com/neotel/smfcore/custom/neotel/NeotelController.java
查看文件 @
a769def
...
@@ -18,6 +18,7 @@ import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
...
@@ -18,6 +18,7 @@ import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import
com.neotel.smfcore.core.storage.service.po.Storage
;
import
com.neotel.smfcore.core.storage.service.po.Storage
;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
import
com.neotel.smfcore.core.system.util.DevicesStatusUtil
;
import
com.neotel.smfcore.core.system.util.DevicesStatusUtil
;
import
com.neotel.smfcore.security.annotation.AnonymousAccess
;
import
com.neotel.smfcore.security.annotation.AnonymousPostMapping
;
import
com.neotel.smfcore.security.annotation.AnonymousPostMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -48,7 +49,8 @@ public class NeotelController {
...
@@ -48,7 +49,8 @@ public class NeotelController {
@ApiOperation
(
"6.1创建需求单"
)
@ApiOperation
(
"6.1创建需求单"
)
@AnonymousPostMapping
(
"/outInfo"
)
@RequestMapping
(
"/outInfo"
)
@AnonymousAccess
public
ResultBean
outInfo
(
@RequestBody
List
<
Map
<
String
,
Object
>>
paramList
)
{
public
ResultBean
outInfo
(
@RequestBody
List
<
Map
<
String
,
Object
>>
paramList
)
{
log
.
info
(
"{}收到数据为:{}"
,
"创建需求单outInfo"
,
JsonUtil
.
toJsonStr
(
paramList
));
log
.
info
(
"{}收到数据为:{}"
,
"创建需求单outInfo"
,
JsonUtil
.
toJsonStr
(
paramList
));
if
(!
paramList
.
isEmpty
())
{
if
(!
paramList
.
isEmpty
())
{
...
@@ -95,7 +97,8 @@ public class NeotelController {
...
@@ -95,7 +97,8 @@ public class NeotelController {
}
}
@ApiOperation
(
"6.2关闭需求单"
)
@ApiOperation
(
"6.2关闭需求单"
)
@AnonymousPostMapping
(
"/closeOutInfo"
)
@RequestMapping
(
"/closeOutInfo"
)
@AnonymousAccess
public
ResultBean
closeOutInfo
(
@RequestBody
Map
<
String
,
String
>
paramMap
)
{
public
ResultBean
closeOutInfo
(
@RequestBody
Map
<
String
,
String
>
paramMap
)
{
String
orderNo
=
paramMap
.
get
(
"hSerial"
);
//需求工单
String
orderNo
=
paramMap
.
get
(
"hSerial"
);
//需求工单
if
(
ObjectUtils
.
isEmpty
(
orderNo
))
{
if
(
ObjectUtils
.
isEmpty
(
orderNo
))
{
...
@@ -110,7 +113,8 @@ public class NeotelController {
...
@@ -110,7 +113,8 @@ public class NeotelController {
}
}
@ApiOperation
(
"6.3 获取实时库存"
)
@ApiOperation
(
"6.3 获取实时库存"
)
@AnonymousPostMapping
(
"/inventory"
)
@RequestMapping
(
"/inventory"
)
@AnonymousAccess
public
ResultBean
inventory
(
@RequestBody
Map
<
String
,
List
<
String
>>
paramMap
)
{
public
ResultBean
inventory
(
@RequestBody
Map
<
String
,
List
<
String
>>
paramMap
)
{
List
<
String
>
partNums
=
paramMap
.
get
(
"partNums"
);
List
<
String
>
partNums
=
paramMap
.
get
(
"partNums"
);
List
<
String
>
reelIds
=
paramMap
.
get
(
"reelIds"
);
List
<
String
>
reelIds
=
paramMap
.
get
(
"reelIds"
);
...
@@ -157,7 +161,8 @@ public class NeotelController {
...
@@ -157,7 +161,8 @@ public class NeotelController {
}
}
@ApiOperation
(
"6.4 设备状态获取"
)
@ApiOperation
(
"6.4 设备状态获取"
)
@AnonymousPostMapping
(
"/deviceStatus"
)
@RequestMapping
(
"/deviceStatus"
)
@AnonymousAccess
public
ResultBean
deviceStatus
(
@RequestBody
Map
<
String
,
Object
>
paramMap
)
{
public
ResultBean
deviceStatus
(
@RequestBody
Map
<
String
,
Object
>
paramMap
)
{
Collection
<
Storage
>
storageList
=
Lists
.
newArrayList
();
Collection
<
Storage
>
storageList
=
Lists
.
newArrayList
();
List
<
String
>
deviceKeyList
=
paramMap
.
get
(
"deviceKeyList"
)
==
null
?
null
:
JsonUtil
.
toList
(
paramMap
.
get
(
"deviceKeyList"
).
toString
(),
String
.
class
);
List
<
String
>
deviceKeyList
=
paramMap
.
get
(
"deviceKeyList"
)
==
null
?
null
:
JsonUtil
.
toList
(
paramMap
.
get
(
"deviceKeyList"
).
toString
(),
String
.
class
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论