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/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