From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 25 十二月 2024 17:13:34 +0800
Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后，状态修改补上 4. 修改状态时，需校验上一步状态是否对应 5. 下发任务完成后，查看是否修改状态为2 7. 任务状态列表，数据显示不全问题修复 8. 波次列表，表格合并问题导致多订单出库问题
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultDto.java | 100 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultDto.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultDto.java
index 3c701e9..7f36075 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultDto.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultDto.java
@@ -1,49 +1,51 @@
-package com.zy.asrs.wms.asrs.entity.dto;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.wms.asrs.entity.param.FieldParam;
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class MergePreviewResultDto {
-
- private String matnr;
-
- private String batch;
-
- private Double anfme;
-
- private List<Long> orderIds;
-
- private List<MergePreviewResultLocDto> locs;
-
- private List<FieldParam> fieldParams;
-
- private String fieldParamsEncode;
-
- //鍔ㄦ�佹墿灞曞瓧娈�
- public transient Map<String, Object> dynamicFields = new HashMap<>();
-
- @JsonAnyGetter
- public Map<String,Object> getDynamicFields() {
- return dynamicFields;
- }
-
- public String getFieldString(String key) {
- return dynamicFields.get(key).toString();
- }
-
- public void setField(String key, Object value) {
- dynamicFields.put(key, value);
- }
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-}
+package com.zy.asrs.wms.asrs.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.entity.param.FieldParam;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class MergePreviewResultDto {
+
+ private String matnr;
+
+ private String batch;
+
+ private Double anfme;
+
+ private List<Long> orderIds;
+
+ private List<MergePreviewResultLocDto> locs;
+
+ private List<MergePreviewResultLocDto> otherLocs;
+
+ private List<FieldParam> fieldParams;
+
+ private String fieldParamsEncode;
+
+ //鍔ㄦ�佹墿灞曞瓧娈�
+ public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+ @JsonAnyGetter
+ public Map<String,Object> getDynamicFields() {
+ return dynamicFields;
+ }
+
+ public String getFieldString(String key) {
+ return dynamicFields.get(key).toString();
+ }
+
+ public void setField(String key, Object value) {
+ dynamicFields.put(key, value);
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
--
Gitblit v1.9.1