From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 18 一月 2025 17:06:18 +0800
Subject: [PATCH] # 6. 大屏添加作业类型 (全盘,还是分拣  IOType) 10.平库出库时,当前平库ID是写死在Sql里,需修改 11.平库出库没有判断是否预约出库,且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细,可以再次拣货,拣货明细需添加一个拣货状态 47. 确认发货前,需判断是否已绑定至集货区 48. CTU出库后,库位103不再删除原有库位信息

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java |   86 ++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java
index 586beef..ec05683 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java
@@ -1,42 +1,44 @@
-package com.zy.asrs.wms.asrs.entity.dto;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-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 MergePreviewDto {
-
-    private String matnr;
-
-    private String batch;
-
-    private Double anfme;
-
-    private List<Long> orderIds;
-
-    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);
-    }
-
-}
+package com.zy.asrs.wms.asrs.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+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 MergePreviewDto {
+
+    private String matnr;
+
+    private String batch;
+
+    private Double anfme;
+
+    private Double workQty;
+
+    private List<Long> orderIds;
+
+    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);
+    }
+
+}

--
Gitblit v1.9.1