From 2c945116a7d4dccac387930e40980ae1ba32f05c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 30 三月 2024 16:18:58 +0800
Subject: [PATCH] 物料导入更新 任务完成不解绑站点和容器 组托入库时增加判断是否容器和接驳位已经绑定

---
 src/main/java/com/zy/asrs/controller/PackController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 0d72bf8..542d0a8 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -49,7 +49,7 @@
         excludeTrash(param);
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
-            wrapper.orderBy("create_time", false);
+            wrapper.orderBy("settle").orderBy("create_time", false);
         }
         return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -88,6 +88,7 @@
         mat.setStatus(1);
         mat.setCreateTime(now);
         mat.setUpdateTime(now);
+        mat.setMemo("鎵撳寘涓婄嚎");
         if (!matService.insert(mat)) {
             throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
         }

--
Gitblit v1.9.1