diff --git a/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java b/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java index cbdd52a..d4d66ad 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java @@ -117,17 +117,11 @@ public class BusinDataTask implements Serializable { @Excel(name = "AGV编号") private String agvNo; - /** 冲孔机编号 */ - @Excel(name = "冲孔机编号") - private String punchNo; /** 立库输送线 */ @Excel(name = "立库输送线") private String dpsNoOne; - /** 立库输送线 */ - @Excel(name = "立库输送线") - private String dpsNoTwo; /** 过点时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7") @@ -172,5 +166,10 @@ public class BusinDataTask implements Serializable { */ private String destination; + /** + * AGV任务状态 + */ + private String agvTaskStatus; + } diff --git a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java index 5ae8bee..7282ebe 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java @@ -172,20 +172,25 @@ public class BusinDataTaskServiceImpl extends ServiceImpl