|
|
@@ -8,6 +8,7 @@ import java.util.Map;
|
|
8
|
8
|
import javax.annotation.Resource;
|
|
9
|
9
|
import javax.servlet.http.HttpServletRequest;
|
|
10
|
10
|
|
|
|
11
|
+import org.apache.commons.lang.ObjectUtils;
|
|
11
|
12
|
import org.springframework.beans.factory.annotation.Value;
|
|
12
|
13
|
import org.springframework.http.MediaType;
|
|
13
|
14
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
@@ -24,6 +25,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
|
|
24
|
25
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
25
|
26
|
import com.github.pagehelper.PageHelper;
|
|
26
|
27
|
import com.github.pagehelper.PageInfo;
|
|
|
28
|
+import com.mysql.jdbc.StringUtils;
|
|
27
|
29
|
|
|
28
|
30
|
import io.swagger.annotations.Api;
|
|
29
|
31
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
@@ -109,6 +111,16 @@ public class StorageDumpController {
|
|
109
|
111
|
List<StorageDump> list = storageDumpService.findCondition(example);
|
|
110
|
112
|
|
|
111
|
113
|
PageInfo<StorageDump> pageInfo = new PageInfo<StorageDump>(list);
|
|
|
114
|
+ if (pageInfo.getList().size() > 0) {
|
|
|
115
|
+ for (int i = 0; i < pageInfo.getList().size(); i++) {
|
|
|
116
|
+ String cf = ObjectUtils.toString(pageInfo.getList().get(i).getHouseId(), "");
|
|
|
117
|
+
|
|
|
118
|
+ String hwh = ObjectUtils.toString(pageInfo.getList().get(i).getWareId(), "");
|
|
|
119
|
+ if (!"".equals(hwh) && !"YG".equals(cf.substring(0,2))) {
|
|
|
120
|
+ pageInfo.getList().get(i).setHwh(Integer.parseInt(hwh));
|
|
|
121
|
+ }
|
|
|
122
|
+ }
|
|
|
123
|
+ }
|
|
112
|
124
|
|
|
113
|
125
|
return pageInfo;
|
|
114
|
126
|
}
|