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/enums/OrderSettleType.java |   83 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java
index 3efe1c5..aef90d4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/OrderSettleType.java
@@ -1,41 +1,42 @@
-package com.zy.asrs.wms.asrs.entity.enums;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.LocSts;
-import com.zy.asrs.wms.asrs.entity.OrderSettle;
-import com.zy.asrs.wms.asrs.service.LocStsService;
-import com.zy.asrs.wms.asrs.service.OrderSettleService;
-
-public enum OrderSettleType {
-
-    INIT(0, "鍒濆鍖�"),
-    WAIT(1, "寰呭鐞�"),
-    WORKING(2, "浣滀笟涓�"),
-    CANCEL(3, "宸插彇娑�"),
-    COMPLETE(4, "宸插畬鎴�"),
-    WAIT_CANCEL(5, "鍑嗗鍙栨秷"),
-    REPORT_COMPLETE(6, "涓婃姤瀹屾垚"),
-    ;
-
-
-    public Integer id;
-    public String desc;
-
-    OrderSettleType(Integer id, String desc) {
-        this.id = id;
-        this.desc = desc;
-    }
-
-    public long val() {
-        OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
-        OrderSettle orderSettle = service.getOne(new LambdaQueryWrapper<OrderSettle>().eq(OrderSettle::getSettle, id));
-        if (orderSettle == null) {
-            throw new CoolException("LocStsType Error!");
-        }
-        return orderSettle.getId();
-    }
-
-
-}
+package com.zy.asrs.wms.asrs.entity.enums;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.LocSts;
+import com.zy.asrs.wms.asrs.entity.OrderSettle;
+import com.zy.asrs.wms.asrs.service.LocStsService;
+import com.zy.asrs.wms.asrs.service.OrderSettleService;
+
+public enum OrderSettleType {
+
+    INIT(0, "鍒濆鍖�"),
+    WAIT(1, "寰呭鐞�"),
+    WAVE(2, "娉㈡鐢熸垚"),
+    WORKING(3, "浣滀笟涓�"),
+    CANCEL(4, "宸插彇娑�"),
+    COMPLETE(5, "宸插畬鎴�"),
+    WAIT_CANCEL(6, "鍑嗗鍙栨秷"),
+    REPORT_COMPLETE(7, "涓婃姤瀹屾垚"),
+    ;
+
+
+    public Integer id;
+    public String desc;
+
+    OrderSettleType(Integer id, String desc) {
+        this.id = id;
+        this.desc = desc;
+    }
+
+    public long val() {
+        OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
+        OrderSettle orderSettle = service.getOne(new LambdaQueryWrapper<OrderSettle>().eq(OrderSettle::getSettle, id));
+        if (orderSettle == null) {
+            throw new CoolException("LocStsType Error!");
+        }
+        return orderSettle.getId();
+    }
+
+
+}

--
Gitblit v1.9.1