1

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

@@ -174,7 +174,7 @@ public class StorageFcbgzController {
 
 	@Scheduled(cron = "0 15 23 * * ?")
 	@RequestMapping(value="/timedGenerationFcbgzSplData", method = RequestMethod.GET)
-	@ApiOperation(value="定时生成省级储备粮分仓保管账数据", notes = "每天23点15执行一次")
+	@ApiOperation(value="定时生成商品粮分仓保管账数据", notes = "每天23点15执行一次")
 	public void timedGenerationFcbgzSplData() {
 		try {
 			storageFcbgzService.timedGenerationFcbgzData(null, "3052", null);
@@ -199,4 +199,17 @@ public class StorageFcbgzController {
 		}
 		System.out.println("结束了");
 	}
+
+	@RequestMapping(value="/createHwsnjzData", method = RequestMethod.GET)
+	@ApiOperation(value="手动生成一个货位的上年结转数据数据", notes = "")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="orgId", value="库ID", paramType="query"),
+		@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")
+    })
+	public void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz) {
+		storageFcbgzService.createHwsnjzData(orgId, ch, hwh, jznd, lsxz);
+	}
 }

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

@@ -774,7 +774,7 @@
 	    a.org_id, a.ch, a.hwh, substr(a.rqs, 1, 4) jznd,
 	    '0' data_type,
 	    '1' data_status,
-	    '0' ywlx,
+	    '2' ywlx,
 	    b.rq last_business_date
 	from (
 	    select 

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

@@ -86,4 +86,13 @@ public interface StorageFcbgzService {
 	 * @throws Exception
 	 */
 	List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd) throws Exception;
+
+	/**
+	 * 手动生成一个货位的年度结转数据
+	 * @param orgId
+	 * @param hwh
+	 * @param jznd
+	 * @param lsxz
+	 */
+	void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz);
 }

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

@@ -586,4 +586,29 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		return list;
 	}
 
+	@Override
+	public void createHwsnjzData(String orgId, Integer ch, Integer hwh, String jznd, Integer lsxz) {
+		StorageFcbgz f = new StorageFcbgz();
+		f.setId(UUID.randomUUID().toString().replace("-", ""));
+		f.setOrgId(orgId);
+		f.setCh(ch);
+		f.setHwh(hwh);
+		f.setJznd(jznd);
+		f.setLyxz(lsxz);
+		f.setSrsl(new BigDecimal(0));
+		f.setZcsl(new BigDecimal(0));
+		f.setKcsl(new BigDecimal(0));
+		f.setDataType("2");
+		f.setDataStatus("0");
+		if (lsxz == 3052) {
+			f.setYwlx("2");
+		} else {
+			f.setYwlx("0");
+		}
+		f.setCjsj(new Date());
+		f.setIsShow("0");
+		f.setSfjz("0");
+		storageFcbgzMapper.insert(f);
+	}
+
 }