储量专卡

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

@@ -967,7 +967,9 @@
       <if test="warehouseId != null">
       AND sf.warehouse_id = #{warehouseId} 
       </if>
-      AND sf.warehouse_id
+      <if test="id != null">
+        AND sf.id = #{id}
+      </if>
       AND sf.history_status = 0
       ORDER BY
         sf.id DESC
@@ -1046,6 +1048,9 @@
     <if test="houseId != null">
       AND sf.house_id = #{houseId}
     </if>
+    <if test="id != null">
+      AND sf.id = #{id}
+    </if>
     AND sf.history_status = 0
     ORDER BY
     sf.id DESC

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

@@ -148,19 +148,19 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, house_id, warehouse_id, type, sub_type, sub_type_detailed, check_time, check_result, 
-    checker, level, capacity, water, impurity, mineral, badpart, colorsmell, keeper_advices, 
-    keeper_advices_time, keeper_advices_paint, chief_advices, chief_advices_time, chiet_advices_paint, 
-    vice_manager_advices, vice_manager_advices_time, vice_manager_advices_paint, manager_advices, 
-    manager_advices_time, manager_advices_paint, improve_result, improve_time, improve_paint, 
-    is_firstchecklevel_right, accept_unite, input_time, number, location, keeper, harvest_time, 
-    goodpart, chooser, choose_time, boldfat_index, check_type, hot_damage, protein_solution_ratio, 
-    eat_score, fat_index, husked_ration, full_good_ration, yellow_part, out_husked_ration, 
-    pests, color_ratio, hard_index, gluten_water_count, remarks, approver, mildew_count, 
-    damage_ratio, hot_damage_ratio, husked_rice_weight, reviewer, apply_check_time, check_time_type, 
-    check_result_time, store_quality, is_pest, inspection_standard_basis, quality, seal_date, 
-    seal_status, auth_code, org_id, history_status, intermixing_rate, smelltaste, transparency, 
-    peroxide_value, smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, 
+    id, house_id, warehouse_id, type, sub_type, sub_type_detailed, check_time, check_result,
+    checker, level, capacity, water, impurity, mineral, badpart, colorsmell, keeper_advices,
+    keeper_advices_time, keeper_advices_paint, chief_advices, chief_advices_time, chiet_advices_paint,
+    vice_manager_advices, vice_manager_advices_time, vice_manager_advices_paint, manager_advices,
+    manager_advices_time, manager_advices_paint, improve_result, improve_time, improve_paint,
+    is_firstchecklevel_right, accept_unite, input_time, number, location, keeper, harvest_time,
+    goodpart, chooser, choose_time, boldfat_index, check_type, hot_damage, protein_solution_ratio,
+    eat_score, fat_index, husked_ration, full_good_ration, yellow_part, out_husked_ration,
+    pests, color_ratio, hard_index, gluten_water_count, remarks, approver, mildew_count,
+    damage_ratio, hot_damage_ratio, husked_rice_weight, reviewer, apply_check_time, check_time_type,
+    check_result_time, store_quality, is_pest, inspection_standard_basis, quality, seal_date,
+    seal_status, auth_code, org_id, history_status, intermixing_rate, smelltaste, transparency,
+    peroxide_value, smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin,
     butyl_phenol
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultMap="BaseResultMap">
@@ -178,7 +178,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from storage_qualitycheck
     where id = #{id,jdbcType=INTEGER}
