From 72c120049ba6db6eded053e3ba106c2e13696e82 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 21 一月 2022 12:38:54 +0800
Subject: [PATCH] 更新前端
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index a85c32d..854eceb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -47,10 +47,14 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
+ HashSet<String> excludeField = new HashSet<>();
+
+// allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- wrapper.orderBy("status",true);
+// wrapper.orderBy("status",true);
+ wrapper.orderBy("id",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -84,6 +88,9 @@
if (!Cools.isEmpty(name)) {
throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
}
+ if (item.getRealMonth() < 0){
+ throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+ }
item.setHostId(getHostId());
item.setCreateBy(getUserId());
@@ -105,6 +112,9 @@
if (!item.getType().equals("1")) {
throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
+ if (item.getRealMonth() < 0){
+ throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+ }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.update(item,new EntityWrapper<Item>()
--
Gitblit v1.9.1