ZeroLiYi преди 1 година
родител
ревизия
a831d6943b
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      src/main/java/com/chinaitop/depot/storage/mapper/WarehouseSealingRecordMapper.xml

+ 3 - 1
src/main/java/com/chinaitop/depot/storage/mapper/WarehouseSealingRecordMapper.xml

@@ -207,6 +207,7 @@
207
         business_qc_quality_inspection bqqi
207
         business_qc_quality_inspection bqqi
208
           LEFT JOIN basic_storehouse bs ON bs.storehouse_id = bqqi.basic_storehouse_id
208
           LEFT JOIN basic_storehouse bs ON bs.storehouse_id = bqqi.basic_storehouse_id
209
       WHERE
209
       WHERE
210
+        bs.del_flag=1 and
210
       bqqi.org_id=#{orgId} and bqqi.jylb='01'
211
       bqqi.org_id=#{orgId} and bqqi.jylb='01'
211
       ORDER BY bqqi.id desc
212
       ORDER BY bqqi.id desc
212
 
213
 
@@ -221,6 +222,7 @@
221
       basic_warehouse bw
222
       basic_warehouse bw
222
         LEFT JOIN basic_unit_aisle bua ON bw.aisle_id = bua.id
223
         LEFT JOIN basic_unit_aisle bua ON bw.aisle_id = bua.id
223
     WHERE
224
     WHERE
225
+      bw.del_flag=1 and
224
      bw.storehouse_id=#{storehouseId}
226
      bw.storehouse_id=#{storehouseId}
225
   </select>
227
   </select>
226
   <select id="findkcsw"  parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.kcswVO">
228
   <select id="findkcsw"  parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.kcswVO">
@@ -240,7 +242,7 @@
240
       dj.enumname as "grainGradeName",
242
       dj.enumname as "grainGradeName",
241
       shnd.enumname as shnd
243
       shnd.enumname as shnd
242
     from data_kcgl_kcsw_default kc
244
     from data_kcgl_kcsw_default kc
243
-           LEFT JOIN  basic_warehouse bw on kc.hwh = bw.warehouse_id
245
+           LEFT JOIN  basic_warehouse bw on kc.hwh = bw.warehouse_id and  bw.del_flag=1
244
            LEFT JOIN depot_qh.basic_enum pz on pz.enumId = kc.mxpz
246
            LEFT JOIN depot_qh.basic_enum pz on pz.enumId = kc.mxpz
245
            LEFT JOIN depot_qh.basic_enum xz on xz.enumId = kc.hwxz
247
            LEFT JOIN depot_qh.basic_enum xz on xz.enumId = kc.hwxz
246
            LEFT JOIN depot_qh.basic_enum dj on dj.enumId = kc.dj
248
            LEFT JOIN depot_qh.basic_enum dj on dj.enumId = kc.dj