封仓确认单bug修改

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

@@ -37,7 +37,7 @@ public interface StorageSealedConfirmationMapper {
 
     StorageSealedConfirmation checkGrainAttribute(@Param("orgId") Integer orgId, @Param("houseId") Integer houseId, @Param("warehouseId") Integer warehouseId);
 
-    Integer checkNoticeReceive(@Param("orgId") Integer orgId, @Param("houseId") Integer houseId, @Param("warehouseId") Integer warehouseId);
+    Integer checkNoticeReceive(Map<String, Object> map);
 
     String checkAuditState(@Param("houseId") Integer houseId, @Param("harvestYear") Integer harvestYear, @Param("warehouseId") Integer warehouseId);
 }

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

@@ -384,55 +384,63 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectNotSealedStorage" parameterType="integer" resultType="com.chinaitop.depot.param.BasicStorageAndTankParam">
-    select
-        bs.storehouse_id houseId,
-        bs.storehouse_code storehouseCode,
-        bs.storehouse_name houseName
-    from
-        basic_storehouse bs
-        left join storage_grain_card sgc on bs.storehouse_id = sgc.storehouse_id
-        and sgc.sfgd = '1'
-        and sgc.sfmc = 1
-    where
-        bs.del_flag = 1
-        and bs.org_id = #{orgId}
-        and sgc.id is null
+    select 
+      a.storehouse_id houseId,
+      b.storehouse_name houseName
+	from basic_warehouse a
+	left join basic_storehouse b on b.storehouse_id=a.storehouse_id
+	where a.del_flag=1 
+	and a.library_type=0
+	and a.crk_status in (2,4)
+	and a.org_id=#{orgId}
+	group by a.storehouse_id,b.storehouse_name
+	union all
+	select 
+	  a.id houseId,
+	  a.storagetank_name houseName
+	from basic_tank a
+	where a.del_flag=1 
+	and a.library_type=0
+	and a.crk_status in (2,4)
+	and a.org_id=#{orgId}
   </select>
   <select id="checkGrainAttribute" parameterType="integer" resultType="com.chinaitop.depot.grainSituationCard.model.StorageSealedConfirmation">
     select
-        house_id houseId,
-        org_id orgId,
-        warehouse_id warehouseId,
-        sub_type grainKind,
-        quality grainAttribute,
-        number_update sealedNumber,
-        ypdj grainGrade,
-        location placeOfOrigin,
-        harvest_time harvestYear
-    from
-        storage_qualitycheck
+        ch houseId,
+        unitid orgId,
+        hwh warehouseId,
+        pz grainKind,
+        hwxz grainAttribute,
+        kcsl sealedNumber,
+        dj grainGrade,
+        gb placeOfOrigin,
+        scnf harvestYear,
+        rq applyTime
+    from lsreport_ts:data_kcgl_kcsw_default
     <where>
-      history_status = 0
-      and type_update = '0'
-      and org_id = #{orgId}
-      and house_id = #{houseId}
-      <if test="warehouseId != null and warehouseId != ''">
-        and warehouse_id = #{warehouseId}
-      </if>
+      and ch = #{houseId}
+      and hwh = #{warehouseId}
+      and hwxz in(
+              6864,
+              6865,
+              6877,
+              6878,
+              6879,
+              6866
+            )
     </where>
-    order by id desc limit 0,1
   </select>
-  <select id="checkNoticeReceive" parameterType="integer" resultType="integer">
+  <select id="checkNoticeReceive" parameterType="java.util.Map" resultType="integer">
     select
         hzqlsxzdm
-    from
-        business_notice_receive
-    where
-        org_id = #{orgId}
-        and house_id = #{houseId}
-        and ware_house_id = #{warehouseId}
-    order by
-        id desc limit 0,1
+    from business_notice_receive
+    where is_sheet=0 and audit_state=6 and crktype=1
+        and house_id = #{houseId,jdbcType=INTEGER}
+        <if test="warehouseId != null">
+        and ware_house_id = #{warehouseId,jdbcType=INTEGER}
+        </if>
+        receive_time > #{applyTime,,jdbcType=TIMESTAMP}
+    order by id desc limit 0,1
   </select>
     <select id="checkAuditState" parameterType="object" resultType="string">
       select

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

@@ -131,19 +131,24 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
 
     @Override
     public StorageSealedConfirmation checkGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId) {
+    	//查询这个货位对应的储备粮库存数据
         StorageSealedConfirmation confirmation = confirmationMapper.checkGrainAttribute(orgId, houseId, warehouseId);
         if (!ObjectUtils.isEmpty(confirmation)) {
-            // 效验查询性质转变后粮食性质
-            Integer grainAttribute = confirmationMapper.checkNoticeReceive(orgId, houseId, warehouseId);
+            // 效验查询入库性质转变单数据(查询最后一车时间往后的数据)
+        	Map<String, Object> map = new HashMap<>();
+        	map.put("houseId", houseId);
+        	if (!houseId.equals(warehouseId)) {
+        		map.put("warehouseId", warehouseId);
+        	}
+        	map.put("applyTime", confirmation.getApplyTime());
+            Integer grainAttribute = confirmationMapper.checkNoticeReceive(map);
             // 未做性质转变
             if (ObjectUtils.isEmpty(grainAttribute)) {
-                return null;
+                return confirmation;
             } else {
                 // 对比粮食性质是否为储备粮
                 if (6864 == grainAttribute || 6865 == grainAttribute || 6877 == grainAttribute || 6878 == grainAttribute || 6879 == grainAttribute || 6866 == grainAttribute) {
                     confirmation.setGrainAttribute(grainAttribute);
-                } else {
-                    return null;
                 }
             }
         }