封仓确认单-性质转变效验

src/main/java/com/chinaitop/depot/grainSituationCard/mapper/StorageSealedConfirmationMapper.xml

@@ -419,14 +419,6 @@
       <if test="warehouseId != null and warehouseId != ''">
         and warehouse_id = #{warehouseId}
       </if>
-      and quality in(
-              6864,
-              6865,
-              6877,
-              6878,
-              6879,
-              6866
-            )
     </where>
     order by id desc limit 0,1
   </select>

src/main/java/com/chinaitop/depot/grainSituationCard/service/impl/StorageSealedConfirmationImpl.java

@@ -63,7 +63,7 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
         }
         //粮情卡功能校验取数用到
         if (!ObjectUtils.isEmpty(param.getApplyTime())) {
-        	criteria.andApplyTimeGreaterThanOrEqualTo(ParameterUtil.string2datetime(param.getApplyTime()));
+            criteria.andApplyTimeGreaterThanOrEqualTo(ParameterUtil.string2datetime(param.getApplyTime()));
         }
         return confirmationMapper.selectByExample(example);
     }
@@ -137,11 +137,13 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
             Integer grainAttribute = confirmationMapper.checkNoticeReceive(orgId, houseId, warehouseId);
             // 未做性质转变
             if (ObjectUtils.isEmpty(grainAttribute)) {
-                return confirmation;
+                return null;
             } else {
                 // 对比粮食性质是否为储备粮
                 if (6864 == grainAttribute || 6865 == grainAttribute || 6877 == grainAttribute || 6878 == grainAttribute || 6879 == grainAttribute || 6866 == grainAttribute) {
                     confirmation.setGrainAttribute(grainAttribute);
+                } else {
+                    return null;
                 }
             }
         }