1

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

@@ -48,10 +48,11 @@ public class StorageFcbgzController {
     	@ApiImplicitParam(name="jznd", value="记账年度", paramType="query"),
     	@ApiImplicitParam(name="dataStatus", value="是否记账(0:已记账,1:未记账)", paramType="query"),
     	@ApiImplicitParam(name="sfjz", value="是否结转(0:是,1:否)", paramType="query"),
-    	@ApiImplicitParam(name="orgId", value="库ID", paramType="query")
+    	@ApiImplicitParam(name="orgId", value="库ID", paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或者成品粮(0:原粮,1:成品粮)", paramType="query")
     })
 	public PageInfo<StorageFcbgz> getListFcbgz(Integer pageNum, Integer pageSize, 
-			Integer lspz, Integer lsxz, String jznd, String dataStatus, String sfjz, Integer orgId) {
+			Integer lspz, Integer lsxz, String jznd, String dataStatus, String sfjz, Integer orgId, String ylorcpl) {
 
 		List<StorageFcbgz> list = null;
 
@@ -59,7 +60,7 @@ public class StorageFcbgzController {
 			if (pageNum!=null && pageSize!=null) {
 				PageHelper.startPage(pageNum, pageSize);
 			}
-			list = storageFcbgzService.selectFcbgzList(lspz, lsxz, jznd, dataStatus, sfjz, orgId);
+			list = storageFcbgzService.selectFcbgzList(lspz, lsxz, jznd, dataStatus, sfjz, orgId, ylorcpl);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
@@ -162,9 +163,11 @@ public class StorageFcbgzController {
 		}
 	}
 
-	@Scheduled(cron = "00 00 23 * * ?")
+	//@Scheduled(cron = "00 00 23 * * ?")//每天23点执行一次
+	//每个小时执行一次
+	@Scheduled(cron = "0 0 * * * ?")
 	@RequestMapping(value="/timedGenerationFcbgzSclData", method = RequestMethod.GET)
-	@ApiOperation(value="定时生成省级储备粮分仓保管账数据", notes = "每天23点执行一次")
+	@ApiOperation(value="定时生成原粮省级储备粮分仓保管账数据", notes = "每个小时执行一次")
 	public void timedGenerationFcbgzSclData() {
 		try {
 			storageFcbgzService.timedGenerationFcbgzData(null, "6877", null, "0");
@@ -174,9 +177,11 @@ public class StorageFcbgzController {
 		System.out.println("结束了");
 	}
 
-	@Scheduled(cron = "0 15 23 * * ?")
+	//@Scheduled(cron = "0 15 23 * * ?")//每天23点15执行一次
+	//每小时的第15分钟0秒触发一次任务‌。
+	@Scheduled(cron = "0 15 * * * ?")
 	@RequestMapping(value="/timedGenerationFcbgzSplData", method = RequestMethod.GET)
-	@ApiOperation(value="定时生成商品粮分仓保管账数据", notes = "每天23点15执行一次")
+	@ApiOperation(value="定时生成原粮商品粮分仓保管账数据", notes = "每小时的第15分钟0秒触发一次")
 	public void timedGenerationFcbgzSplData() {
 		try {
 			storageFcbgzService.timedGenerationFcbgzData(null, "3052", null, "0");
@@ -186,8 +191,22 @@ public class StorageFcbgzController {
 		System.out.println("结束了");
 	}
 
+	//@Scheduled(cron = "00 00 23 * * ?")//每天23点执行一次
+	//每个小时执行一次
+	@Scheduled(cron = "0 0 * * * ?")
+	@RequestMapping(value="/timedGenerationCplFcbgzData", method = RequestMethod.GET)
+	@ApiOperation(value="定时生成原粮省级储备粮分仓保管账数据", notes = "每个小时执行一次")
+	public void timedGenerationCplFcbgzSclData() {
+		try {
+			storageFcbgzService.timedGenerationCplFcbgzData(null, "6877", null, "1");
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+		}
+		System.out.println("结束了");
+	}
+
 	@RequestMapping(value="/timedGenerationFcbgzData_test", method = RequestMethod.GET)
-	@ApiOperation(value="定时生成保管账数据_手动生成接口", notes = "")
+	@ApiOperation(value="定时生成原粮保管账数据_手动生成接口", notes = "")
 	@ApiImplicitParams({
     	@ApiImplicitParam(name="orgId", value="库ID", paramType="query"),
     	@ApiImplicitParam(name="hwxz", value="粮食性质", paramType="query"),
@@ -202,6 +221,23 @@ public class StorageFcbgzController {
 		}
 		System.out.println("结束了");
 	}
+	
+	@RequestMapping(value="/timedGenerationCplFcbgzData_test", method = RequestMethod.GET)
+	@ApiOperation(value="定时生成成品粮保管账数据_手动生成接口", notes = "")
+	@ApiImplicitParams({
+    	@ApiImplicitParam(name="orgId", value="库ID", paramType="query"),
+    	@ApiImplicitParam(name="hwxz", value="粮食性质", paramType="query"),
+    	@ApiImplicitParam(name="rqs", value="记账日期", paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或者成品粮(0:原粮,1:成品粮)", paramType="query")
+    })
+	public void timedGenerationCplFcbgzData_test(String orgId, String hwxz, String rqs, String ylorcpl) {
+		try {
+			storageFcbgzService.timedGenerationCplFcbgzData(orgId, hwxz, rqs, ylorcpl);
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+		}
+		System.out.println("结束了");
+	}
 
 	@RequestMapping(value="/createHwsnjzData", method = RequestMethod.GET)
 	@ApiOperation(value="手动生成一个货位的上年结转数据数据", notes = "")
@@ -210,9 +246,10 @@ public class StorageFcbgzController {
 		@ApiImplicitParam(name="ch", value="仓房ID", paramType="query"),
     	@ApiImplicitParam(name="hwh", value="货位ID", paramType="query"),
     	@ApiImplicitParam(name="jznd", value="记账年度", paramType="query"),
-    	@ApiImplicitParam(name="lsxz", value="粮食性质", paramType="query")
+    	@ApiImplicitParam(name="lsxz", value="粮食性质", paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或者成品粮(0:原粮,1:成品粮)", paramType="query")
     })
-	public void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz) {
-		storageFcbgzService.createHwsnjzData(orgId, ch, hwh, jznd, lsxz);
+	public void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz, String ylorcpl) {
+		storageFcbgzService.createHwsnjzData(orgId, ch, hwh, jznd, lsxz, ylorcpl);
 	}
 }

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageFcbgzMapper.java

@@ -43,6 +43,13 @@ public interface StorageFcbgzMapper {
      * @return
      */
 	List<StorageFcbgz> queryCrkFcbgzGroupBySplData(Map<String, Object> map);
+	
+	/**
+     * 根据成品粮分仓保管账表数据分组统计查询成品粮的省储粮数据
+     * @param map
+     * @return
+     */
+	List<StorageFcbgz> queryCplFcbgzGroupByCblData(Map<String, Object> map);
 
 	/**
 	 * 新版分仓保管账查询列表

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

@@ -685,6 +685,9 @@
 	        <if test="jznd != null">
 	        and jznd=#{jznd,jdbcType=VARCHAR}
 	        </if>
+	        <if test="ylorcpl != null">
+	        and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
+	        </if>
 	    ) datas 
 	    where datas.rank=1
 	) a
@@ -708,6 +711,9 @@
         <if test="jznd != null">
         and jznd=#{jznd,jdbcType=VARCHAR}
         </if>
+        <if test="ylorcpl != null">
+        and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
+        </if>
 	    group by org_id, ch, hwh, pz, mxpz, lyxz, jznd
 	) b on b.hwh=a.hwh and b.mxpz=a.mxpz and b.lyxz=a.lyxz and b.jznd=a.jznd
 	left join (
@@ -726,6 +732,9 @@
         <if test="lyxz != null">
         and lyxz=#{lyxz,jdbcType=INTEGER}
         </if>
+        <if test="ylorcpl != null">
+        and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
+        </if>
 	) c on c.hwh=a.hwh and c.jznd=a.jznd
 	where 1=1 
 	<if test="sfjz==1">
@@ -845,4 +854,71 @@
 	where b.rqs=a.rqs and b.mxpz=a.mxpz and b.org_id=a.org_id and b.cazylx=a.cazylx and b.lchjbm=a.lchjbm
 	order by b.rq
   </select>
+  
+  <!-- 根据成品粮分仓保管账表数据分组统计查询成品粮的省储粮数据 -->
+  <select id="queryCplFcbgzGroupByCblData" parameterType="java.util.Map" resultMap="BaseResultMap">
+    select 
+	    a.jzrq, 
+	    case 
+	      when a.zylx='0' then 'RK'||replace(a.jzrq, '-', '')||c.storehouse_code||case when c.datatype='0' then d.warehouse_code else '01' end ||'001'
+	      when a.zylx='1' then 'CK'||replace(a.jzrq, '-', '')||c.storehouse_code||case when c.datatype='0' then d.warehouse_code else '01' end ||'001'
+	      else 'null'
+	    end jzpz,
+	    case 
+	      when a.zylx='0' then '入库'
+	      when a.zylx='1' then '出库'
+	      else 'null'
+	    end jzzy,
+	    a.hwxz lyxz, 
+	    a.pz pz,
+	    a.mxpz mxpz,
+	    a.zcsl,
+	    a.srsl,
+	    b.kcsl kcsl,
+	    a.org_id, a.ch, a.hwh, substr(a.jzrq, 1, 4) jznd,
+	    '0' data_type,
+	    '1' data_status,
+	    '0' ywlx,
+	    b.rq last_business_date
+    from (
+	    select 
+	        org_id, house_id ch, warehouse_id hwh, lspz pz, lsmxpz mxpz, lsxz hwxz, rqs jzrq, zylx,
+	        sum(srsl) srsl, sum(zcsl) zcsl
+	    from depot_yw_cpl_fcbgz_view_model 
+	    where 1=1 
+	    <if test="orgId != null">
+	    and org_id=#{orgId, jdbcType=VARCHAR}
+	    </if>
+	    <if test="hwxz != null">
+	    and lsxz=#{hwxz, jdbcType=VARCHAR}
+	    </if>
+	    <if test="rqs != null">
+	    and rqs=#{rqs, jdbcType=VARCHAR}
+	    </if>
+	    group by org_id, house_id, warehouse_id, lspz, lsmxpz, lsxz, rqs, zylx
+	) a
+	inner join (
+	    select f.* from (
+	        select 
+	            id, org_id, house_id ch, warehouse_id hwh, lsxz, lspz, lsmxpz mxpz, rqs, zylx, kcsl, rq,
+	            Row_Number() OVER (partition by org_id,house_id,warehouse_id,lsxz,lspz,lsmxpz,rqs,zylx order by rq desc) rank 
+	        from depot_yw_cpl_fcbgz_view_model 
+	        where 1=1 
+	        <if test="orgId != null">
+		    and org_id=#{orgId, jdbcType=VARCHAR}
+		    </if>
+		    <if test="hwxz != null">
+		    and lsxz=#{hwxz, jdbcType=VARCHAR}
+		    </if>
+		    <if test="rqs != null">
+		    and rqs=#{rqs, jdbcType=VARCHAR}
+		    </if>
+	    ) as f 
+	    where 1=1 and f.rank=1
+	) b on b.hwh=a.hwh
+	left join basic_storehouse c on c.storehouse_id=a.ch
+	left join basic_warehouse d on d.warehouse_id=a.hwh
+	where b.rqs=a.jzrq and b.mxpz=a.mxpz and b.org_id=a.org_id and b.zylx=a.zylx
+	order by b.rq
+  </select>
 </mapper>

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

@@ -14,12 +14,22 @@ public interface StorageFcbgzService {
 	 * @param orgId 粮库ID
 	 * @param hwxz 粮食性质
 	 * @param rqs 执行日期
-	 * @param ylorcpl 
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @throws Exception
 	 */
 	void timedGenerationFcbgzData(String orgId, String hwxz, String rqs, String ylorcpl) throws Exception;
 
 	/**
+	 * 定时生成成品粮分仓保管账数据
+	 * @param orgId 粮库ID
+	 * @param hwxz 粮食性质
+	 * @param rqs 执行日期
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
+	 * @throws Exception
+	 */
+	void timedGenerationCplFcbgzData(String orgId, String hwxz, String rqs, String ylorcpl) throws Exception;
+
+	/**
 	 * 分仓保管账查询列表
 	 * @param lspz 品种
 	 * @param lsxz 性质
@@ -27,9 +37,10 @@ public interface StorageFcbgzService {
 	 * @param dataStatus 是否记账(0:已记账,1:未记账)
 	 * @param sfjz 是否结转(0:是,1:否)
 	 * @param orgId 库ID
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 */
-	List<StorageFcbgz> selectFcbgzList(Integer lspz, Integer lsxz, String jznd, String dataStatus, String sfjz, Integer orgId) throws Exception;
+	List<StorageFcbgz> selectFcbgzList(Integer lspz, Integer lsxz, String jznd, String dataStatus, String sfjz, Integer orgId, String ylorcpl) throws Exception;
 
 	/**
 	 * 点记账
@@ -97,6 +108,8 @@ public interface StorageFcbgzService {
 	 * @param hwh
 	 * @param jznd
 	 * @param lsxz
+	 * @param ylorcpl 原粮或者成品粮(0:原粮,1:成品粮)
 	 */
-	void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz);
+	void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz, String ylorcpl);
+
 }

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

@@ -57,6 +57,7 @@ public class FcbgzUtilsServiceImpl {
 	public void saveOrUpdateHjz(StorageFcbgz f, String dataType)  throws Exception {
 		StorageFcbgzExample example = new StorageFcbgzExample();
 		StorageFcbgzExample.Criteria criteria = example.createCriteria();
+		criteria.andChEqualTo(f.getCh());//仓房号
 		criteria.andHwhEqualTo(f.getHwh());//货位
 		criteria.andDataTypeEqualTo(dataType);//数据类型
 		criteria.andLyxzEqualTo(f.getLyxz());//粮食性质
@@ -71,22 +72,34 @@ public class FcbgzUtilsServiceImpl {
 		StorageFcbgz sf = null;
 		if (null != list && list.size() > 0) {
 			sf = list.get(0);
+			
+			List<StorageFcbgz> this_list = null;
+			if (StorageFcbgzUtils.DATA_TYPE_1.equals(dataType)) {
+				//查询这个月这个仓房货位这个性质的所有普通账数据
+				this_list = getOldStorageFcbgzList(null, null, f.getCh(), f.getHwh(), f.getMxpz(), f.getLyxz(), f.getJznd(), ParameterUtil.date2string1(f.getJzrq()).substring(0, 7), StorageFcbgzUtils.DATA_TYPE_0);
+			}
+			if (StorageFcbgzUtils.DATA_TYPE_2.equals(dataType)) {
+				//查询这个仓房货位这个性质的所有月合计账数据
+				this_list = getOldStorageFcbgzList(null, null, f.getCh(), f.getHwh(), null, f.getLyxz(), f.getJznd(), null, StorageFcbgzUtils.DATA_TYPE_1);
+			}
 
 			//收入数量
-			BigDecimal srsl = f.getSrsl().add(sf.getSrsl()).setScale(3, BigDecimal.ROUND_DOWN);
+			BigDecimal srsl = this_list.stream().map(StorageFcbgz::getSrsl).reduce(BigDecimal.ZERO, BigDecimal::add);
 			sf.setSrsl(srsl);
 
 			//支出数量
-			BigDecimal zcsl = f.getZcsl().add(sf.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
+			BigDecimal zcsl = this_list.stream().map(StorageFcbgz::getZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
 			sf.setZcsl(zcsl);
 
-			//损耗数量
-			BigDecimal shsl = f.getShsl().add(sf.getShsl()).setScale(3, BigDecimal.ROUND_DOWN);
-			sf.setShsl(shsl);
-
-			//溢余数量
-			BigDecimal yysl = f.getYysl().add(sf.getYysl()).setScale(3, BigDecimal.ROUND_DOWN);
-			sf.setYysl(yysl);
+			if ("0".equals(f.getYlorcpl())) {
+				//损耗数量
+				BigDecimal shsl = this_list.stream().map(StorageFcbgz::getShsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				sf.setShsl(shsl);
+				
+				//溢余数量
+				BigDecimal yysl = this_list.stream().map(StorageFcbgz::getYysl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				sf.setYysl(yysl);
+			}
 
 			//库存数量
 			sf.setKcsl(f.getKcsl());
@@ -111,12 +124,63 @@ public class FcbgzUtilsServiceImpl {
 	}
 
 	/**
-	 * 查询集合
-	 * @param order 排序方式
+	 * 查询已经生成的分仓保管账数据
+	 * @param jzpz
+	 * @param jzzy
+	 * @param ch
 	 * @param hwh
 	 * @param lspz
 	 * @param lsxz
 	 * @param jznd
+	 * @param sjfm
+	 * @param dataType
+	 * @return
+	 * @throws Exception
+	 */
+	public List<StorageFcbgz> getOldStorageFcbgzList(String jzpz, String jzzy, Integer ch, Integer hwh, Integer lspz, Integer lsxz, String jznd, String sjfm, String dataType) throws Exception {
+		StorageFcbgzExample example = new StorageFcbgzExample();
+		StorageFcbgzExample.Criteria criteria = example.createCriteria();
+		if (StringUtils.isNotBlank(jzpz)) {
+			criteria.andJzpzEqualTo(jzpz);
+		}
+		if (StringUtils.isNotBlank(jzzy)) {
+			criteria.andJzzyEqualTo(jzzy);
+		}
+		if (null != ch) {
+			criteria.andChEqualTo(ch);
+		}
+		if (null != hwh) {
+			criteria.andHwhEqualTo(hwh);
+		}
+		if (null != lspz) {
+			criteria.andMxpzEqualTo(lspz);
+		}
+		if (null != lsxz) {
+			criteria.andLyxzEqualTo(lsxz);
+		}
+		if (StringUtils.isNotBlank(jznd)) {
+			criteria.andJzndEqualTo(jznd);
+		}
+		if (StringUtils.isNotBlank(sjfm)) {
+			criteria.andSjfmEqualTo(sjfm);
+		}
+		if (StringUtils.isNotBlank(dataType)) {
+			criteria.andDataTypeEqualTo(dataType);
+		}
+		example.setOrderByClause("cjsj desc");
+		List<StorageFcbgz> list = storageFcbgzMapper.selectByExample(example);
+
+		return list;
+	}
+
+	/**
+	 * 查询集合
+	 * @param order 排序方式
+	 * @param ch 仓房
+	 * @param hwh 货位
+	 * @param lspz 明细品种
+	 * @param lsxz 粮食性质
+	 * @param jznd 记账年度
 	 * @param sjfm 数据说明
 	 * @param dataType
 	 * @return

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

@@ -77,23 +77,35 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 			for (int i = 0; i < list.size(); i++) {
 				f = list.get(i);
 
-				//先查询这个货位在上一年有没有结转，不结转的话生成的数据不能展示出来
-				boolean flag = fcbgzUtilsServiceImpl.topYearJzData(f.getCh(), f.getHwh(), Integer.parseInt(f.getJznd())-1, f.getLyxz(), ylorcpl);
-
-				f.setId(UUID.randomUUID().toString().replace("-", ""));
-				f.setCjsj(new Date());
-				f.setSjfm(ParameterUtil.date2string1(f.getJzrq()).substring(0, 7));
-				f.setYlorcpl(ylorcpl);
-				if (StringUtils.isNotBlank(f.getJzzy())) {
-					f.setJzzy(f.getJzzy().replace(" ", ""));
-				}
+				//先查询这个货位在上一年有没有结转数据，没有就新增一条
+				Integer snnf = Integer.parseInt(f.getJznd())-1;
+				boolean flag = fcbgzUtilsServiceImpl.topYearJzData(f.getCh(), f.getHwh(), snnf, f.getLyxz(), ylorcpl);
 				if (flag) {
-					f.setIsShow("0");
-				} else {
-					f.setIsShow("1");
+					createHwsnjzData(f.getOrgId(), f.getCh(), f.getHwh(), snnf.toString(), f.getLyxz(), ylorcpl);
 				}
 
-				storageFcbgzMapper.insert(f);
+				//看这条数据生成了没有，没有就新增，否则执行修改
+				List<StorageFcbgz> old_storageFcbgz_list = fcbgzUtilsServiceImpl.getOldStorageFcbgzList(f.getJzpz(), f.getJzzy(), f.getCh(), f.getHwh(), f.getMxpz(), f.getLyxz(), f.getJznd(), ParameterUtil.date2string1(f.getJzrq()).substring(0, 7), StorageFcbgzUtils.DATA_TYPE_0);
+				if (null == old_storageFcbgz_list || old_storageFcbgz_list.size() == 0) {//新增
+					f.setId(UUID.randomUUID().toString().replace("-", ""));
+					f.setCjsj(new Date());
+					f.setSjfm(ParameterUtil.date2string1(f.getJzrq()).substring(0, 7));
+					f.setYlorcpl(ylorcpl);
+					if (StringUtils.isNotBlank(f.getJzzy())) {
+						f.setJzzy(f.getJzzy().replace(" ", ""));
+					}
+					f.setIsShow("0");
+					storageFcbgzMapper.insert(f);
+				} else {//修改
+					StorageFcbgz old_storageFcbgz = old_storageFcbgz_list.get(0);
+					old_storageFcbgz.setSrsl(f.getSrsl());
+					old_storageFcbgz.setZcsl(f.getZcsl());
+					old_storageFcbgz.setKcsl(f.getKcsl());
+					old_storageFcbgz.setShsl(f.getShsl());
+					old_storageFcbgz.setYysl(f.getYysl());
+					storageFcbgzMapper.updateByPrimaryKey(old_storageFcbgz);
+					f = old_storageFcbgz;
+				}
 
 				//生成或修改月合计数据
 				fcbgzUtilsServiceImpl.saveOrUpdateHjz(f, StorageFcbgzUtils.DATA_TYPE_1);
@@ -106,7 +118,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 
 	@Override
 	public List<StorageFcbgz> selectFcbgzList(Integer lspz, Integer lsxz, String jznd, String dataStatus,
-			String sfjz, Integer orgId) {
+			String sfjz, Integer orgId, String ylorcpl) {
 		
 		Map<String, Object> map = new HashMap<>();
 		if (lspz != null) {
@@ -130,6 +142,9 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		if (null != orgId) {
 			map.put("orgId", orgId);
 		}
+		if (StringUtils.isNotBlank(ylorcpl)) {
+			map.put("ylorcpl", ylorcpl);
+		}
 		List<StorageFcbgz> list = storageFcbgzMapper.selectFcbgzList(map);
 		return list;
 	}
@@ -178,7 +193,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 					list.add(f_day);
 				}
 				//查询这个月的合计数据
-				jznd_month_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, null, StorageFcbgzUtils.DATA_TYPE_1);
+				jznd_month_jz_sum_list = fcbgzUtilsServiceImpl.getList(null, ch, hwh, null, lsxz, jznd, jzrq, StorageFcbgzUtils.DATA_TYPE_1);
 				if (null != jznd_month_jz_sum_list && jznd_month_jz_sum_list.size() > 0) {
 					list.add(jznd_month_jz_sum_list.get(0));
 				}
@@ -613,7 +628,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 	}
 
 	@Override
-	public void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz) {
+	public void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz, String ylorcpl) {
 		StorageFcbgz f = new StorageFcbgz();
 		f.setId(UUID.randomUUID().toString().replace("-", ""));
 		f.setOrgId(orgId);
@@ -626,6 +641,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		f.setKcsl(new BigDecimal(0));
 		f.setDataType("2");
 		f.setDataStatus("0");
+		f.setYlorcpl(ylorcpl);
 		if (lsxz == 3052) {
 			f.setYwlx("2");
 		} else {
@@ -637,4 +653,77 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		storageFcbgzMapper.insert(f);
 	}
 
+	@Override
+	public void timedGenerationCplFcbgzData(String orgId, String hwxz, String rqs, String ylorcpl) throws Exception {
+		Map<String, Object> map = new HashMap<>();
+		if (StringUtils.isNotBlank(orgId)) {
+			map.put("orgId", orgId);
+		}
+		if (StringUtils.isNotBlank(hwxz)) {
+			map.put("hwxz", hwxz);
+		} else {
+			throw new Exception("粮食性质不能为空");
+		}
+		if (StringUtils.isNotBlank(rqs)) {
+			map.put("rqs", rqs);
+		} else {
+			map.put("rqs", ParameterUtil.getSysDate());
+		}
+
+		List<StorageFcbgz> list = null;
+		if (StorageFcbgzUtils.LSXZ_SJCBL.equals(hwxz)) {
+			list = storageFcbgzMapper.queryCplFcbgzGroupByCblData(map);
+		}
+
+		if (null != list && list.size() > 0) {
+			StorageFcbgz f = null;
+			for (int i = 0; i < list.size(); i++) {
+				f = list.get(i);
+
+				//先查询这个货位在上一年有没有结转数据，没有就新增一条
+				Integer snnf = Integer.parseInt(f.getJznd())-1;
+				boolean flag = fcbgzUtilsServiceImpl.topYearJzData(f.getCh(), f.getHwh(), snnf, f.getLyxz(), ylorcpl);
+				if (!flag) {
+					createHwsnjzData(f.getOrgId(), f.getCh(), f.getHwh(), snnf.toString(), f.getLyxz(), ylorcpl);
+				}
+
+				//看这条数据生成了没有，没有就新增，否则执行修改
+				List<StorageFcbgz> old_storageFcbgz_list = fcbgzUtilsServiceImpl.getOldStorageFcbgzList(f.getJzpz(), f.getJzzy(), f.getCh(), f.getHwh(), f.getMxpz(), f.getLyxz(), f.getJznd(), ParameterUtil.date2string1(f.getJzrq()).substring(0, 7), StorageFcbgzUtils.DATA_TYPE_0);
+				if (null == old_storageFcbgz_list || old_storageFcbgz_list.size() == 0) {//新增
+					f.setId(UUID.randomUUID().toString().replace("-", ""));
+					f.setCjsj(new Date());
+					f.setSjfm(ParameterUtil.date2string1(f.getJzrq()).substring(0, 7));
+					f.setYlorcpl(ylorcpl);
+					if (StringUtils.isNotBlank(f.getJzzy())) {
+						f.setJzzy(f.getJzzy().replace(" ", ""));
+					}
+					f.setIsShow("0");
+					f.setShsl(new BigDecimal(0));
+					f.setYysl(new BigDecimal(0));
+					storageFcbgzMapper.insert(f);
+				} else {//修改
+					StorageFcbgz old_storageFcbgz = old_storageFcbgz_list.get(0);
+					old_storageFcbgz.setSrsl(f.getSrsl());
+					old_storageFcbgz.setZcsl(f.getZcsl());
+					old_storageFcbgz.setKcsl(f.getKcsl());
+					if ("0".equals(f.getYlorcpl())) {
+						old_storageFcbgz.setShsl(f.getShsl());
+						old_storageFcbgz.setYysl(f.getYysl());
+					} else {
+						old_storageFcbgz.setShsl(new BigDecimal(0));
+						old_storageFcbgz.setYysl(new BigDecimal(0));
+					}
+					storageFcbgzMapper.updateByPrimaryKey(old_storageFcbgz);
+					f = old_storageFcbgz;
+				}
+
+				//生成或修改月合计数据
+				fcbgzUtilsServiceImpl.saveOrUpdateHjz(f, StorageFcbgzUtils.DATA_TYPE_1);
+
+				//生成或修改年结转数据
+				fcbgzUtilsServiceImpl.saveOrUpdateHjz(f, StorageFcbgzUtils.DATA_TYPE_2);
+			}
+		}
+	}
+
 }