Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xnr-interface
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
heli_wms
xnr-interface
Commits
291406b2
Commit
291406b2
authored
Dec 03, 2019
by
tank.li@mushiny.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拣货任务完善,出库单与系统绑定 完成后反馈
parent
9309eafc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
InboundController.java
...va/com/mushiny/heli/xnr/controller/InboundController.java
+2
-1
InboundService.java
...ain/java/com/mushiny/heli/xnr/service/InboundService.java
+15
-1
Sql_Table.java
src/main/java/com/mushiny/heli/xnr/service/Sql_Table.java
+1
-0
No files found.
src/main/java/com/mushiny/heli/xnr/controller/InboundController.java
View file @
291406b2
...
@@ -38,9 +38,10 @@ public class InboundController {
...
@@ -38,9 +38,10 @@ public class InboundController {
String
factory
=
CommonUtils
.
parseString
(
"factory"
,
data
);
String
factory
=
CommonUtils
.
parseString
(
"factory"
,
data
);
String
section
=
CommonUtils
.
parseString
(
"section"
,
data
);
String
section
=
CommonUtils
.
parseString
(
"section"
,
data
);
String
entryId
=
CommonUtils
.
parseString
(
"entryId"
,
data
);
String
entryId
=
CommonUtils
.
parseString
(
"entryId"
,
data
);
String
podOrderId
=
CommonUtils
.
parseString
(
"podOrderId"
,
data
);
//货架的货位 P0000008AA01
//货架的货位 P0000008AA01
String
containerId
=
CommonUtils
.
parseString
(
"containerId"
,
data
);
String
containerId
=
CommonUtils
.
parseString
(
"containerId"
,
data
);
MessageDTO
dto
=
this
.
inboundService
.
store
(
skuId
,
stored
,
containerId
,
factory
,
section
,
entryId
);
MessageDTO
dto
=
this
.
inboundService
.
store
(
skuId
,
stored
,
containerId
,
factory
,
section
,
entryId
,
podOrderId
);
return
ResponseEntity
.
ok
(
dto
);
return
ResponseEntity
.
ok
(
dto
);
}
}
...
...
src/main/java/com/mushiny/heli/xnr/service/InboundService.java
View file @
291406b2
...
@@ -86,10 +86,11 @@ public class InboundService {
...
@@ -86,10 +86,11 @@ public class InboundService {
* @param factory
* @param factory
* @param section
* @param section
* @param entryId
* @param entryId
* @param podOrderId
* @return
* @return
*/
*/
public
MessageDTO
store
(
String
skuId
,
int
stored
,
String
containerId
,
public
MessageDTO
store
(
String
skuId
,
int
stored
,
String
containerId
,
String
factory
,
String
section
,
String
entryId
)
{
String
factory
,
String
section
,
String
entryId
,
String
podOrderId
)
{
MessageDTO
messageDTO
=
MessageDTO
.
success
();
MessageDTO
messageDTO
=
MessageDTO
.
success
();
List
<
Map
>
invs
=
this
.
jdbcRepository
.
queryBySql
(
Sql_Table
.
SQL_INV_UNITLOADID
,
containerId
);
List
<
Map
>
invs
=
this
.
jdbcRepository
.
queryBySql
(
Sql_Table
.
SQL_INV_UNITLOADID
,
containerId
);
if
(
invs
.
isEmpty
()){
if
(
invs
.
isEmpty
()){
...
@@ -148,12 +149,25 @@ public class InboundService {
...
@@ -148,12 +149,25 @@ public class InboundService {
String
pId
=
CommonUtils
.
parseString
(
"ID"
,
ibOrderPosition
);
String
pId
=
CommonUtils
.
parseString
(
"ID"
,
ibOrderPosition
);
//更新入库单状态
//更新入库单状态
this
.
updateInboundOrderStatus
(
entryId
,
skuId
,
Sql_Table
.
FINISH
,
stored
,
msg
);
this
.
updateInboundOrderStatus
(
entryId
,
skuId
,
Sql_Table
.
FINISH
,
stored
,
msg
);
//结束货架任务信息 PodOrder
this
.
updateInboundPodOrder
(
Sql_Table
.
FINISH
,
podOrderId
);
//增加入库流水记录
//增加入库流水记录
this
.
add2InboundHistory
(
entryId
,
pId
,
skuId
,
containerId
);
this
.
add2InboundHistory
(
entryId
,
pId
,
skuId
,
containerId
);
return
messageDTO
;
return
messageDTO
;
}
}
private
void
updateInboundPodOrder
(
String
state
,
String
podOrderId
)
{
Map
newValue
=
new
HashMap
();
newValue
.
put
(
"STATE"
,
state
);
CommonUtils
.
modifyUselessInfo
(
newValue
);
Map
con
=
new
HashMap
();
con
.
put
(
"ID"
,
podOrderId
);
//
int
count
=
this
.
jdbcRepository
.
updateRecords
(
Sql_Table
.
WMS_INBOUND_PODORDER
,
newValue
,
con
);
}
private
void
add2InboundHistory
(
String
entryId
,
String
pId
,
String
skuId
,
String
containerId
)
{
private
void
add2InboundHistory
(
String
entryId
,
String
pId
,
String
skuId
,
String
containerId
)
{
//TODO
//TODO
}
}
...
...
src/main/java/com/mushiny/heli/xnr/service/Sql_Table.java
View file @
291406b2
...
@@ -96,6 +96,7 @@ public interface Sql_Table {
...
@@ -96,6 +96,7 @@ public interface Sql_Table {
String
SQL_QUERY_PODORDRTASK
=
"select WMS_INBOUND_PODORDER.* from WMS_INBOUND_PODORDER, WMS_INBOUND_ORDERPOSITION \n"
+
String
SQL_QUERY_PODORDRTASK
=
"select WMS_INBOUND_PODORDER.* from WMS_INBOUND_PODORDER, WMS_INBOUND_ORDERPOSITION \n"
+
" where WMS_INBOUND_PODORDER.ENTRYPOSITIONID = WMS_INBOUND_ORDERPOSITION.ID\n"
+
" where WMS_INBOUND_PODORDER.ENTRYPOSITIONID = WMS_INBOUND_ORDERPOSITION.ID\n"
+
" and WMS_INBOUND_PODORDER.STATE = 'Available' \n"
+
" and WMS_INBOUND_PODORDER.STATE = 'Available' \n"
+
" and WMS_INBOUND_ORDERPOSITION.STATE = 'Available' \n"
+
" and WMS_INBOUND_PODORDER.POD_ID=? and WMS_INBOUND_PODORDER.POD_FACE=?\n"
+
" and WMS_INBOUND_PODORDER.POD_ID=? and WMS_INBOUND_PODORDER.POD_FACE=?\n"
+
" ORDER BY WMS_INBOUND_PODORDER.CREATED_DATE DESC limit 1"
;
" ORDER BY WMS_INBOUND_PODORDER.CREATED_DATE DESC limit 1"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment