fanxiongwei 6 年之前
父節點
當前提交
3cfa85083e

+ 15 - 7
src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -62,6 +62,19 @@ public class KcswController {
62 62
         Map<String, Object> queryByExample = kcswService.queryByExample(orgId);
63 63
         return queryByExample;
64 64
     }
65
+
66
+    @RequestMapping(value="/countByBl", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
67
+    @ApiOperation(value="根据库存总量", notes = "根据库存总量")
68
+	@ApiImplicitParams({
69
+		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
70
+	})
71
+    public String countByBl(Integer orgId) {
72
+    	Map<String, Object> map = new HashMap<String, Object>();
73
+    	map.put("orgId", orgId);
74
+    	String countKcsl = kcswService.countByBl(map);
75
+    	countKcsl = ObjectUtils.toString(countKcsl, "0");
76
+		return countKcsl;
77
+	}
65 78
     
66 79
     /**
67 80
      * 根据等级分组查询
@@ -113,11 +126,10 @@ public class KcswController {
113 126
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
114 127
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
115 128
         @ApiImplicitParam(name = "kcswStr", value = "条件集合", paramType = "query"),
116
-        @ApiImplicitParam(name = "order", value = "排序方式", paramType = "query"),
117
-        @ApiImplicitParam(name="kcsl", value="库存数量", paramType="query")
129
+        @ApiImplicitParam(name = "order", value = "排序方式", paramType = "query")
118 130
 	})
119 131
     public PageInfo<DataKcglKcswDefault> getList(Integer pageNum, Integer pageSize, String kcswStr,
120
-    		String order, String kcsl){
132
+    		String order){
121 133
     	ObjectMapper mapper = new ObjectMapper();
122 134
     	DataKcglKcswDefault kcsw = null;
123 135
     	PageInfo<DataKcglKcswDefault> pageInfo = null;
@@ -141,10 +153,6 @@ public class KcswController {
141 153
 			if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
142 154
 				criteria.andUnitidEqualTo(kcsw.getUnitid());
143 155
 			}
144
-			/* 库存数量模糊查询 */
145
-			if (null != kcsl && !"".equals(kcsl)) {
146
-				criteria.andKcslLike("%"+kcsl+"%");
147
-			}
148 156
 			/* 排序 */
149 157
 			if (null != order && !"".equals(order)) {
150 158
 				example.setOrderByClause(order);

+ 0 - 5
src/main/java/com/chinaitop/agile/model/DataKcglKcswDefaultExample.java

@@ -1237,11 +1237,6 @@ public class DataKcglKcswDefaultExample {
1237 1237
             return (Criteria) this;
1238 1238
         }
1239 1239
 
1240
-        public Criteria andKcslLike(String value) {
1241
-            addCriterion("kcsl like ", value, "kcsl");
1242
-            return (Criteria) this;
1243
-        }
1244
-
1245 1240
         public Criteria andCjsjIsNull() {
1246 1241
             addCriterion("cjsj is null");
1247 1242
             return (Criteria) this;

+ 7 - 0
src/main/java/com/chinaitop/agile/service/KcswService.java

@@ -74,4 +74,11 @@ public interface KcswService {
74 74
 	 */
75 75
 	List<DataKcglKcswDefault> queryKcData(Integer orgId,Integer houseId,Integer warehouseId);
76 76
 
77
+	/**
78
+	 * 查询库存总量
79
+	 * @param map
80
+	 * @return
81
+	 */
82
+	String countByBl(Map<String, Object> map);
83
+
77 84
 }

+ 5 - 0
src/main/java/com/chinaitop/agile/service/impl/KcswServiceImpl.java

@@ -288,4 +288,9 @@ public class KcswServiceImpl implements KcswService{
288 288
         }
289 289
 		return dataKcglKcswDefaultMapper.selectByExample(example);
290 290
 	}
291
+
292
+	@Override
293
+	public String countByBl(Map<String, Object> map) {
294
+		return dataKcglKcswDefaultMapper.countByBl(map);
295
+	}
291 296
 }