库存数量管理已验收数量需求变更开发

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

@@ -1,7 +1,22 @@
 package com.chinaitop.agile.controller;
 
-import com.chinaitop.agile.model.DataKcglFcbgzDefault;
-import com.chinaitop.agile.model.DataKcglFcbgzDefaultExample;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.chinaitop.agile.model.DataKcglKcswDefault;
 import com.chinaitop.agile.model.DataKcglKcswDefaultExample;
 import com.chinaitop.agile.model.DataKcglKcswDefaultExample.Criteria;
@@ -14,20 +29,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 @RestController
 @RequestMapping(value="/agile/kcsw")
@@ -101,76 +107,9 @@ public class KcswController {
 	})
     public PageInfo<DataKcglKcswDefault> getList(Integer pageNum, Integer pageSize, String kcswStr,
     		String order){
-    	ObjectMapper mapper = new ObjectMapper();
-    	DataKcglKcswDefault kcsw = null;
     	PageInfo<DataKcglKcswDefault> pageInfo = null;
-    	Map<String,Object> map = new HashMap<String,Object>();
-    	DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
-    	DataKcglKcswDefaultExample.Criteria criteria = example.createCriteria();
 		try {
-			if (null != kcswStr && !"".equals(kcswStr)) {
-				kcsw = mapper.readValue(kcswStr, DataKcglKcswDefault.class);
-			} else {
-				kcsw = new DataKcglKcswDefault();
-			}
-			/* 仓房 */
-			if (null != kcsw.getCh() && !"".equals(kcsw.getCh())) {
-				criteria.andChEqualTo(kcsw.getCh());
-			}
-			/* 货位 */
-			if (null != kcsw.getHwh() && !"".equals(kcsw.getHwh())) {
-				criteria.andHwhEqualTo(kcsw.getHwh());
-			}
-			/* 品种 */
-			if (null != kcsw.getPz() && !"".equals(kcsw.getPz())) {
-				criteria.andPzEqualTo(kcsw.getPz());
-			}
-			/* 单位 */
-			if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
-				criteria.andUnitidEqualTo(kcsw.getUnitid());
-			}
-			/* 归档用最后一次编辑时间 */
-			if (null != kcsw.getModifydate() && !"".equals(kcsw.getModifydate())) {
-				criteria.andModifydateLessThan(kcsw.getModifydate());
-			}
-
-			if(null != pageNum && null != pageSize){
-				PageHelper.startPage(pageNum, pageSize);
-			}
-			example.setOrderByClause(" to_number(ch) ");
-			/* 1、查询库存实物表数据 */
-			List<DataKcglKcswDefault> list = kcswService.findCondition(example);
-			pageInfo = new PageInfo<DataKcglKcswDefault>(list);
-
-			/* 2、查询对应仓房的生产年份，ZJ是自检要做判断 */
-			if (!order.equals("ZJ") && null != pageInfo.getList() && pageInfo.getList().size() > 0) {
-				for (DataKcglKcswDefault kcswobj : pageInfo.getList()) {
-					DataKcglFcbgzDefaultExample fcbgz_example = new DataKcglFcbgzDefaultExample();
-					DataKcglFcbgzDefaultExample.Criteria fcbgz_criteria = fcbgz_example.createCriteria();
-					fcbgz_criteria.andUnitidEqualTo(kcsw.getUnitid());
-					fcbgz_criteria.andChEqualTo(kcswobj.getCh());
-					fcbgz_criteria.andHwhEqualTo(kcswobj.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"));
-						kcswobj.setScnf(scnf);
-					}
-					/* 3、查询这个仓房的已验收数量和未验收数量 */
-					map.put("orgId", kcsw.getUnitid());
-					map.put("ch", kcswobj.getCh());
-					map.put("hwh", kcswobj.getHwh());
-					map.put("scnd", kcswobj.getScnf());
-					Map<String,Object> ysxx_map = kcswService.findNumManager(map);
-					double kcsl = kcswobj.getKcsl();
-					double rksl = Double.parseDouble(ysxx_map.get("rksl").toString());
-					rksl = rksl * 1000;
-					double wyssl = kcsl - rksl;
-					kcswobj.setRksl(rksl);
-					kcswobj.setWyssl(wyssl);
-				}
-			}
+			pageInfo = kcswService.queryYYSSL(pageNum, pageSize, kcswStr, order);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.java

@@ -90,7 +90,14 @@ public interface DataKcglKcswDefaultMapper {
     List<Map<String, Object>> getCrudeOilList(Map<String, Object> map);
 
     /**
-     * 查询已验收数量
+     * 查询验收类型和已验收数量
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> queryYYSSL(Map<String, Object> map);
+
+    /**
+     * 查询入库验收的已验收数量
      * 
      * @param map
      * @return
@@ -100,4 +107,5 @@ public interface DataKcglKcswDefaultMapper {
     List<DataKcglKcswDefault> findListOrRcsj(Map<String, Object> map);
 
     List<Map<String, Object>> findCondition(Map<String, Object> map);
+
 }

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

@@ -1514,7 +1514,26 @@
 		) datas
 		order by datas.rq desc
   </select>
-  
+  <!-- 查询已验收数量 -->
+  <select id="queryYYSSL" parameterType="java.util.Map" resultType="java.util.Map">
+	    select a.check_type_num checktype,a.rksl rksl,a.accept_date accept_date from depot:storage_grain_card a
+	    left join depot:basic_enum b on b.enumname=a.scnd and b.parentid=1004 
+	    where 1=1 
+	    <if test="orgId != null">
+		and a.org_id = #{orgId} 
+		</if>
+		<if test="ch != null">
+		and a.storehouse_id=#{ch} 
+		</if>
+		<if test="hwh != null">
+		and a.warehouse_id=#{hwh} 
+		</if>
+		<if test="scnd != null">
+		and b.enumid=#{scnd} 
+		</if>
+	    order by a.accept_date desc
+  </select>
+  <!-- 查询验收方式为入库验收的验收数量 -->
   <select id="findNumManager" parameterType="java.util.Map" resultType="java.util.Map">
 	    select nvl(sum(a.rksl), 0) rksl from depot:storage_grain_card a
 	    left join depot:basic_enum b on b.enumname=a.scnd and b.parentid=1004 

src/main/java/com/chinaitop/agile/service/KcswService.java

@@ -2,6 +2,7 @@ package com.chinaitop.agile.service;
 
 import com.chinaitop.agile.model.DataKcglKcswDefault;
 import com.chinaitop.agile.model.DataKcglKcswDefaultExample;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -107,4 +108,16 @@ public interface KcswService {
      * @return
      */
 	Map<String, Object> countByBlType(Integer orgId);
+
+	/**
+	 * 查询库存数量列表
+	 * 
+	 * @param pageNum
+	 * @param pageSize
+	 * @param kcswStr
+	 * @param order
+	 * @return
+	 * @throws Exception
+	 */
+	PageInfo<DataKcglKcswDefault> queryYYSSL(Integer pageNum, Integer pageSize, String kcswStr, String order) throws Exception;
 }

src/main/java/com/chinaitop/agile/service/impl/KcswServiceImpl.java

@@ -7,8 +7,12 @@ import com.chinaitop.agile.mapper.DataKcglKcswDefaultMapper;
 import com.chinaitop.agile.mapper.DataKcglXckcDefaultMapper;
 import com.chinaitop.agile.model.*;
 import com.chinaitop.agile.model.DataKcglKcswDefaultExample.Criteria;
+import com.chinaitop.agile.service.DataKcglFcbgzDefaultService;
 import com.chinaitop.agile.service.KcswService;
 import com.chinaitop.agile.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -29,6 +33,8 @@ public class KcswServiceImpl implements KcswService{
 	@Resource
 	private DataKcglFcbgzDefaultMapper dataKcglFcbgzDefaultMapper;
 	@Resource
+	private DataKcglFcbgzDefaultService fcbgzService;
+	@Resource
 	private BasicEnumFeignService basicEnumFeignService;
 
 	public Map<String, Object> queryByExample(Integer orgId) {
@@ -372,4 +378,93 @@ public class KcswServiceImpl implements KcswService{
 
 		return result_map;
 	}
+
+	@Override
+	public PageInfo<DataKcglKcswDefault> queryYYSSL(Integer pageNum, Integer pageSize, String kcswStr, String order)
+			throws Exception {
+		ObjectMapper mapper = new ObjectMapper();
+    	DataKcglKcswDefault kcsw = null;
+    	PageInfo<DataKcglKcswDefault> pageInfo = null;
+    	Map<String,Object> map = new HashMap<String,Object>();
+    	DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
+    	DataKcglKcswDefaultExample.Criteria criteria = example.createCriteria();
+
+    	if (null != kcswStr && !"".equals(kcswStr)) {
+			kcsw = mapper.readValue(kcswStr, DataKcglKcswDefault.class);
+		} else {
+			kcsw = new DataKcglKcswDefault();
+		}
+		/* 仓房 */
+		if (null != kcsw.getCh() && !"".equals(kcsw.getCh())) {
+			criteria.andChEqualTo(kcsw.getCh());
+		}
+		/* 货位 */
+		if (null != kcsw.getHwh() && !"".equals(kcsw.getHwh())) {
+			criteria.andHwhEqualTo(kcsw.getHwh());
+		}
+		/* 品种 */
+		if (null != kcsw.getPz() && !"".equals(kcsw.getPz())) {
+			criteria.andPzEqualTo(kcsw.getPz());
+		}
+		/* 单位 */
+		if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
+			criteria.andUnitidEqualTo(kcsw.getUnitid());
+		}
+		/* 归档用最后一次编辑时间 */
+		if (null != kcsw.getModifydate() && !"".equals(kcsw.getModifydate())) {
+			criteria.andModifydateLessThan(kcsw.getModifydate());
+		}
+
+		if(null != pageNum && null != pageSize){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		example.setOrderByClause(" to_number(ch) ");
+		/* 1、查询库存实物表数据 */
+		List<DataKcglKcswDefault> list = dataKcglKcswDefaultMapper.selectByExample(example);
+		pageInfo = new PageInfo<DataKcglKcswDefault>(list);
+
+		/* 2、查询对应仓房的生产年份，ZJ是自检要做判断 */
+		if (!order.equals("ZJ") && null != pageInfo.getList() && pageInfo.getList().size() > 0) {
+			for (DataKcglKcswDefault kcswobj : pageInfo.getList()) {
+				DataKcglFcbgzDefaultExample fcbgz_example = new DataKcglFcbgzDefaultExample();
+				DataKcglFcbgzDefaultExample.Criteria fcbgz_criteria = fcbgz_example.createCriteria();
+				fcbgz_criteria.andUnitidEqualTo(kcsw.getUnitid());
+				fcbgz_criteria.andChEqualTo(kcswobj.getCh());
+				fcbgz_criteria.andHwhEqualTo(kcswobj.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"));
+					kcswobj.setScnf(scnf);
+				}
+				/* 3、查询这个仓房的已验收数量和未验收数量 */
+				map.put("orgId", kcsw.getUnitid());
+				map.put("ch", kcswobj.getCh());
+				map.put("hwh", kcswobj.getHwh());
+				map.put("scnd", kcswobj.getScnf());
+				List<Map<String,Object>> map_list = dataKcglKcswDefaultMapper.queryYYSSL(map);
+				String checktype = "";
+				double rksl = 0d;
+				double wyssl = 0d;
+				if (null != map_list && map_list.size() > 0) {
+					checktype = map_list.get(0).get("checktype")+"";
+					if (!"0".equals(checktype)) {
+						rksl = Double.parseDouble(map_list.get(0).get("rksl").toString());
+					} else {
+						Map<String, Object> ysxx_map = dataKcglKcswDefaultMapper.findNumManager(map);
+						rksl = Double.parseDouble(ysxx_map.get("rksl")+"");
+					}
+				}
+				double kcsl = kcswobj.getKcsl();
+				rksl = rksl * 1000;
+				wyssl = kcsl - rksl;
+
+				kcswobj.setRksl(rksl);
+				kcswobj.setWyssl(wyssl);
+			}
+		}
+
+		return pageInfo;
+	}
 }