Преглед на файлове

Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

tanzhongran преди 4 години
родител
ревизия
439e9e5e72
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2 3
      abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

+ 2 - 3
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -92,10 +92,9 @@
             mapping.qr_code_count
         FROM
             qr_box_mapping AS mapping
-            LEFT JOIN qr_package AS qpckage on qpckage.id=mapping.package_id
+            LEFT JOIN qr_package AS qpckage ON qpckage.id = mapping.package_id
             LEFT JOIN base_material AS material ON material.id = qpckage.material_id
-            LEFT JOIN base_active_qr_package_mapping AS active_package ON active_package.qr_package_id = qpckage.id
-            LEFT JOIN base_active AS active ON active.id = active_package.active_id
+            LEFT JOIN base_active AS active ON active.id = material.active_id
             WHERE mapping.box_code = #{req.boxCode} AND mapping.is_delete = 0
     </select>