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
8e991371
Commit
8e991371
authored
Dec 03, 2019
by
tank.li@mushiny.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拣货任务完善,出库单与系统绑定 完成后反馈
parent
f172fb41
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
0 deletions
+30
-0
ICQAController.java
.../java/com/mushiny/heli/xnr/controller/ICQAController.java
+7
-0
ICQAService.java
src/main/java/com/mushiny/heli/xnr/service/ICQAService.java
+9
-0
InboundService.java
...ain/java/com/mushiny/heli/xnr/service/InboundService.java
+12
-0
Sql_Table.java
src/main/java/com/mushiny/heli/xnr/service/Sql_Table.java
+2
-0
No files found.
src/main/java/com/mushiny/heli/xnr/controller/ICQAController.java
View file @
8e991371
...
@@ -87,6 +87,13 @@ public class ICQAController {
...
@@ -87,6 +87,13 @@ public class ICQAController {
return
ResponseEntity
.
ok
(
JsonUtils
.
map2Json
(
resData
));
return
ResponseEntity
.
ok
(
JsonUtils
.
map2Json
(
resData
));
}
}
@PostMapping
(
value
=
"/searchSkus"
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<
String
>
searchSkus
(
@RequestBody
String
json
){
Map
data
=
JsonUtils
.
json2Map
(
json
);
Map
resData
=
this
.
icqaService
.
searchSkus
(
data
);
return
ResponseEntity
.
ok
(
JsonUtils
.
map2Json
(
resData
));
}
/**
/**
* 查找明细
* 查找明细
* @param json
* @param json
...
...
src/main/java/com/mushiny/heli/xnr/service/ICQAService.java
View file @
8e991371
...
@@ -418,4 +418,13 @@ public class ICQAService {
...
@@ -418,4 +418,13 @@ public class ICQAService {
}
}
return
data
.
get
(
0
);
return
data
.
get
(
0
);
}
}
public
Map
searchSkus
(
Map
data
)
{
//所有的SKU
List
<
Map
>
items
=
this
.
jdbcRepository
.
queryBySql
(
Sql_Table
.
SQL_FINDALLITEM
,
CommonUtils
.
parseString
(
"FACTORY"
,
data
)
,
CommonUtils
.
parseString
(
"FACTORY"
,
data
));
data
.
put
(
"content"
,
items
);
return
data
;
}
}
}
src/main/java/com/mushiny/heli/xnr/service/InboundService.java
View file @
8e991371
...
@@ -208,6 +208,18 @@ public class InboundService {
...
@@ -208,6 +208,18 @@ public class InboundService {
if
(
count
==
0
){
if
(
count
==
0
){
messageDTO
.
setMESSAGE
(
"更新失败,entryId:"
+
entryId
+
" skuId:"
+
skuId
);
messageDTO
.
setMESSAGE
(
"更新失败,entryId:"
+
entryId
+
" skuId:"
+
skuId
);
messageDTO
.
setCODE
(
1
);
messageDTO
.
setCODE
(
1
);
return
messageDTO
;
}
//更新主表记录
List
<
Map
>
ids
=
this
.
jdbcRepository
.
queryBySql
(
Sql_Table
.
SQL_QUERY_INBOUND_AVAILABLEPOSITION
,
entryId
);
if
(
ids
.
isEmpty
()){
Map
newValue2
=
new
HashMap
();
newValue2
.
put
(
"STATE"
,
Sql_Table
.
FINISH
);
CommonUtils
.
modifyUselessInfo
(
newValue2
);
Map
con2
=
new
HashMap
();
con2
.
put
(
"ENTRYID"
,
entryId
);
this
.
jdbcRepository
.
updateRecords
(
Sql_Table
.
WMS_INBOUND_ORDER
,
newValue2
,
con2
);
}
}
return
messageDTO
;
return
messageDTO
;
...
...
src/main/java/com/mushiny/heli/xnr/service/Sql_Table.java
View file @
8e991371
...
@@ -148,4 +148,6 @@ public interface Sql_Table {
...
@@ -148,4 +148,6 @@ public interface Sql_Table {
"(SELECT UNITLOAD_ID from \n"
+
"(SELECT UNITLOAD_ID from \n"
+
"(SELECT sum(AMOUNT) as SUMALL,UNITLOAD_ID \n"
+
"(SELECT sum(AMOUNT) as SUMALL,UNITLOAD_ID \n"
+
"FROM INV_STOCKUNIT group by UNITLOAD_ID )UNITLOAD WHERE UNITLOAD.SUMALL>0) limit 1"
;
"FROM INV_STOCKUNIT group by UNITLOAD_ID )UNITLOAD WHERE UNITLOAD.SUMALL>0) limit 1"
;
String
SQL_QUERY_INBOUND_AVAILABLEPOSITION
=
"SELECT ID FROM WMS_INBOUND_ORDERPOSITION "
+
"WHERE ENTRYID=? AND STATE<>'Finish'"
;
}
}
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