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/template/OrderTemplate.java |  158 ++++++++++++++++++++++++++--------------------------
 1 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java
index 7876a3d..8772755 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java
@@ -1,79 +1,79 @@
-package com.zy.asrs.wms.asrs.entity.template;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.zy.asrs.common.utils.Synchro;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-public class OrderTemplate {
-
-    //璁㈠崟缂栧彿
-    @ApiModelProperty(value= "璁㈠崟缂栧彿")
-    private String orderNo;
-
-    //鍗曟嵁绫诲瀷
-    @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
-    private String orderType;
-
-    //鍟嗗搧缂栧彿
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
-    private String matnr;
-
-    //鎵瑰彿
-    @ApiModelProperty(value= "鎵瑰彿")
-    private String batch;
-
-    //鏁伴噺
-    @ApiModelProperty(value= "鏁伴噺")
-    private Double anfme;
-
-    //澶囨敞
-    @ApiModelProperty(value= "澶囨敞")
-    private String memo;
-
-    public void sync(Object source) {
-        Synchro.Copy(source, this);
-    }
-
-    //鍔ㄦ�佹墿灞曞瓧娈�
-    public transient Map<String, Object> dynamicFields = new HashMap<>();
-
-    @JsonAnyGetter
-    public Map<String,Object> getDynamicFields() {
-        return dynamicFields;
-    }
-
-    public void syncFieldMap(Map<String, Object> map) {
-        ArrayList<String> keys = new ArrayList<>();
-        Field[] fields = this.getClass().getDeclaredFields();
-        for (Field field : fields) {
-            keys.add(field.getName());
-        }
-        keys.add("detlId");
-
-        Map<String, Object> dynamicFields = new HashMap<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            if (keys.contains(entry.getKey())) {
-                continue;
-            }
-            dynamicFields.put(entry.getKey(), entry.getValue());
-        }
-
-        this.dynamicFields = 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.template;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class OrderTemplate {
+
+    //璁㈠崟缂栧彿
+    @ApiModelProperty(value= "璁㈠崟缂栧彿")
+    private String orderNo;
+
+    //鍗曟嵁绫诲瀷
+    @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+    private String orderType;
+
+    //鍟嗗搧缂栧彿
+    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    private String matnr;
+
+    //鎵瑰彿
+    @ApiModelProperty(value= "鎵瑰彿")
+    private String batch;
+
+    //鏁伴噺
+    @ApiModelProperty(value= "鏁伴噺")
+    private Double anfme;
+
+    //澶囨敞
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
+
+    //鍔ㄦ�佹墿灞曞瓧娈�
+    public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+    @JsonAnyGetter
+    public Map<String,Object> getDynamicFields() {
+        return dynamicFields;
+    }
+
+    public void syncFieldMap(Map<String, Object> map) {
+        ArrayList<String> keys = new ArrayList<>();
+        Field[] fields = this.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            keys.add(field.getName());
+        }
+        keys.add("detlId");
+
+        Map<String, Object> dynamicFields = new HashMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            if (keys.contains(entry.getKey())) {
+                continue;
+            }
+            dynamicFields.put(entry.getKey(), entry.getValue());
+        }
+
+        this.dynamicFields = 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