From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultDto.java | 105 ++++++++++++++++++++++++++++------------------------
1 files changed, 56 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..4d04854 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,56 @@
-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 Double fetchQty;
+ //搴撲綅绫诲瀷
+ private String type;
+
+ 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