|
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
|
22
|
22
|
|
23
|
23
|
import java.text.SimpleDateFormat;
|
24
|
24
|
import java.util.ArrayList;
|
|
25
|
+import java.util.Arrays;
|
25
|
26
|
import java.util.Date;
|
26
|
27
|
import java.util.List;
|
27
|
28
|
|
|
@@ -84,17 +85,25 @@ public class StoreServiceImpl implements StoreService {
|
84
|
85
|
String toDate,
|
85
|
86
|
String fkcustmerName,
|
86
|
87
|
String ordNo,
|
|
88
|
+
|
87
|
89
|
String userId,
|
88
|
90
|
String belongId) {
|
|
91
|
+
|
|
92
|
+ List<String> pltNos =new ArrayList<>() ;
|
|
93
|
+ if (plateNo.indexOf(",") != -1){
|
|
94
|
+ pltNos = Arrays.asList(plateNo.split(","));
|
|
95
|
+ }
|
|
96
|
+
|
|
97
|
+
|
89
|
98
|
if(page == -1 && rows == -1){
|
90
|
99
|
List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
|
91
|
|
- customerName,fromDate, toDate, userId,belongId, plateNo,fkcustmerName,ordNo);
|
|
100
|
+ customerName,fromDate, toDate, userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
|
92
|
101
|
result = JSONTools.toStringyyyyMMddHHmmss(list);
|
93
|
102
|
}else {
|
94
|
103
|
PageHelper.startPage(page, rows);
|
95
|
104
|
|
96
|
105
|
List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
|
97
|
|
- customerName,fromDate, toDate, userId,belongId, plateNo,fkcustmerName,ordNo);
|
|
106
|
+ customerName,fromDate, toDate, userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
|
98
|
107
|
PageInfo<Store> pageInfo = new PageInfo<>(list);
|
99
|
108
|
result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
|
100
|
109
|
}
|