Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit add365d1
由
孙克
编写于
2024-04-29 16:05:51 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
料仓接收WMS手动发料
1 个父辈
e8f5a976
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
125 行增加
和
0 行删除
src/main/java/com/neotel/smfcore/custom/lizhen/LizhenController.java
src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/bean/AskReelBoxList.java
src/main/java/com/neotel/smfcore/custom/lizhen/LizhenController.java
查看文件 @
add365d
package
com
.
neotel
.
smfcore
.
custom
.
lizhen
;
import
cn.hutool.core.util.NumberUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.google.common.collect.Maps
;
import
com.neotel.smfcore.common.bean.ResultBean
;
...
...
@@ -22,6 +24,9 @@ import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
import
com.neotel.smfcore.core.system.service.po.DataLog
;
import
com.neotel.smfcore.custom.lizhen.innerBox.bean.PreWarningItem
;
import
com.neotel.smfcore.custom.lizhen.innerBox.util.PreWarningItemCache
;
import
com.neotel.smfcore.custom.lizhen.innerBox.util.StorageExportUtil
;
import
com.neotel.smfcore.custom.lizhen.third.maicheng.bean.AskReelBox
;
import
com.neotel.smfcore.custom.lizhen.third.maicheng.bean.AskReelBoxList
;
import
com.neotel.smfcore.security.annotation.AnonymousAccess
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -251,6 +256,124 @@ public class LizhenController {
return
ResultBean
.
newErrorResult
(-
1
,
""
,
"未找到相关信息"
);
}
/**
* "[
* {
* ""ID"": ""L2BG-TOPTX2I-01122A1179700152231SDUQ"",
* ""WORKORDERNO"": ""030000478352"",
* ""LINE"": ""A05-5FSMT-12S"",
* ""MACHINENAME"": ""L2BG-TOP"",
* ""STATION"": ""01_1"",
* ""SIDE"": ""T"",
* ""SLOT"": ""22"",
* ""SUBSLOT"": ""L"",
* ""PARTNUMBER"": ""117S00067"",
* ""LEFTQTY"": ""9003"",
* ""LEFTPCBS"": ""204"",
* ""LEFTTIMES"": ""57"",
* ""PRIORITY"": ""0"",
* ""OP"": """",
* ""PRODUCTBOARDS"": ""204"",
* ""REEL"": ""A1179700152231SDUQ"",
* ""STATUS"": ""MACHINECALL"",
* ""MACHINETYPE"": ""ASM"",
* ""RECIEVETYPE"": ""NEW"",
* ""VENDOR"": """",
* ""PITCH"": ""2"",
* ""TAPLENGTH"": null,
* ""REQ_REEL"": 2,
* ""REQ_QTY"": 1000,
* },
* {
* ""ID"": ""L2BG-TOPTX2I-02131A1179700104231UMAZ"",
* ""WORKORDERNO"": ""030000478352"",
* ""LINE"": ""A05-5FSMT-12S"",
* ""MACHINENAME"": ""L2BG-TOP"",
* ""STATION"": ""02_1"",
* ""SIDE"": ""T"",
* ""SLOT"": ""31"",
* ""SUBSLOT"": ""L"",
* ""PARTNUMBER"": ""117S00067"",
* ""LEFTQTY"": ""19016"",
* ""LEFTPCBS"": ""121"",
* ""LEFTTIMES"": ""34"",
* ""PRIORITY"": ""0"",
* ""OP"": """",
* ""PRODUCTBOARDS"": ""121"",
* ""REEL"": ""A1179700104231UMAZ"",
* ""STATUS"": ""MACHINECALL"",
* ""MACHINETYPE"": ""ASM"",
* ""RECIEVETYPE"": ""DOUBLE"",
* ""VENDOR"": """",
* ""PITCH"": ""2"",
* ""TAPLENGTH"": null,
* ""REQ_REEL"": 2,
* ""REQ_QTY"": 1000,
* }
* ]"
* @return
*
* "{
* ""MSGTY"": ""S"",
* ""MSGTX"": ""接收成功""
* }"
*/
@ApiOperation
(
"Tower接收手动发料信息"
)
@RequestMapping
(
"/manualTower"
)
@AnonymousAccess
public
Map
<
String
,
String
>
manualTower
(
@RequestBody
List
<
AskReelBoxList
>
itemList
)
{
log
.
info
(
"收到WMS手动发料数据为:"
+
JSON
.
toJSONString
(
itemList
));
createManualOrder
(
itemList
);
Map
<
String
,
String
>
resultMap
=
new
HashMap
<>();
resultMap
.
put
(
"MSGTY"
,
"S"
);
resultMap
.
put
(
"MSGTX"
,
"接收成功"
);
return
resultMap
;
}
private
String
createManualOrder
(
List
<
AskReelBoxList
>
itemList
)
{
Map
<
String
,
LiteOrder
>
orderMap
=
new
HashMap
<>();
for
(
AskReelBoxList
askItem
:
itemList
)
{
String
orderNo
=
askItem
.
getWORKORDERNO
();
LiteOrder
order
=
orderMap
.
get
(
orderNo
);
if
(
order
==
null
){
order
=
new
LiteOrder
();
order
.
setOrderNo
(
askItem
.
getWORKORDERNO
());
order
.
setLine
(
askItem
.
getLINE
());
order
=
liteOrderManager
.
save
(
order
);
}
LiteOrderItem
orderItem
=
new
LiteOrderItem
();
orderItem
.
setLine
(
askItem
.
getLINE
());
orderItem
.
setWarningItemId
(
askItem
.
getID
());
orderItem
.
setMo
(
askItem
.
getWORKORDERNO
());
int
needReelCount
=
NumberUtil
.
parseInt
(
askItem
.
getREQ_REEL
());
orderItem
.
setNeedReelCount
(
needReelCount
);
int
needNum
=
NumberUtil
.
parseInt
(
askItem
.
getREQ_QTY
());
orderItem
.
setNeedNum
(
needNum
);
orderItem
.
setMachineName
(
askItem
.
getMACHINENAME
());
orderItem
.
setPn
(
askItem
.
getPARTNUMBER
());
orderItem
.
setSide
(
askItem
.
getSIDE
());
//设置面别
orderItem
.
setSlot
(
askItem
.
getSLOT
());
//站位
orderItem
.
setSubSlot
(
askItem
.
getSUBSLOT
());
orderItem
.
setTableNo
(
askItem
.
getSTATION
());
orderItem
.
setOrderNo
(
order
.
getOrderNo
());
orderItem
.
setOrderId
(
order
.
getId
());
orderItem
.
setMachineName
(
askItem
.
getMACHINENAME
());
orderItem
.
setReel
(
askItem
.
getREEL
());
orderItem
.
setBrand
(
askItem
.
getVENDOR
());
orderItem
.
setWidth
(
askItem
.
getWidth
());
orderItem
.
setDia
(
askItem
.
getDia
());
order
.
updateOrderItems
(
orderItem
);
}
for
(
LiteOrder
liteOrder
:
orderMap
.
values
())
{
liteOrderManager
.
save
(
liteOrder
);
liteOrderCache
.
addOrderToMap
(
liteOrder
);
log
.
info
(
"工单["
+
liteOrder
.
getOrderNo
()+
"]已创建完成"
);
}
return
"OK"
;
}
...
...
src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/bean/AskReelBoxList.java
查看文件 @
add365d
...
...
@@ -28,4 +28,6 @@ public class AskReelBoxList {
private
String
Num
;
private
String
Width
;
private
String
Dia
;
private
String
REQ_REEL
;
private
String
REQ_QTY
;
}
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论