Merge branch 'dev' into pre-production

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml

@@ -8,6 +8,7 @@
         where inventory_id in (185,187,188,189)
           and orderSelfNum = #{orderCode}
           and status = 2
+          and delete_time = 0
             limit 1
     </select>
 
@@ -17,6 +18,7 @@
         where inventory_id in (185,187,188,189)
           and unitNo = #{unitNo}
           and status = 2
+          and delete_time = 0
             limit 1
     </select>