1

src/main/java/com/chinaitop/depot/keeperAccount/controller/StorageFcbgzController.java

@@ -75,12 +75,13 @@ public class StorageFcbgzController {
     	@ApiImplicitParam(name="ch", value="仓房ID", paramType="query"),
     	@ApiImplicitParam(name="hwh", value="货位ID", paramType="query"),
     	@ApiImplicitParam(name="lsxz", value="粮食性质ID", paramType="query"),
-    	@ApiImplicitParam(name="jznd", value="记账年度", paramType="query")
+    	@ApiImplicitParam(name="jznd", value="记账年度", paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或者成品粮(0:原粮,1:成品粮)", paramType="query")
     })
-	public Map<String, Object> queryJzList(Integer ch, Integer hwh, Integer lsxz, String jznd) {
+	public Map<String, Object> queryJzList(Integer ch, Integer hwh, Integer lsxz, String jznd, String ylorcpl) {
 		Map<String, Object> map = new HashMap<>();
 		try {
-			map = storageFcbgzService.queryJzList(ch, hwh, lsxz, jznd);
+			map = storageFcbgzService.queryJzList(ch, hwh, lsxz, jznd, ylorcpl);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
@@ -136,12 +137,13 @@ public class StorageFcbgzController {
 			@ApiImplicitParam(name = "lsxz", value = "粮食性质", required=true, paramType = "query"),
 			@ApiImplicitParam(name = "jznd", value = "记账年度", required=true, paramType = "query"),
 			@ApiImplicitParam(name = "orgName", value = "粮库名称", required=true, paramType = "query"),
-			@ApiImplicitParam(name = "cfhwmc", value = "仓房货位名称", required=true, paramType = "query")
+			@ApiImplicitParam(name = "cfhwmc", value = "仓房货位名称", required=true, paramType = "query"),
+			@ApiImplicitParam(name="ylorcpl", value="原粮或者成品粮(0:原粮,1:成品粮)", paramType="query")
 	})
 	public void  exportFcbgz(HttpServletResponse response,HttpServletRequest request,
-										 Integer ch, Integer hwh, Integer lsxz, String jznd, String orgName, String cfhwmc){
+										 Integer ch, Integer hwh, Integer lsxz, String jznd, String orgName, String cfhwmc, String ylorcpl){
 		try {
-			HSSFWorkbook workbook = storageFcbgzService.exportFcbgz(ch, hwh, lsxz, jznd, orgName, cfhwmc);
+			HSSFWorkbook workbook = storageFcbgzService.exportFcbgz(ch, hwh, lsxz, jznd, orgName, cfhwmc, ylorcpl);
 			String fileName = "分仓保管账报表";
 			// 获取输出流
 			OutputStream os = response.getOutputStream();

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageBgzzMapper.xml

@@ -27,6 +27,7 @@
     <result column="ywlx" jdbcType="VARCHAR" property="ywlx" />
     <result column="cjsj" jdbcType="TIMESTAMP" property="cjsj" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="ylorcpl" jdbcType="VARCHAR" property="ylorcpl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -89,7 +90,7 @@
   <sql id="Base_Column_List">
     id, org_id, jznd, jzyf, jzzy, lyxz, xm_zcsl, xm_srsl, xm_kcsl, dg_zcsl, dg_srsl, 
     dg_kcsl, ddyy_zcsl, ddyy_srsl, ddyy_kcsl, xj, jzr, jzsj, shr, shsj, data_status, 
-    data_type, ywlx, cjsj, updatetime
+    data_type, ywlx, cjsj, updatetime, ylorcpl
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.keeperAccount.model.StorageBgzzExample" resultMap="BaseResultMap">
     select
@@ -129,7 +130,7 @@
       ddyy_srsl, ddyy_kcsl, xj, 
       jzr, jzsj, shr, shsj, 
       data_status, data_type, ywlx, 
-      cjsj, updatetime)
+      cjsj, updatetime, ylorcpl)
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{jznd,jdbcType=VARCHAR}, 
       #{jzyf,jdbcType=VARCHAR}, #{jzzy,jdbcType=VARCHAR}, #{lyxz,jdbcType=INTEGER}, #{xmZcsl,jdbcType=DECIMAL}, 
       #{xmSrsl,jdbcType=DECIMAL}, #{xmKcsl,jdbcType=DECIMAL}, #{dgZcsl,jdbcType=DECIMAL}, 
@@ -137,7 +138,7 @@
       #{ddyySrsl,jdbcType=DECIMAL}, #{ddyyKcsl,jdbcType=DECIMAL}, #{xj,jdbcType=DECIMAL}, 
       #{jzr,jdbcType=VARCHAR}, #{jzsj,jdbcType=TIMESTAMP}, #{shr,jdbcType=VARCHAR}, #{shsj,jdbcType=TIMESTAMP}, 
       #{dataStatus,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, 
-      #{cjsj,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP})
+      #{cjsj,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}, #{ylorcpl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.keeperAccount.model.StorageBgzz">
     insert into storage_bgzz
@@ -217,6 +218,9 @@
       <if test="updatetime != null">
         updatetime,
       </if>
+      <if test="ylorcpl != null">
+        ylorcpl,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -294,6 +298,9 @@
       <if test="updatetime != null">
         #{updatetime,jdbcType=TIMESTAMP},
       </if>
+      <if test="ylorcpl != null">
+        #{ylorcpl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.keeperAccount.model.StorageBgzzExample" resultType="java.lang.Integer">
@@ -380,6 +387,9 @@
       <if test="record.updatetime != null">
         updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.ylorcpl != null">
+        ylorcpl = #{record.ylorcpl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -411,7 +421,8 @@
       data_type = #{record.dataType,jdbcType=VARCHAR},
       ywlx = #{record.ywlx,jdbcType=VARCHAR},
       cjsj = #{record.cjsj,jdbcType=TIMESTAMP},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      ylorcpl = #{record.ylorcpl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -491,6 +502,9 @@
       <if test="updatetime != null">
         updatetime = #{updatetime,jdbcType=TIMESTAMP},
       </if>
+      <if test="ylorcpl != null">
+        ylorcpl = #{ylorcpl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -519,7 +533,8 @@
       data_type = #{dataType,jdbcType=VARCHAR},
       ywlx = #{ywlx,jdbcType=VARCHAR},
       cjsj = #{cjsj,jdbcType=TIMESTAMP},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      ylorcpl = #{ylorcpl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <!-- 查询一种摘要在某个月的库存数量 -->
@@ -586,6 +601,7 @@
 	    and org_id=#{orgId,jdbcType=INTEGER}
 	    and lyxz=#{lyxz,jdbcType=INTEGER}
 	    and jznd=#{jznd,jdbcType=VARCHAR}
+	    and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
 	    group by org_id,jznd,lyxz
 	) a 
 	left join (
@@ -597,6 +613,7 @@
 	    and org_id=#{orgId,jdbcType=INTEGER}
 	    and lyxz=#{lyxz,jdbcType=INTEGER}
 	    and jznd=#{jznd,jdbcType=VARCHAR}
+	    and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
 	) b on b.jznd=a.jznd and b.org_id=a.org_id
 	left join (
 	    select 
@@ -606,6 +623,7 @@
 	    and org_id=#{orgId,jdbcType=INTEGER}
 	    and lyxz=#{lyxz,jdbcType=INTEGER}
 	    and jznd=#{jznd,jdbcType=VARCHAR}
+	    and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
 	) c on c.org_id=a.org_id and c.jznd=a.jznd
 	left join (
 	    select 
@@ -616,6 +634,7 @@
 	    and org_id=#{orgId,jdbcType=INTEGER}
 	    and lyxz=#{lyxz,jdbcType=INTEGER}
 	    and jznd=#{jznd,jdbcType=VARCHAR}
+	    and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
 	    group by org_id,jznd,lyxz
 	) d on d.org_id=a.org_id and d.jznd=a.jznd
   </select>

src/main/java/com/chinaitop/depot/keeperAccount/model/StorageBgzz.java

@@ -93,4 +93,7 @@ public class StorageBgzz {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updatetime;
 
+	@ApiModelProperty(value = "原粮或成品粮(0:原粮,1:成品粮)")
+	private String ylorcpl;
+
 }

src/main/java/com/chinaitop/depot/keeperAccount/model/StorageBgzzExample.java

@@ -1707,6 +1707,11 @@ public class StorageBgzzExample {
             addCriterion("updatetime not between", value1, value2, "updatetime");
             return (Criteria) this;
         }
+
+        public Criteria andYlorcplEqualTo(String value) {
+        	addCriterion("ylorcpl =", value, "ylorcpl");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/chinaitop/depot/keeperAccount/service/StorageFcbgzService.java

@@ -48,10 +48,10 @@ public interface StorageFcbgzService {
 	 * @param hwh 货位ID
 	 * @param lsxz 粮食性质
 	 * @param jznd 记账年度
-	 * @param dataType 数据类型(0:普通账,1:合计账,2:结转账)
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 */
-	Map<String, Object> queryJzList(Integer ch, Integer hwh, Integer lsxz, String jznd) throws Exception;
+	Map<String, Object> queryJzList(Integer ch, Integer hwh, Integer lsxz, String jznd, String ylorcpl) throws Exception;
 
 	/**
 	 * 分仓保管账记账保存
@@ -84,10 +84,11 @@ public interface StorageFcbgzService {
 	 * @param jznd 记账年度
 	 * @param orgName 粮库名称
 	 * @param cfhwmc 仓房货位名称
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 * @throws Exception
 	 */
-	HSSFWorkbook exportFcbgz(Integer ch, Integer hwh, Integer lsxz, String jznd, String orgName, String cfhwmc) throws Exception;
+	HSSFWorkbook exportFcbgz(Integer ch, Integer hwh, Integer lsxz, String jznd, String orgName, String cfhwmc, String ylorcpl) throws Exception;
 
 	/**
 	 * 保管总账查询明细

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/BgzzUtilsServiceImpl.java

@@ -24,6 +24,7 @@ public class BgzzUtilsServiceImpl {
 		criteria.andOrgIdEqualTo(Integer.parseInt(fcbgz.getOrgId()));
 		criteria.andDataTypeEqualTo(dataType);
 		criteria.andJzndEqualTo(fcbgz.getJznd());
+		criteria.andYlorcplEqualTo(fcbgz.getYlorcpl());
 		if ("0".equals(fcbgz.getJznd())) {
 			criteria.andJzyfEqualTo(fcbgz.getSjfm());
 		}

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/FcbgzUtilsServiceImpl.java

@@ -183,10 +183,11 @@ public class FcbgzUtilsServiceImpl {
 	 * @param jznd 记账年度
 	 * @param sjfm 数据说明
 	 * @param dataType
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 * @throws Exception
 	 */
-	public List<StorageFcbgz> getList(String order, Integer ch, Integer hwh, Integer lspz, Integer lsxz, String jznd, String sjfm, String dataType)  throws Exception {
+	public List<StorageFcbgz> getList(String order, Integer ch, Integer hwh, Integer lspz, Integer lsxz, String jznd, String sjfm, String dataType, String ylorcpl)  throws Exception {
 
 		StorageFcbgzExample example = new StorageFcbgzExample();
 		StorageFcbgzExample.Criteria criteria = example.createCriteria();
@@ -214,6 +215,9 @@ public class FcbgzUtilsServiceImpl {
 		if (StringUtils.isNotBlank(dataType)) {
 			criteria.andDataTypeEqualTo(dataType);
 		}
+		if (StringUtils.isNotBlank(ylorcpl)) {
+			criteria.andYlorcplEqualTo(ylorcpl);
+		}
 		List<StorageFcbgz> list = storageFcbgzMapper.selectByExample(example);
 
 		return list;

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageBgzzServiceImpl.java

@@ -51,6 +51,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		criteria.andJzyfEqualTo(fcbgz.getSjfm());
 		criteria.andLyxzEqualTo(fcbgz.getLyxz());
 		criteria.andYwlxEqualTo(fcbgz.getYwlx());
+		criteria.andYlorcplEqualTo(fcbgz.getYlorcpl());
 		List<StorageBgzz> list = storageBgzzMapper.selectByExample(example);
 		StorageBgzz storageBgzz = null;
 		if (null != list && list.size() > 0) {//修改
@@ -70,6 +71,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		criteria.andYwlxEqualTo(fcbgz.getYwlx());
 		criteria.andJzzyEqualTo(fcbgz.getJzzy());
 		criteria.andOrgIdEqualTo(Integer.parseInt(fcbgz.getOrgId()));
+		criteria.andYlorcplEqualTo(fcbgz.getYlorcpl());
 		List<StorageBgzz> list = storageBgzzMapper.selectByExample(example);
 		StorageBgzz storageBgzz = null;
 		String lspz = fcbgz.getPz().toString();
@@ -77,7 +79,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 			storageBgzz = list.get(0);
 			StorageBgzz hzz_storageBgzz = queryBgzzDataType1(fcbgz);//查询合计行的库存数量
 			//收入差=收入数量-支出数量
-			BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
+			//BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
 			if ("3164".equals(lspz)) {//小麦
 				BigDecimal srsl = fcbgz.getSrsl().add(storageBgzz.getXmSrsl()).setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setXmSrsl(srsl);
@@ -171,7 +173,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setDdyyZcsl(val);
 				storageBgzz.setDdyyKcsl(val);
 			}
-			
+
 			BigDecimal xj = storageBgzz.getXmKcsl().add(storageBgzz.getDgKcsl()).add(storageBgzz.getDdyyKcsl()).setScale(3, BigDecimal.ROUND_DOWN);
 			storageBgzz.setXj(xj);
 			storageBgzz.setCjsj(new Date());
@@ -196,6 +198,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		criteria.andJzyfEqualTo(fcbgz.getSjfm());
 		criteria.andLyxzEqualTo(fcbgz.getLyxz());
 		criteria.andYwlxEqualTo(fcbgz.getYwlx());
+		criteria.andYlorcplEqualTo(fcbgz.getYlorcpl());
 		List<StorageBgzz> list = storageBgzzMapper.selectByExample(example);
 		StorageBgzz storageBgzz = null;
 		String lspz = fcbgz.getPz().toString();
@@ -203,7 +206,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 			storageBgzz = list.get(0);
 
 			//查询这一年这个月的普通账数据
-			List<StorageBgzz> ydlist = bgzzUtilsServiceImpl.findConditionJzyf(fcbgz, StorageFcbgzUtils.DATA_TYPE_0);
+			//List<StorageBgzz> ydlist = bgzzUtilsServiceImpl.findConditionJzyf(fcbgz, StorageFcbgzUtils.DATA_TYPE_0);
 			if ("3164".equals(lspz)) {//小麦
 				storageBgzz.setXmSrsl(storageBgzz.getXmSrsl().add(fcbgz.getSrsl()).setScale(3, BigDecimal.ROUND_DOWN));
 				storageBgzz.setXmZcsl(storageBgzz.getXmZcsl().add(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN));
@@ -292,6 +295,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		criteria.andJzndEqualTo(fcbgz.getJznd());
 		criteria.andLyxzEqualTo(fcbgz.getLyxz());
 		criteria.andYwlxEqualTo(fcbgz.getYwlx());
+		criteria.andYlorcplEqualTo(fcbgz.getYlorcpl());
 		List<StorageBgzz> list = storageBgzzMapper.selectByExample(example);
 		StorageBgzz storageBgzz = null;
 		String lspz = fcbgz.getPz().toString();

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageFcbgzServiceImpl.java

@@ -150,7 +150,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 	}
 
 	@Override
-	public Map<String, Object> queryJzList(Integer ch, Integer hwh, Integer lsxz, String jznd) throws Exception {
+	public Map<String, Object> queryJzList(Integer ch, Integer hwh, Integer lsxz, String jznd, String ylorcpl) throws Exception {
 
 		Map<String, Object> map = new HashMap<>();
 
@@ -162,7 +162,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		
 		/** 先查上一年的结转数据  start  **/
 		Integer top_year = Integer.parseInt(jznd)-1;
-		List<StorageFcbgz> top_year_jz_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, null, top_year.toString(), null, StorageFcbgzUtils.DATA_TYPE_2);
+		List<StorageFcbgz> top_year_jz_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, null, top_year.toString(), null, StorageFcbgzUtils.DATA_TYPE_2, ylorcpl);
 		StorageFcbgz top_year_jz = null;
 		if (null != top_year_jz_list && top_year_jz_list.size() > 0) {
 			top_year_jz = top_year_jz_list.get(0);
@@ -187,13 +187,13 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		for (int i = 0; i < 12; i++) {
 			//从1-12月依次查， 先查每月的明细
 			String jzrq = jznd+"-"+String.format("%02d", i+1).trim();
-			jznd_month_jz_list = fcbgzUtilsServiceImpl.getList("last_business_date", ch, hwh, null, lsxz, jznd, jzrq, StorageFcbgzUtils.DATA_TYPE_0);
+			jznd_month_jz_list = fcbgzUtilsServiceImpl.getList("last_business_date", ch, hwh, null, lsxz, jznd, jzrq, StorageFcbgzUtils.DATA_TYPE_0, ylorcpl);
 			if (null != jznd_month_jz_list && jznd_month_jz_list.size() > 0) {
 				for (StorageFcbgz f_day : jznd_month_jz_list) {
 					list.add(f_day);
 				}
 				//查询这个月的合计数据
-				jznd_month_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, jzrq, StorageFcbgzUtils.DATA_TYPE_1);
+				jznd_month_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, jzrq, StorageFcbgzUtils.DATA_TYPE_1, ylorcpl);
 				if (null != jznd_month_jz_sum_list && jznd_month_jz_sum_list.size() > 0) {
 					list.add(jznd_month_jz_sum_list.get(0));
 				}
@@ -206,7 +206,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 
 
 		/** 查[jznd]年的年合计数据  start  **/
-		List<StorageFcbgz> jznd_year_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, null, StorageFcbgzUtils.DATA_TYPE_2); //[jznd]年的合计
+		List<StorageFcbgz> jznd_year_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, null, StorageFcbgzUtils.DATA_TYPE_2, ylorcpl); //[jznd]年的合计
 		if (null != jznd_year_jz_sum_list && jznd_year_jz_sum_list.size() > 0) {
 			year_jz_obj = jznd_year_jz_sum_list.get(0);
 			list.add(year_jz_obj);
@@ -302,9 +302,9 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public HSSFWorkbook exportFcbgz(Integer ch, Integer hwh, Integer lsxz, String jznd, String orgName, String cfhwmc) throws Exception {
+	public HSSFWorkbook exportFcbgz(Integer ch, Integer hwh, Integer lsxz, String jznd, String orgName, String cfhwmc, String ylorcpl) throws Exception {
 
-		Map<String,Object> map = queryJzList(ch, hwh, lsxz, jznd);
+		Map<String,Object> map = queryJzList(ch, hwh, lsxz, jznd, ylorcpl);
 		List<StorageFcbgz> list = (List<StorageFcbgz>) map.get("list");
 		
 		HSSFWorkbook wb = new HSSFWorkbook();

src/main/java/com/chinaitop/depot/profitlossStatement/service/impl/StorageProfitlossStatementServiceImpl.java

@@ -522,6 +522,10 @@ public class StorageProfitlossStatementServiceImpl implements StorageProfitlossS
             			 if (StringUtils.isNotBlank(profitlossStatemnt.getCksj().toString())) {
             				 profitlossStatemnt.setCksj_str(ParameterUtil.datetime2string(profitlossStatemnt.getCksj()));
             			 }
+            			 //货位为空，说明是油罐
+            			 if (null == profitlossStatemnt.getHwid()) {
+            				 profitlossStatemnt.setHwid(Integer.parseInt(profitlossStatemnt.getCforyg()));
+            			 }
 
             			 //获取保管员
             			 String keepName = storageProfitlossStatementMapper.getkeepName(storageProfitlossStatement.getCforyg());