#

Junjie

2024-07-29 424a19bf101e901e82703be17b6fb5be0f598942

#

 zy-asrs-admin/src/components/order/index.vue

@@ -186,7 +186,9 @@
}

const handleExport = async (intl) => {
  postBlob('/api/order/export', {}).then(result => {
  postBlob('/api/order/export', {
    ioModel: props.ioModel
  }).then(result => {
    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
    window.location.href = window.URL.createObjectURL(blob);
    return true;

 zy-asrs-admin/src/views/in/order/index.vue

@@ -4,7 +4,7 @@

<script>
export default {
  name: '订单'
  name: '入库订单'
}
</script>


 zy-asrs-admin/src/views/out/order/index.vue

New file
@@ -0,0 +1,17 @@
<script setup>
import OrderView from '@/components/order/index.vue';
</script>

<script>
export default {
  name: '出库订单'
}
</script>

<template>
  <div>
    <OrderView ioModel="out"  />
  </div>
</template>

<style></style>

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java

@@ -153,7 +153,18 @@
    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(orderService.list(), Order.class), response);
        String ioModel = map.getOrDefault("ioModel", "").toString();
        List<Order> list = orderService.list();
        if (!Cools.isEmpty(ioModel)) {
            LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
            ArrayList<Long> types = new ArrayList<>();
            for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, ioModel.equals("in") ? 1 : 2))) {
                types.add(orderType.getId());
            }
            wrapper.in(Order::getOrderType, types);
            list = orderService.list(wrapper);
        }
        ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
    }

}