From 8b015b321d4efd4989adaefc1192919f559abf7e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 15:04:08 +0800
Subject: [PATCH] 拣货单增加按照日期查找搜索
---
src/main/java/com/zy/asrs/controller/PlaController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index ba081bb..da4ebed 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -62,9 +62,14 @@
wrapper.eq("brand",param.get("brand"));
param.remove("brand");
}
+ // 娌℃湁閫夋嫨鐨勬椂鍊欓粯璁や笉鏄剧ず宸插嚭搴撶殑鐗╂枡
+ if (Cools.isEmpty(param.get("status"))) {
+ wrapper.ne("status", "鍏ㄩ儴鍑哄簱");
+ }
+
convert(param, wrapper);
- wrapper.orderBy("modify_time",false);
+ wrapper.orderBy("batch",true).orderBy("package_no" ,true);
allLike(Pla.class, param.keySet(), wrapper, condition);
return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -92,6 +97,7 @@
BeanUtils.copyProperties(plaSave,plaLog);
plaLog.setId(null);
plaLog.setCreateTime(new Date());
+ plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
});
@@ -103,7 +109,7 @@
public R delete(@RequestBody List<Pla> plas) {
System.out.println(plas.toString());
plas.forEach(pla -> {
- if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)){
throw new CoolException("宸插叆搴撶殑鏁版嵁鏃犳硶琚垹闄�");
}
Pla plaSave = plaService.selectById(pla.getId());
@@ -114,6 +120,7 @@
BeanUtils.copyProperties(plaSave,plaLog);
plaLog.setId(null);
plaLog.setCreateTime(new Date());
+ plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
});
--
Gitblit v1.9.1