no message
parent
2c55aa09e6
commit
a5d73dc89f
|
|
@ -109,10 +109,8 @@ public class OrderServiceImpl implements OrderService {
|
||||||
Query query = entityManager.createQuery(hql); // 这里的query是org.hibernate.query.Query
|
Query query = entityManager.createQuery(hql); // 这里的query是org.hibernate.query.Query
|
||||||
query.setParameter("barcodeNumbers", barcodeNumbers);
|
query.setParameter("barcodeNumbers", barcodeNumbers);
|
||||||
List<Order> orders = query.getResultList();
|
List<Order> orders = query.getResultList();
|
||||||
if (orders.size() > 0) {
|
for (Order order : orders) {
|
||||||
for (Order order : orders) {
|
result.put(order.getBarcodeNumber(), order);
|
||||||
result.put(order.getBarcodeNumber(), order);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
@ -175,21 +173,21 @@ public class OrderServiceImpl implements OrderService {
|
||||||
List<Map<String, Object>> list = new ArrayList<>();
|
List<Map<String, Object>> list = new ArrayList<>();
|
||||||
for (OrderDto order : all) {
|
for (OrderDto order : all) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("送货单ID",order.getDeliveryHeaderId());
|
map.put("送货单ID", order.getDeliveryHeaderId());
|
||||||
map.put("送货单条码",order.getBarcodeNumber());
|
map.put("送货单条码", order.getBarcodeNumber());
|
||||||
map.put("物料编码",order.getItemCode());
|
map.put("物料编码", order.getItemCode());
|
||||||
map.put("检验结果",order.getIqcResult());
|
map.put("检验结果", order.getIqcResult());
|
||||||
map.put("送货单状态",order.getDeliveryStatus());
|
map.put("送货单状态", order.getDeliveryStatus());
|
||||||
map.put("计划数量",order.getDeliveryQty());
|
map.put("计划数量", order.getDeliveryQty());
|
||||||
map.put("接收数量",order.getReceivedQty());
|
map.put("接收数量", order.getReceivedQty());
|
||||||
map.put("供应商编码",order.getSupplierCode());
|
map.put("供应商编码", order.getSupplierCode());
|
||||||
map.put("供应商名称",order.getSupplierName());
|
map.put("供应商名称", order.getSupplierName());
|
||||||
map.put("送货单号",order.getDeliveryNumber());
|
map.put("送货单号", order.getDeliveryNumber());
|
||||||
map.put("是否检验",order.getIsIqcInspected());
|
map.put("是否检验", order.getIsIqcInspected());
|
||||||
map.put("检验员",order.getInInspector());
|
map.put("检验员", order.getInInspector());
|
||||||
map.put("mls修改时间",order.getMlsUpdateTime());
|
map.put("mls修改时间", order.getMlsUpdateTime());
|
||||||
map.put("wms接收时间",order.getCreateTime());
|
map.put("wms接收时间", order.getCreateTime());
|
||||||
map.put("wms修改时间",order.getUpdateTime());
|
map.put("wms修改时间", order.getUpdateTime());
|
||||||
list.add(map);
|
list.add(map);
|
||||||
}
|
}
|
||||||
FileUtil.downloadExcel(list, response);
|
FileUtil.downloadExcel(list, response);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue