From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期五, 31 五月 2024 14:56:58 +0800 Subject: [PATCH] 仓库: 显示在库信息,入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成,单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔ --- 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