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/WaitPakinLogController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index ab32674..d0d8bc2 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -45,7 +45,7 @@
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
else {
- wrapper.orderBy("id", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -73,7 +73,7 @@
@RequestMapping(value = "/waitPakinLog/update/auth")
@ManagerAuth
public R update(WaitPakinLog waitPakinLog){
- if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
+ if (Cools.isEmpty(waitPakinLog)){
return R.error();
}
waitPakinLogService.updateById(waitPakinLog);
@@ -113,8 +113,8 @@
List<Map<String, Object>> result = new ArrayList<>();
for (WaitPakinLog waitPakinLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakinLog.getId());
- map.put("value", waitPakinLog.getId());
+ map.put("id", waitPakinLog.getZpallet());
+ map.put("value", waitPakinLog.getZpallet());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1