Browse Source

fix: 修改在库订单导出

pull/9/head
pref_mail@163.com 10 months ago
parent
commit
81ca0d9068
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@ -447,7 +447,7 @@ public class DistributionStockArticleController extends BladeController {
public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map<String, Object> paramMap, BladeUser bladeUser, HttpServletResponse response) {
List<DistributionStockArticleExcel> list = distributionStockArticleService.exportDistributionStockArticle(paramMap);
ExcelUtil.export(response, "已签订单数据" + DateUtil.time(), "已签订单数据数据表", list, DistributionStockArticleExcel.class);
ExcelUtil.export(response, "在库订单明细" + DateUtil.time(), "在库订单明细", list, DistributionStockArticleExcel.class);
}
// /**

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@ -832,7 +832,7 @@
left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
left join logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
<where>
ldsa.is_deleted = 0
ldsa.is_deleted = 0 and ldsa.order_status != '80'
<if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
and ldsa.warehouse_id = #{paramMap.warehouseId}
</if>

Loading…
Cancel
Save