From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态,显示清楚	(完成) 4. 站点保存报错,	修改人,创建人员显示 错误(完成) 5. agv入库不显示 历史库位记录	(完成) 6. 任务类型,应该为入库	(完成)

---
 src/main/java/com/zy/asrs/controller/PackController.java |    4 +++-
 1 files changed, 3 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..20b7b5a 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));
     }
@@ -83,11 +83,13 @@
         }
         Mat mat = new Mat();
         mat.setTagId(tagService.getTop().getId());
+        mat.setLocType(tagService.getTop().getId());
         mat.setMatnr(barcode);
         mat.setMaktx(barcode);
         mat.setStatus(1);
         mat.setCreateTime(now);
         mat.setUpdateTime(now);
+        mat.setMemo("鎵撳寘涓婄嚎");
         if (!matService.insert(mat)) {
             throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
         }

--
Gitblit v1.9.1