更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1570,7 +1570,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         pageView.put("batchId", warehousingOrder.getBatchId());
         pageView.put("appFlag", "1");
         // 查询入库单总数
-        List<WarehousingOrder> dataList = baseMapper.getListByCondition(pageView);
+        List<WarehousingOrder> dataList = baseMapper.getListByConditionHis(pageView);
 
         Double requestFundsTotal = 0d;//请款合计
         Double inWarehouseWeightTotal = 0d;//重量合计

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -163,8 +163,8 @@
         wor.batch_id as batchId,
         w.issuing_time as issuingTime
         FROM warehousing_order_record wor
-        LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
         left join warehousing_order w on wor.order_id = w.id and w.delete_flag = '0'
+        LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
         WHERE
         wor.delete_flag = '0'
         <if test="startDate != null">