库存数量管理列表生产年度取值方式变更

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

@@ -154,6 +154,23 @@ public class KcswController {
 			}
 			List<DataKcglKcswDefault> list = kcswService.findCondition(example);
 			pageInfo = new PageInfo<DataKcglKcswDefault>(list);
+			//给生产年份赋值
+			if (null != pageInfo.getList() && pageInfo.getList().size() > 0) {
+				for (DataKcglKcswDefault kcsw_obj : pageInfo.getList()) {
+					DataKcglFcbgzDefaultExample fcbgz_example = new DataKcglFcbgzDefaultExample();
+					DataKcglFcbgzDefaultExample.Criteria fcbgz_criteria = fcbgz_example.createCriteria();
+					fcbgz_criteria.andUnitidEqualTo(kcsw_obj.getUnitid());
+					fcbgz_criteria.andChEqualTo(kcsw_obj.getCh());
+					fcbgz_criteria.andHwhEqualTo(kcsw_obj.getHwh());
+					fcbgz_criteria.andSrslGreaterThan(0d);//收入数量大于0
+					fcbgz_example.setOrderByClause(" ModifyDate 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"));
+						kcsw_obj.setScnf(scnf);
+					}
+				}
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -167,7 +184,7 @@ public class KcswController {
 	 * @param kcswStr 条件集合
 	 * @return
 	 */
-	@SuppressWarnings("unused")
+	@SuppressWarnings("all")
 	@RequestMapping(value="/getEmptyList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="库存空仓报警信息", notes = "支持分页")
 	@ApiImplicitParams({
@@ -541,7 +558,8 @@ public class KcswController {
 						fcbgz_example.setOrderByClause(" ModifyDate DESC");
 						List<DataKcglFcbgzDefault> fcbgz_list = fcbgzService.findByList(fcbgz_example);
 						if (null != fcbgz_list && fcbgz_list.size() > 0) {
-							obj1.setScnf(fcbgz_list.get(0).getScnf());
+							int scnf = Integer.parseInt(ObjectUtils.toString(fcbgz_list.get(0).getScnf(), "0"));
+							obj1.setScnf(scnf);
 							obj1.setWjh(ParameterUtil.datetime2string(obj1.getModifydate()));
 						}
 						

src/main/java/com/chinaitop/agile/model/DataKcglKcswDefault.java

@@ -329,13 +329,13 @@ public class DataKcglKcswDefault {
         this.cjsj = cjsj;
     }
     
-    private String scnf; //生产年份
+    private int scnf; //生产年份
 
-	public String getScnf() {
+	public int getScnf() {
 		return scnf;
 	}
 
-	public void setScnf(String scnf) {
+	public void setScnf(int scnf) {
 		this.scnf = scnf;
 	}