From eddfc83f417efa0c3fd60f4c994abc6d3c92b100 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 09 三月 2022 15:45:30 +0800
Subject: [PATCH] .
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 8c21370..2d2c017 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -47,11 +47,14 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
-// allLike(Item,null,wrapper,param.get("id"));
+ 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));
}
@@ -76,7 +79,7 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
-
+ item.setType("1");
if (!item.getType().equals("1")) {
throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
@@ -84,6 +87,9 @@
.eq("name", item.getName()));
if (!Cools.isEmpty(name)) {
throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
+ }
+ if (item.getRealMonth() < 0){
+ throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
}
item.setHostId(getHostId());
@@ -102,10 +108,14 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
-
+ item.setType("1");
if (!item.getType().equals("1")) {
throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
+// item.setRealMonth(1);
+// if (item.getRealMonth() < 0){
+// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+// }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.update(item,new EntityWrapper<Item>()
--
Gitblit v1.9.1