@@ -194,64 +194,64 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck">
-    insert into storage_qualitycheck (id, house_id, warehouse_id, 
-      type, sub_type, sub_type_detailed, 
-      check_time, check_result, checker, 
-      level, capacity, water, 
-      impurity, mineral, badpart, 
-      colorsmell, keeper_advices, keeper_advices_time, 
-      keeper_advices_paint, chief_advices, chief_advices_time, 
-      chiet_advices_paint, vice_manager_advices, 
-      vice_manager_advices_time, vice_manager_advices_paint, 
-      manager_advices, manager_advices_time, manager_advices_paint, 
-      improve_result, improve_time, improve_paint, 
-      is_firstchecklevel_right, accept_unite, input_time, 
-      number, location, keeper, 
-      harvest_time, goodpart, chooser, 
-      choose_time, boldfat_index, check_type, 
-      hot_damage, protein_solution_ratio, eat_score, 
-      fat_index, husked_ration, full_good_ration, 
-      yellow_part, out_husked_ration, pests, 
-      color_ratio, hard_index, gluten_water_count, 
-      remarks, approver, mildew_count, 
-      damage_ratio, hot_damage_ratio, husked_rice_weight, 
-      reviewer, apply_check_time, check_time_type, 
-      check_result_time, store_quality, is_pest, 
-      inspection_standard_basis, quality, seal_date, 
-      seal_status, auth_code, org_id, 
-      history_status, intermixing_rate, smelltaste, 
-      transparency, peroxide_value, smoke_point, 
-      reeze_test, residual_solvent, lead, 
+    insert into storage_qualitycheck (id, house_id, warehouse_id,
+      type, sub_type, sub_type_detailed,
+      check_time, check_result, checker,
+      level, capacity, water,
+      impurity, mineral, badpart,
+      colorsmell, keeper_advices, keeper_advices_time,
+      keeper_advices_paint, chief_advices, chief_advices_time,
+      chiet_advices_paint, vice_manager_advices,
+      vice_manager_advices_time, vice_manager_advices_paint,
+      manager_advices, manager_advices_time, manager_advices_paint,
+      improve_result, improve_time, improve_paint,
+      is_firstchecklevel_right, accept_unite, input_time,
+      number, location, keeper,
+      harvest_time, goodpart, chooser,
+      choose_time, boldfat_index, check_type,
+      hot_damage, protein_solution_ratio, eat_score,
+      fat_index, husked_ration, full_good_ration,
+      yellow_part, out_husked_ration, pests,
+      color_ratio, hard_index, gluten_water_count,
+      remarks, approver, mildew_count,
+      damage_ratio, hot_damage_ratio, husked_rice_weight,
+      reviewer, apply_check_time, check_time_type,
+      check_result_time, store_quality, is_pest,
+      inspection_standard_basis, quality, seal_date,
+      seal_status, auth_code, org_id,
+      history_status, intermixing_rate, smelltaste,
+      transparency, peroxide_value, smoke_point,
+      reeze_test, residual_solvent, lead,
       total_arsenic, aflatoxin, butyl_phenol
       )
-    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, 
-      #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, #{subTypeDetailed,jdbcType=INTEGER}, 
-      #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, #{checker,jdbcType=VARCHAR}, 
-      #{level,jdbcType=INTEGER}, #{capacity,jdbcType=VARCHAR}, #{water,jdbcType=VARCHAR}, 
-      #{impurity,jdbcType=VARCHAR}, #{mineral,jdbcType=VARCHAR}, #{badpart,jdbcType=VARCHAR}, 
-      #{colorsmell,jdbcType=VARCHAR}, #{keeperAdvices,jdbcType=VARCHAR}, #{keeperAdvicesTime,jdbcType=VARCHAR}, 
-      #{keeperAdvicesPaint,jdbcType=VARCHAR}, #{chiefAdvices,jdbcType=VARCHAR}, #{chiefAdvicesTime,jdbcType=TIMESTAMP}, 
-      #{chietAdvicesPaint,jdbcType=VARCHAR}, #{viceManagerAdvices,jdbcType=VARCHAR}, 
-      #{viceManagerAdvicesTime,jdbcType=TIMESTAMP}, #{viceManagerAdvicesPaint,jdbcType=VARCHAR}, 
-      #{managerAdvices,jdbcType=VARCHAR}, #{managerAdvicesTime,jdbcType=TIMESTAMP}, #{managerAdvicesPaint,jdbcType=VARCHAR}, 
-      #{improveResult,jdbcType=VARCHAR}, #{improveTime,jdbcType=TIMESTAMP}, #{improvePaint,jdbcType=VARCHAR}, 
-      #{isFirstchecklevelRight,jdbcType=VARCHAR}, #{acceptUnite,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=VARCHAR}, #{location,jdbcType=INTEGER}, #{keeper,jdbcType=VARCHAR}, 
-      #{harvestTime,jdbcType=INTEGER}, #{goodpart,jdbcType=VARCHAR}, #{chooser,jdbcType=VARCHAR}, 
-      #{chooseTime,jdbcType=TIMESTAMP}, #{boldfatIndex,jdbcType=VARCHAR}, #{checkType,jdbcType=VARCHAR}, 
-      #{hotDamage,jdbcType=VARCHAR}, #{proteinSolutionRatio,jdbcType=VARCHAR}, #{eatScore,jdbcType=VARCHAR}, 
-      #{fatIndex,jdbcType=VARCHAR}, #{huskedRation,jdbcType=VARCHAR}, #{fullGoodRation,jdbcType=VARCHAR}, 
-      #{yellowPart,jdbcType=VARCHAR}, #{outHuskedRation,jdbcType=VARCHAR}, #{pests,jdbcType=VARCHAR}, 
-      #{colorRatio,jdbcType=VARCHAR}, #{hardIndex,jdbcType=VARCHAR}, #{glutenWaterCount,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{approver,jdbcType=VARCHAR}, #{mildewCount,jdbcType=VARCHAR}, 
-      #{damageRatio,jdbcType=VARCHAR}, #{hotDamageRatio,jdbcType=VARCHAR}, #{huskedRiceWeight,jdbcType=VARCHAR}, 
-      #{reviewer,jdbcType=VARCHAR}, #{applyCheckTime,jdbcType=TIMESTAMP}, #{checkTimeType,jdbcType=VARCHAR}, 
-      #{checkResultTime,jdbcType=TIMESTAMP}, #{storeQuality,jdbcType=VARCHAR}, #{isPest,jdbcType=VARCHAR}, 
-      #{inspectionStandardBasis,jdbcType=VARCHAR}, #{quality,jdbcType=VARCHAR}, #{sealDate,jdbcType=TIMESTAMP}, 
-      #{sealStatus,jdbcType=VARCHAR}, #{authCode,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, 
-      #{historyStatus,jdbcType=INTEGER}, #{intermixingRate,jdbcType=VARCHAR}, #{smelltaste,jdbcType=VARCHAR}, 
-      #{transparency,jdbcType=VARCHAR}, #{peroxideValue,jdbcType=VARCHAR}, #{smokePoint,jdbcType=VARCHAR}, 
-      #{reezeTest,jdbcType=VARCHAR}, #{residualSolvent,jdbcType=VARCHAR}, #{lead,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER},
+      #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, #{subTypeDetailed,jdbcType=INTEGER},
+      #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, #{checker,jdbcType=VARCHAR},
+      #{level,jdbcType=INTEGER}, #{capacity,jdbcType=VARCHAR}, #{water,jdbcType=VARCHAR},
+      #{impurity,jdbcType=VARCHAR}, #{mineral,jdbcType=VARCHAR}, #{badpart,jdbcType=VARCHAR},
+      #{colorsmell,jdbcType=VARCHAR}, #{keeperAdvices,jdbcType=VARCHAR}, #{keeperAdvicesTime,jdbcType=VARCHAR},
+      #{keeperAdvicesPaint,jdbcType=VARCHAR}, #{chiefAdvices,jdbcType=VARCHAR}, #{chiefAdvicesTime,jdbcType=TIMESTAMP},
+      #{chietAdvicesPaint,jdbcType=VARCHAR}, #{viceManagerAdvices,jdbcType=VARCHAR},
+      #{viceManagerAdvicesTime,jdbcType=TIMESTAMP}, #{viceManagerAdvicesPaint,jdbcType=VARCHAR},
+      #{managerAdvices,jdbcType=VARCHAR}, #{managerAdvicesTime,jdbcType=TIMESTAMP}, #{managerAdvicesPaint,jdbcType=VARCHAR},
+      #{improveResult,jdbcType=VARCHAR}, #{improveTime,jdbcType=TIMESTAMP}, #{improvePaint,jdbcType=VARCHAR},
+      #{isFirstchecklevelRight,jdbcType=VARCHAR}, #{acceptUnite,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP},
+      #{number,jdbcType=VARCHAR}, #{location,jdbcType=INTEGER}, #{keeper,jdbcType=VARCHAR},
+      #{harvestTime,jdbcType=INTEGER}, #{goodpart,jdbcType=VARCHAR}, #{chooser,jdbcType=VARCHAR},
+      #{chooseTime,jdbcType=TIMESTAMP}, #{boldfatIndex,jdbcType=VARCHAR}, #{checkType,jdbcType=VARCHAR},
+      #{hotDamage,jdbcType=VARCHAR}, #{proteinSolutionRatio,jdbcType=VARCHAR}, #{eatScore,jdbcType=VARCHAR},
+      #{fatIndex,jdbcType=VARCHAR}, #{huskedRation,jdbcType=VARCHAR}, #{fullGoodRation,jdbcType=VARCHAR},
+      #{yellowPart,jdbcType=VARCHAR}, #{outHuskedRation,jdbcType=VARCHAR}, #{pests,jdbcType=VARCHAR},
+      #{colorRatio,jdbcType=VARCHAR}, #{hardIndex,jdbcType=VARCHAR}, #{glutenWaterCount,jdbcType=VARCHAR},
+      #{remarks,jdbcType=VARCHAR}, #{approver,jdbcType=VARCHAR}, #{mildewCount,jdbcType=VARCHAR},
+      #{damageRatio,jdbcType=VARCHAR}, #{hotDamageRatio,jdbcType=VARCHAR}, #{huskedRiceWeight,jdbcType=VARCHAR},
+      #{reviewer,jdbcType=VARCHAR}, #{applyCheckTime,jdbcType=TIMESTAMP}, #{checkTimeType,jdbcType=VARCHAR},
+      #{checkResultTime,jdbcType=TIMESTAMP}, #{storeQuality,jdbcType=VARCHAR}, #{isPest,jdbcType=VARCHAR},
+      #{inspectionStandardBasis,jdbcType=VARCHAR}, #{quality,jdbcType=VARCHAR}, #{sealDate,jdbcType=TIMESTAMP},
+      #{sealStatus,jdbcType=VARCHAR}, #{authCode,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER},
+      #{historyStatus,jdbcType=INTEGER}, #{intermixingRate,jdbcType=VARCHAR}, #{smelltaste,jdbcType=VARCHAR},
+      #{transparency,jdbcType=VARCHAR}, #{peroxideValue,jdbcType=VARCHAR}, #{smokePoint,jdbcType=VARCHAR},
+      #{reezeTest,jdbcType=VARCHAR}, #{residualSolvent,jdbcType=VARCHAR}, #{lead,jdbcType=VARCHAR},
       #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}
       )
   </insert>
