#

whycq

2024-05-05 0146de915c3bb74dcce2c39debcbdb8cf692623d

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

@@ -133,22 +133,33 @@
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            docIds.add(pakin.getDocId());
        }
        EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
        List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
        List<String> orderNos = new ArrayList<>();
        for (Order order : orders) {
            orderNos.add(order.getOrderNo());
        }
        wrapper.in("order_no",orderNos);
        wrapper.in("source",docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
//        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
//        excludeTrash(param);
//        convert(param, wrapper);
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
//            wrapper.orderBy("create_time", false);
//        }
//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
//        List<Long> docIds = new ArrayList<>();
//        for (DocType pakin : pakins) {
//            docIds.add(pakin.getDocId());
//        }
//        EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
//        List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
//        List<String> orderNos = new ArrayList<>();
//        for (Order order : orders) {
//            orderNos.add(order.getOrderNo());
//        }
//        wrapper.in("order_no",orderNos);
//        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/detl/all/auth")
@@ -572,6 +583,7 @@
            if (orderDetl == null) {
                orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                orderDetl.setSource(docType.getDocId().intValue());
                orderDetl.setBatch(null);
                orderDetl.setAnfme(anfme);
                orderDetl.setOrderId(order.getId());
@@ -596,4 +608,51 @@
        return R.ok("导入成功");
    }

    /**
     * excel导入
     */
    @PostMapping(value = "/order/excel/import2/auth")
    @ManagerAuth(memo = "销售单Excel导入")
    @Transactional
    public R cstmrExcelImport2(MultipartFile file) throws IOException {
        InputStream inStream = file.getInputStream();
        String fileMime = file.getContentType();
        int excelVersion = 2007;
        if ("application/vnd.ms-excel".equals(fileMime)) {
            excelVersion = 2003;
        }
        Workbook book = null;
        try {
            if (excelVersion == 2003) {
                book = new HSSFWorkbook(inStream);
            }
            else {  // 当 excel 是 2007 时
                book = new XSSFWorkbook(inStream);
            }
        } catch (Exception e) {
            log.error("fail", e);
            return R.error("导入文件格式错误，请使用xls后缀的文件！");
        }

        Sheet sheet = book.getSheetAt(0);
        int totalRows = sheet.getLastRowNum() + 1;    // 总
        DataFormatter dataFormatter = new DataFormatter();
        List<String> strs = new ArrayList<>();
        for (int i = 1; i < totalRows; i++) {
            Row row = sheet.getRow(i);
            //单据类型
            String docName =  dataFormatter.formatCellValue(row.getCell(0));
            //单据编号
            String uuid = dataFormatter.formatCellValue(row.getCell(1));
            //物料号
            String matnr = dataFormatter.formatCellValue(row.getCell(2));
            Mat mat = matService.selectByMatnr(matnr);
            if (null == mat) {
                strs.add(matnr);
//                throw new CoolException(matnr + "商品编码的商品不存在，请检查！");
            }
        }
        return R.ok("导入成功").add(strs);
    }

}