diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/OrderServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/OrderServiceImpl.java index 6a14b9a..19b65e2 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/OrderServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/OrderServiceImpl.java @@ -109,10 +109,8 @@ public class OrderServiceImpl implements OrderService { Query query = entityManager.createQuery(hql); // 这里的query是org.hibernate.query.Query query.setParameter("barcodeNumbers", barcodeNumbers); List orders = query.getResultList(); - if (orders.size() > 0) { - for (Order order : orders) { - result.put(order.getBarcodeNumber(), order); - } + for (Order order : orders) { + result.put(order.getBarcodeNumber(), order); } return result; } @@ -175,21 +173,21 @@ public class OrderServiceImpl implements OrderService { List> list = new ArrayList<>(); for (OrderDto order : all) { Map map = new LinkedHashMap<>(); - map.put("送货单ID",order.getDeliveryHeaderId()); - map.put("送货单条码",order.getBarcodeNumber()); - map.put("物料编码",order.getItemCode()); - map.put("检验结果",order.getIqcResult()); - map.put("送货单状态",order.getDeliveryStatus()); - map.put("计划数量",order.getDeliveryQty()); - map.put("接收数量",order.getReceivedQty()); - map.put("供应商编码",order.getSupplierCode()); - map.put("供应商名称",order.getSupplierName()); - map.put("送货单号",order.getDeliveryNumber()); - map.put("是否检验",order.getIsIqcInspected()); - map.put("检验员",order.getInInspector()); - map.put("mls修改时间",order.getMlsUpdateTime()); - map.put("wms接收时间",order.getCreateTime()); - map.put("wms修改时间",order.getUpdateTime()); + map.put("送货单ID", order.getDeliveryHeaderId()); + map.put("送货单条码", order.getBarcodeNumber()); + map.put("物料编码", order.getItemCode()); + map.put("检验结果", order.getIqcResult()); + map.put("送货单状态", order.getDeliveryStatus()); + map.put("计划数量", order.getDeliveryQty()); + map.put("接收数量", order.getReceivedQty()); + map.put("供应商编码", order.getSupplierCode()); + map.put("供应商名称", order.getSupplierName()); + map.put("送货单号", order.getDeliveryNumber()); + map.put("是否检验", order.getIsIqcInspected()); + map.put("检验员", order.getInInspector()); + map.put("mls修改时间", order.getMlsUpdateTime()); + map.put("wms接收时间", order.getCreateTime()); + map.put("wms修改时间", order.getUpdateTime()); list.add(map); } FileUtil.downloadExcel(list, response);