Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-agile-tianjin.git

src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -185,6 +185,7 @@ public class KcswController {
      * @param storehouseId 仓房id
      * @param warehouseId 货位id
      * @return
+     * @throws Exception 
      */
     @RequestMapping(value="/getMassageBych", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="获取库存数量", notes = "获取库存数量")
@@ -193,13 +194,30 @@ public class KcswController {
 		@ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
 		@ApiImplicitParam(name = "qualitycheckList", value = "货位id", paramType = "query"),
 	})
-    public Map<String, Object> getMassageBych(Integer storehouseId,Integer warehouseId,String qualitycheckList) {
+    public Map<String, Object> getMassageBych(Integer storehouseId,Integer warehouseId,String qualitycheckList) throws Exception {
     	Map<String, Object> map = new HashMap<String, Object>();
     	if(storehouseId!=null && warehouseId!=null){
     		Map<String, Object> modelMap = new HashMap<String, Object>();
         	modelMap.put("storehouseId", storehouseId);
         	modelMap.put("warehouseId", warehouseId);
         	List<DataKcglKcswDefault> list = kcswService.getMassageBych(modelMap);
+        	//给生产年份赋值
+    		if (null != list && list.size() > 0) {
+    			for (DataKcglKcswDefault dataKcglKcswDefault : list) {
+    				DataKcglFcbgzDefaultExample fcbgz_example = new DataKcglFcbgzDefaultExample();
+    				DataKcglFcbgzDefaultExample.Criteria fcbgz_criteria = fcbgz_example.createCriteria();
+    				fcbgz_criteria.andUnitidEqualTo(dataKcglKcswDefault.getUnitid());
+    				fcbgz_criteria.andChEqualTo(dataKcglKcswDefault.getCh());
+    				fcbgz_criteria.andHwhEqualTo(dataKcglKcswDefault.getHwh());
+    				fcbgz_criteria.andSrslGreaterThan(0d);//收入数量大于0
+    				fcbgz_example.setOrderByClause(" rq DESC");
+    				List<DataKcglFcbgzDefault> fcbgz_list = fcbgzService.findByList(fcbgz_example);
+    				if (null != fcbgz_list && fcbgz_list.size() > 0) {
+    					int scnf = Integer.parseInt(ObjectUtils.toString(fcbgz_list.get(0).getScnf(), "0"));
+    					dataKcglKcswDefault.setScnf(scnf);
+    				}
+    			}
+    		}
         	map.put("list", list);
     	}
 
@@ -371,14 +389,34 @@ public class KcswController {
 	
 	/**
 	 * 销售计划 查询当前组织的库存信息
+	 * @throws Exception 
 	 */
 	@RequestMapping(value="/queryKcData",produces=MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询当前组织的库存信息", notes = "查询当前组织的库存信息")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "orgId", value = "登录对象", paramType = "form")
 	})
-	public List<DataKcglKcswDefault> queryKcData(Integer orgId,Integer houseId,Integer warehouseId){
-		return kcswService.queryKcData(orgId,houseId,warehouseId);
+	public List<DataKcglKcswDefault> queryKcData(Integer orgId,Integer houseId,Integer warehouseId) throws Exception{
+		List<DataKcglKcswDefault> kcList = kcswService.queryKcData(orgId,houseId,warehouseId);
+		//给生产年份赋值
+		if (null != kcList && kcList.size() > 0) {
+			for (DataKcglKcswDefault dataKcglKcswDefault : kcList) {
+				DataKcglFcbgzDefaultExample fcbgz_example = new DataKcglFcbgzDefaultExample();
+				DataKcglFcbgzDefaultExample.Criteria fcbgz_criteria = fcbgz_example.createCriteria();
+				fcbgz_criteria.andUnitidEqualTo(dataKcglKcswDefault.getUnitid());
+				fcbgz_criteria.andChEqualTo(dataKcglKcswDefault.getCh());
+				fcbgz_criteria.andHwhEqualTo(dataKcglKcswDefault.getHwh());
+				fcbgz_criteria.andSrslGreaterThan(0d);//收入数量大于0
+				fcbgz_example.setOrderByClause(" rq DESC");
+				List<DataKcglFcbgzDefault> fcbgz_list = fcbgzService.findByList(fcbgz_example);
+				if (null != fcbgz_list && fcbgz_list.size() > 0) {
+					int scnf = Integer.parseInt(ObjectUtils.toString(fcbgz_list.get(0).getScnf(), "0"));
+					dataKcglKcswDefault.setScnf(scnf);
+				}
+			}
+		}
+		
+		return kcList;
 	}
 
 	@RequestMapping(value="/queryKcswData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)