From 432cbb77730e5d598433655aa8594321dd0e56b8 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 13 一月 2022 08:07:07 +0800
Subject: [PATCH] 更新数据库
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 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 5644309..c8ee4df 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -10,14 +10,17 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.Item;
+import zy.cloud.wms.manager.entity.ProjectPlan;
import zy.cloud.wms.manager.entity.ProjectType;
import zy.cloud.wms.manager.service.CstmrService;
import zy.cloud.wms.manager.service.ItemService;
+import zy.cloud.wms.manager.service.ProjectPlanService;
import zy.cloud.wms.manager.service.ProjectTypeService;
import java.util.*;
@@ -28,9 +31,7 @@
@Autowired
private ItemService itemService;
@Autowired
- private CstmrService cstmrService;
- @Autowired
- private ProjectTypeService projectTypeService;
+ private ProjectPlanService planService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -49,6 +50,7 @@
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
+ wrapper.orderBy("status",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -73,19 +75,14 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- Cstmr user_code = cstmrService.selectOne(new EntityWrapper<Cstmr>()
- .eq("user_code", item.getCstmrUuid()));
- if (!Cools.isEmpty(user_code)) {
- item.setCstmr(user_code.getName());
- }else {
- return R.error("鍙傛暟閿欒,璇疯緭鍏ユ纭殑瀹㈡埛缂栧彿");
+
+ if (!item.getType().equals("1")) {
+ throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
- ProjectType id = projectTypeService.selectOne(new EntityWrapper<ProjectType>()
- .eq("id", item.getType()));
- if (!Cools.isEmpty(id)) {
- item.setType(id.getTypeName());
- }else {
- return R.error("鍙傛暟閿欒,鎵句笉鍒拌椤圭洰绫诲瀷");
+ Item name = itemService.selectOne(new EntityWrapper<Item>()
+ .eq("name", item.getName()));
+ if (!Cools.isEmpty(name)) {
+ throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
}
item.setHostId(getHostId());
@@ -94,7 +91,7 @@
item.setStatus(1);
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
- itemService.insert(item);
+ itemService.insertAll(item);
return R.ok();
}
@@ -104,23 +101,10 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- Cstmr user_code = cstmrService.selectOne(new EntityWrapper<Cstmr>()
- .eq("user_code", item.getCstmrUuid()));
- if (!Cools.isEmpty(user_code)) {
- item.setCstmr(user_code.getName());
- }else {
- return R.error("鍙傛暟閿欒,璇疯緭鍏ユ纭殑瀹㈡埛缂栧彿");
+
+ if (!item.getType().equals("1")) {
+ throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
- ProjectType id = projectTypeService.selectOne(new EntityWrapper<ProjectType>()
- .eq("id", item.getType()));
- if (!Cools.isEmpty(id)) {
- item.setType(id.getTypeName());
- }else {
- return R.error("鍙傛暟閿欒,鎵句笉鍒拌椤圭洰绫诲瀷");
- }
-// if (Cools.isEmpty(item) || null==item.getUuid()){
-// return R.error();
-// }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.updateById(item);
@@ -130,10 +114,14 @@
@RequestMapping(value = "/item/delete/auth")
@ManagerAuth
public R delete(@RequestParam("ids[]") String param){
+
if (param != null){
itemService.delete(new EntityWrapper<Item>()
.eq("id",param));
+ planService.delete(new EntityWrapper<ProjectPlan>()
+ .eq("item_id",param));
}
+
// List<Item> list = JSONArray.parseArray(param, Item.class);
// if (Cools.isEmpty(list)){
// return R.error();
--
Gitblit v1.9.1