质检

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

@@ -49,6 +49,7 @@
     <result column="auth_code" jdbcType="VARCHAR" property="authCode" />
     <result column="org_id" jdbcType="INTEGER" property="orgId" />
     <result column="history_status" jdbcType="INTEGER" property="historyStatus" />
+    <result column="seal_date" jdbcType="TIMESTAMP" property="sealDate" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -133,7 +134,8 @@
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
-    <include refid="Base_Column_List" />
+    <include refid="Base_Column_List" />,
+    seal_date
     from storage_foodbasicinfo
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -325,6 +327,9 @@
       <if test="historyStatus != null">
         history_status,
       </if>
+      <if test="sealDate != null">
+        seal_date,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -468,6 +473,9 @@
       <if test="historyStatus != null">
         #{historyStatus,jdbcType=INTEGER},
       </if>
+      <if test="sealDate != null">
+        #{sealDate,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample" resultType="java.lang.Integer">
@@ -899,6 +907,7 @@
         bs.design_capacity design_house_capacity,
         sf.length,
         sf.width,
+        sf.seal_date,
         bs.storeHouse_name storehouseName,
         bw.warehouse_name wareHouseName,
         <!--bs.depot_name keep_unite,-->
@@ -927,8 +936,7 @@
   temp_sqk.id sqkid,
   temp_sqk.full_good_ration fullGoodRation,
   temp_sqk.husked_ration huskedRation,
-  temp_sqk.location location,
-  temp_sqk.seal_date sealDate
+  temp_sqk.location location
       FROM
         storage_foodbasicinfo sf
       LEFT JOIN basic_warehouse bw ON bw.storehouse_id = sf.house_id
@@ -1005,13 +1013,12 @@
 
 <select id="queryByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample" resultMap="BaseResultMap">
     select DISTINCT
-    sq.seal_date sealDate,
     <include refid="ExtBase_Column_List" />,
+    sfo.seal_date,
     bs.storeHouse_name storehouseName,bw.warehouse_name wareHouseName
     FROM storage_foodbasicinfo sfo
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = sfo.house_id
     LEFT JOIN basic_warehouse bw on bw.warehouse_id = sfo.warehouse_id
-    LEFT JOIN storage_qualitycheck sq on sq.warehouse_id = sfo.warehouse_id
    <where>
       <if test="houseId != null">
         and sfo.house_id = #{houseId}
@@ -1025,7 +1032,6 @@
      <if test="historyStatus != null">
        and sfo.history_status = #{historyStatus}
      </if>
-     and sq.seal_date > 0
    </where>
   order by sfo.id desc
 </select>

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

@@ -1892,12 +1892,10 @@
     select
     <include refid="ExtBase_Column_List" />,
     bs.storeHouse_name storehouseName,
-    bw.warehouse_name wareHouseName,
-    sfo.id foodbasicinfoId
+    bw.warehouse_name wareHouseName
     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 storage_foodbasicinfo sfo on sfo.house_id = sqk.house_id and sfo.warehouse_id = sqk.warehouse_id
     <where>
       <if test="houseId !=null">
         and sqk.house_id = #{houseId}
@@ -1929,8 +1927,8 @@
       <if test="checkResult !=null">
         and sqk.check_result = #{checkResult}
       </if>
-    </where>
-    group by sfo.id
+   </where>
+  <!--   group by sfo.id-->
     order by sqk.id desc
   </select>
 

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

@@ -206,6 +206,7 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
         //1.2封仓时间
         Date date=foodbasicInfo.getSealDate();
         qualitycheck.setSealDate(date);
+        foodbasicInfo.setSealDate(date);
         //⑦更新货位的状态
       //  warehouse.setWarehouseStatus(2965);//满货位