diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index d52c244..ce845a9 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -115,8 +115,15 @@ public class OrderController { page.getRecords().forEach(order -> { OrderMdResponse response = new OrderMdResponse(); BeanUtil.copyProperties(order, response); - String name = invWarehouseDao.selectNameByCode(order.getLocStorageCode()); - response.setLocStorageName(name); + + //查询仓库名称 + String locStorageName = invWarehouseDao.selectNameByCode(order.getLocStorageCode()); + response.setLocStorageName(locStorageName); + + //查询单据类型名称 + String busTypeName = bussinessTypeService.findNameByAction(order.getAction()); + response.setBusName(busTypeName); + //查询是否可以补单 if (StrUtil.isNotBlank(order.getSupplementNo())) { //已经补单过了 diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java index 4b84530..614176b 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java @@ -32,6 +32,14 @@ public class OrderEntity { private String fromCorp; + /** + * 单据状态 + * -1: 等待提交 + * 1.待处理 + * 2.正在处理 + * 3.已完成 + * 9.异常 + */ private Integer status; private String remark; diff --git a/src/main/java/com/glxp/udi/admin/res/inout/OrderMdResponse.java b/src/main/java/com/glxp/udi/admin/res/inout/OrderMdResponse.java index 31054b0..8a385ac 100644 --- a/src/main/java/com/glxp/udi/admin/res/inout/OrderMdResponse.java +++ b/src/main/java/com/glxp/udi/admin/res/inout/OrderMdResponse.java @@ -12,29 +12,99 @@ import java.util.Date; public class OrderMdResponse { private String id; + + /** + * 单据号 + */ private String orderId; + + /** + * 单据类型 + */ private String action; + + /** + * 单据类型名称 + */ + private String busName; + + /** + * 流水号 + */ private String corpOrderId; + + /** + * 创建时间 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actDate; + + /** + * 往来单位ID + */ private String fromCorpId; + + /** + * 创建人 + */ private String actor; + + /** + * 进出库类型 + */ private String mainAction; + + /** + * 往来单位名称 + */ private String fromCorp; + + /** + * 单据状态 + */ private Integer status; + + /** + * 备注 + */ private String remark; + + /** + * 导出状态 + */ private String exportStatus; + + /** + * 单据来源 + */ private String fromType; private String contrastStatus; private String erpFk; - private String uploadStatus; //上传状态(0:未上传,1:已上传) + + /** + * 上传状态(0:未上传,1:已上传) + */ + private String uploadStatus; + + /** + * 客户ID + */ private Long customerId; - private String invStorageCode; - private String invWarehouseCode; + /** + * 出入库仓库码 + */ private String locStorageCode; - private String locStorageName; //出入库仓库名称 - private String nameCode; //最小销售标识 + + /** + * 出入库仓库名称 + */ + private String locStorageName; + + /** + * 最小销售标识 + */ + private String nameCode; //启用默认补单 private boolean enableSupplementOrder;