1

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/GrainAnalysisServiceImpl.java

@@ -241,8 +241,13 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 			}
 			if (!CollectionUtils.isEmpty(analysisCpltestdataList)) {
 				for (GrainAnalysisCpltestdata gac : analysisCpltestdataList) {
-					gac.setUpdatetime(new Date());
-					grainAnalysisCpltestdataMapper.updateByPrimaryKey(gac);
+					if (StringUtils.isNotBlank(gac.getCw())) {
+						gac.setUpdatetime(new Date());
+						grainAnalysisCpltestdataMapper.updateByPrimaryKey(gac);
+					} else {
+						//把空行的删除
+						grainAnalysisCpltestdataMapper.deleteByPrimaryKey(gac.getId());
+					}
 				}
 			}
 			if (!CollectionUtils.isEmpty(analysisMonthdataList) && "2".equals(storageGrainAnalysis.getDataType())) {

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

@@ -165,7 +165,7 @@ public class StorageFcbgzController {
 	@ApiOperation(value="定时生成省级储备粮分仓保管账数据", notes = "每天23点执行一次")
 	public void timedGenerationFcbgzSclData() {
 		try {
-			storageFcbgzService.timedGenerationFcbgzData(null, "6877", null);
+			storageFcbgzService.timedGenerationFcbgzData(null, "6877", null, "0");
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
@@ -177,7 +177,7 @@ public class StorageFcbgzController {
 	@ApiOperation(value="定时生成商品粮分仓保管账数据", notes = "每天23点15执行一次")
 	public void timedGenerationFcbgzSplData() {
 		try {
-			storageFcbgzService.timedGenerationFcbgzData(null, "3052", null);
+			storageFcbgzService.timedGenerationFcbgzData(null, "3052", null, "0");
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
@@ -189,11 +189,12 @@ public class StorageFcbgzController {
 	@ApiImplicitParams({
     	@ApiImplicitParam(name="orgId", value="库ID", paramType="query"),
     	@ApiImplicitParam(name="hwxz", value="粮食性质", paramType="query"),
-    	@ApiImplicitParam(name="rqs", value="记账日期", paramType="query")
+    	@ApiImplicitParam(name="rqs", value="记账日期", paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或者成品粮(0:原粮,1:成品粮)", paramType="query")
     })
-	public void timedGenerationFcbgzData_test(String orgId, String hwxz, String rqs) {
+	public void timedGenerationFcbgzData_test(String orgId, String hwxz, String rqs, String ylorcpl) {
 		try {
-			storageFcbgzService.timedGenerationFcbgzData(orgId, hwxz, rqs);
+			storageFcbgzService.timedGenerationFcbgzData(orgId, hwxz, rqs, ylorcpl);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}

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

@@ -30,6 +30,7 @@
     <result column="cjsj" jdbcType="TIMESTAMP" property="cjsj" />
     <result column="is_show" jdbcType="VARCHAR" property="isShow" />
     <result column="sfjz" property="sfjz" jdbcType="VARCHAR" />
+    <result column="ylorcpl" property="ylorcpl" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -92,7 +93,7 @@
   <sql id="Base_Column_List">
     id, org_id, ch, hwh, pz, mxpz, lyxz, zcsl, srsl, kcsl, shsl, yysl, jzrq, last_business_date, 
     jzr, jzsj, shr, shsj, jznd, jzpz, jzzy, sjfm, data_status, data_type, ywlx, cjsj, 
-    is_show
+    is_show, ylorcpl
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.keeperAccount.model.StorageFcbgzExample" resultMap="BaseResultMap">
     select
@@ -132,7 +133,7 @@
       jzr, jzsj, shr, shsj, 
       jznd, jzpz, jzzy, sjfm, 
       data_status, data_type, ywlx, 
-      cjsj, is_show)
+      cjsj, is_show, ylorcpl)
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{ch,jdbcType=INTEGER}, 
       #{hwh,jdbcType=INTEGER}, #{pz,jdbcType=INTEGER}, #{mxpz,jdbcType=INTEGER}, #{lyxz,jdbcType=INTEGER}, 
       #{zcsl,jdbcType=DECIMAL}, #{srsl,jdbcType=DECIMAL}, #{kcsl,jdbcType=DECIMAL}, #{shsl,jdbcType=DECIMAL}, 
@@ -140,7 +141,7 @@
       #{jzr,jdbcType=VARCHAR}, #{jzsj,jdbcType=TIMESTAMP}, #{shr,jdbcType=VARCHAR}, #{shsj,jdbcType=TIMESTAMP}, 
       #{jznd,jdbcType=VARCHAR}, #{jzpz,jdbcType=VARCHAR}, #{jzzy,jdbcType=VARCHAR}, #{sjfm,jdbcType=VARCHAR}, 
       #{dataStatus,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, 
-      #{cjsj,jdbcType=TIMESTAMP}, #{isShow,jdbcType=VARCHAR})
+      #{cjsj,jdbcType=TIMESTAMP}, #{isShow,jdbcType=VARCHAR}, #{ylorcpl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.keeperAccount.model.StorageFcbgz">
     insert into storage_fcbgz
@@ -226,6 +227,9 @@
       <if test="isShow != null">
         is_show,
       </if>
+      <if test="ylorcpl != null">
+        ylorcpl,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -309,6 +313,9 @@
       <if test="isShow != null">
         #{isShow,jdbcType=VARCHAR},
       </if>
+      <if test="ylorcpl != null">
+        #{ylorcpl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.keeperAccount.model.StorageFcbgzExample" resultType="java.lang.Integer">
@@ -401,6 +408,9 @@
       <if test="record.isShow != null">
         is_show = #{record.isShow,jdbcType=VARCHAR},
       </if>
+      <if test="record.ylorcpl != null">
+        ylorcpl = #{record.ylorcpl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -434,7 +444,8 @@
       data_type = #{record.dataType,jdbcType=VARCHAR},
       ywlx = #{record.ywlx,jdbcType=VARCHAR},
       cjsj = #{record.cjsj,jdbcType=TIMESTAMP},
-      is_show = #{record.isShow,jdbcType=VARCHAR}
+      is_show = #{record.isShow,jdbcType=VARCHAR},
+      ylorcpl = #{record.ylorcpl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -520,6 +531,9 @@
       <if test="isShow != null">
         is_show = #{isShow,jdbcType=VARCHAR},
       </if>
+      <if test="ylorcpl != null">
+        ylorcpl = #{ylorcpl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -550,7 +564,8 @@
       data_type = #{dataType,jdbcType=VARCHAR},
       ywlx = #{ywlx,jdbcType=VARCHAR},
       cjsj = #{cjsj,jdbcType=TIMESTAMP},
-      is_show = #{isShow,jdbcType=VARCHAR}
+      is_show = #{isShow,jdbcType=VARCHAR},
+      ylorcpl = #{ylorcpl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

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

@@ -103,4 +103,7 @@ public class StorageFcbgz {
 	@ApiModelProperty(value = "是否结转(0:是,1:否)")
     private String sfjz;
 
+	@ApiModelProperty(value = "原粮或成品粮(0:原粮,1:成品粮)")
+	private String ylorcpl;
+
 }

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

@@ -1857,6 +1857,11 @@ public class StorageFcbgzExample {
             addCriterion("is_show not between", value1, value2, "isShow");
             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

@@ -14,9 +14,10 @@ public interface StorageFcbgzService {
 	 * @param orgId 粮库ID
 	 * @param hwxz 粮食性质
 	 * @param rqs 执行日期
+	 * @param ylorcpl 
 	 * @throws Exception
 	 */
-	void timedGenerationFcbgzData(String orgId, String hwxz, String rqs) throws Exception;
+	void timedGenerationFcbgzData(String orgId, String hwxz, String rqs, String ylorcpl) throws Exception;
 
 	/**
 	 * 分仓保管账查询列表

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

@@ -34,13 +34,15 @@ public class FcbgzUtilsServiceImpl {
 	 * @return
 	 * @throws Exception
 	 */
-	public boolean topYearJzData(Integer hwh, Integer jznd, Integer lsxz) throws Exception {
+	public boolean topYearJzData(Integer ch, Integer hwh, Integer jznd, Integer lsxz, String ylorcpl) throws Exception {
 		boolean flag = false;
 		StorageFcbgzExample example = new StorageFcbgzExample();
 		StorageFcbgzExample.Criteria criteria = example.createCriteria();
+		criteria.andChEqualTo(ch);
 		criteria.andHwhEqualTo(hwh);
 		criteria.andJzndEqualTo(jznd.toString());
 		criteria.andLyxzEqualTo(lsxz);
+		criteria.andYlorcplEqualTo(ylorcpl);
 		List<StorageFcbgz> list = storageFcbgzMapper.selectByExample(example);
 		if (null != list && list.size() > 0) {
 			flag = true;
@@ -59,6 +61,7 @@ public class FcbgzUtilsServiceImpl {
 		criteria.andDataTypeEqualTo(dataType);//数据类型
 		criteria.andLyxzEqualTo(f.getLyxz());//粮食性质
 		criteria.andYwlxEqualTo(f.getYwlx());//业务类型
+		criteria.andYlorcplEqualTo(f.getYlorcpl());
 
 		if (StorageFcbgzUtils.DATA_TYPE_1.equals(dataType)) {//月合计
 			criteria.andSjfmEqualTo(ParameterUtil.date2string1(f.getJzrq()).substring(0, 7));//年月

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

@@ -47,7 +47,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 	private BasicFeignClient basicFeignClient;
 
 	@Override
-	public void timedGenerationFcbgzData(String orgId, String hwxz, String rqs) throws Exception {
+	public void timedGenerationFcbgzData(String orgId, String hwxz, String rqs, String ylorcpl) throws Exception {
 
 		Map<String, Object> map = new HashMap<>();
 		if (StringUtils.isNotBlank(orgId)) {
@@ -78,11 +78,12 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 				f = list.get(i);
 
 				//先查询这个货位在上一年有没有结转，不结转的话生成的数据不能展示出来
-				boolean flag = fcbgzUtilsServiceImpl.topYearJzData(f.getHwh(), Integer.parseInt(f.getJznd())-1, f.getLyxz());
+				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(" ", ""));
 				}