diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MoServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MoServiceImpl.java index 3cefe25..ad579d7 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MoServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MoServiceImpl.java @@ -135,8 +135,21 @@ public class MoServiceImpl implements MoService { List> list = new ArrayList<>(); for (MoDto mo : all) { Map map = new LinkedHashMap<>(); - map.put("自制件工单id", mo.getSelfWorkOrderId()); - + map.put("送货单头ID", mo.getDeliveryHeaderId()); + map.put("MO票",mo.getLabelNo()); + map.put("物料编码",mo.getItem().getCode()); + map.put("物料描述",mo.getItem().getName()); + map.put("可用数量",mo.getQty()); + map.put("标签类型",mo.getLabelType()); + map.put("是否有效",mo.getDeleteFlag()); + map.put("标签状态",mo.getLabelState()); + map.put("检验状态",mo.getCheckResult()); + map.put("mls子库",mo.getInvCode()); + map.put("mls入库时间",mo.getDatetimeStockIn()); + map.put("mls修改时间",mo.getMlsUpdateTime()); + map.put("mls创建时间",mo.getMlsCreateTime()); + map.put("wms接收时间",mo.getCreateTime()); + map.put("wms修改时间",mo.getUpdateTime()); list.add(map); } FileUtil.downloadExcel(list, response); 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 8ae9be0..66d9534 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 @@ -132,8 +132,21 @@ public class OrderServiceImpl implements OrderService { List> list = new ArrayList<>(); for (OrderDto order : all) { Map map = new LinkedHashMap<>(); - map.put("送货单条码号", order.getBarcodeNumber()); - + 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);