@@ -1625,12 +1625,12 @@
     bs.storeHouse_name storehouseName,
     bw.warehouse_name wareHouseName,
     bb.storageTank_name tankName,
-    sfo.id foodbasicinfoId
+    sf.foodbasicinfo_id foodbasicinfoId
     FROM storage_qualitycheck sqk
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = sqk.house_id
     LEFT JOIN basic_warehouse bw  on bw.warehouse_id = sqk.warehouse_id
     LEFT JOIN basic_tank bb on bb.id = sqk.tank_id
-    LEFT JOIN storage_foodbasicinfo sfo on sfo.house_id = sqk.house_id and sfo.warehouse_id = sqk.warehouse_id
+    LEFT JOIN storage_foodbasicinfochecks sf on sf.qualitycheck_id = sqk.id
     <where>
       <if test="id !=null">
         and sqk.id = #{id}
@@ -1666,8 +1666,8 @@
         and sqk.check_result = #{checkResult}
       </if>
     </where>
-    /*GROUP BY sqk.id
-    order by sqk.id desc*/
+    GROUP BY sqk.id
+    order by sqk.id desc
   </select>
 
   <select id="getStoreQualityList"  resultType="java.util.Map" parameterType="java.lang.Integer">
@@ -1678,7 +1678,7 @@
     type=5 and history_status=0 and store_quality=1 and org_id =#{orgId} ;
   </select>
 
-  
+
   <select id="getTrdStoreQualityList" resultType="java.util.Map">
     select
       house_id,warehouse_id,quality,sub_type_detailed,level,number
@@ -1689,7 +1689,7 @@
 
 
   <select id="getDataByZJId" resultMap="BaseResultMap" parameterType="java.util.Map" >
-  
+
   <if test="planType == '7121'"><!-- 油 -->
 	SELECT
 		quality.*, acceptance.id acceptanceId,
@@ -1702,7 +1702,7 @@
 	WHERE
 		acceptance.plan_id = #{ZZid,jdbcType=VARCHAR} and acceptance.id =#{id}
   </if>
-  
+
    <if test="planType == '3156'"><!-- 粮 -->
 		SELECT
 			quality.*, acceptance.id acceptanceId,
@@ -1717,7 +1717,7 @@
 		WHERE
 			acceptance.plan_id = #{ZZid,jdbcType=VARCHAR} and acceptance.id =#{id}
    </if>
-    
+
   </select>
 
   <!--封仓的数据（油罐）-->