储备粮油专卡打印功能

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1860,17 +1860,14 @@
   <select id="getQualitycheckListByFoodbasicinfoCheck" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List" />
-    FROM storage_qualitycheck
-    WHERE type = '2'
-    <if test="houseId !=null">
-      and house_id = #{houseId}
-    </if>
-    <if test="tankId !=null">
-      and tank_id = #{tankId}
-    </if>
-    <if test="warehouseId !=null">
-      and warehouse_id = #{warehouseId}
-    </if>
+    FROM storage_qualitycheck sqk
+    WHERE sqk.id in (
+    SELECT qualitycheck_id
+    FROM storage_foodbasicinfochecks fcs
+    WHERE fcs.foodbasicinfo_id =#{id}
+    and fcs.house_id =#{houseId}
+    and fcs.warehouse_id = #{warehouseId}
+    )
   </select>
 
   <sql id="ExtBase_Column_List">

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -87,24 +87,25 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public List<StorageQualitycheck> getQualitycheckListByFoodbasicinfoCheck(StorageQualitycheck qualitycheck,Integer foodbasicinfoId) {
-	    //获取春秋普查
         List<StorageQualitycheck> list = qualitycheckMapper.getQualitycheckListByFoodbasicinfoCheck(qualitycheck);
-        if(list.size()>0){
-            int i = 0;
-            for(;i<list.size();i++){
-                List<StorageQualitycheckSon> QualitycheckdList =  qualitycheckSonService.selectByQualitycheckId(list.get(i).getId());
-                for(StorageQualitycheckSon qc : QualitycheckdList){
-                    if(qc.getNumbering()== 2789 ){
-                        list.get(i).setEatScore(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2790 ){
-                        list.get(i).setGlutenWaterCount(qc.getSetValue());
-                        continue;
-                    }
-                }
-            }
-        }
+//	    //获取春秋普查
+//        List<StorageQualitycheck> list = qualitycheckMapper.getQualitycheckListByFoodbasicinfoCheck(qualitycheck);
+//        if(list.size()>0){
+//            int i = 0;
+//            for(;i<list.size();i++){
+//                List<StorageQualitycheckSon> QualitycheckdList =  qualitycheckSonService.selectByQualitycheckId(list.get(i).getId());
+//                for(StorageQualitycheckSon qc : QualitycheckdList){
+//                    if(qc.getNumbering()== 2789 ){
+//                        list.get(i).setEatScore(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2790 ){
+//                        list.get(i).setGlutenWaterCount(qc.getSetValue());
+//                        continue;
+//                    }
+//                }
+//            }
+//        }
 		return list;
 	}