From 7cc7af54ecd780c7d1f33b33f9f5cb4fd96f5f8d Mon Sep 17 00:00:00 2001 From: erdanergou Date: Sun, 27 Nov 2022 16:55:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=93=E5=BA=93=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E3=80=81=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E7=AE=97?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryController.java | 47 +- .../controller/PageController.java | 2 +- .../depository_manage/entity/Depository.java | 220 +--------- .../mapper/DepositoryMapper.java | 4 +- .../mapper/DepositoryMapper.xml | 5 +- .../service/DepositoryService.java | 5 - .../service/impl/DepositoryServiceImpl.java | 401 ++++++++++-------- .../service/impl/MaterialServiceImpl.java | 8 +- .../service/impl/MaterialTypeServiceImpl.java | 155 ++++--- .../utils/LinkInterfaceUtil.java | 40 ++ src/main/resources/static/css/public.css | 1 - .../static/lib/layui-v2.6.3/css/layui.css | 2 +- .../pages/application/application-in.html | 9 +- .../application/application-in_back.html | 9 +- .../application-in_scanQrCode.html | 13 +- .../pages/application/application-out.html | 20 +- .../application/application-out_back.html | 9 +- .../application-out_scanQrCode.html | 13 +- .../pages/application/application-review.html | 4 +- .../application/application-transfer.html | 10 +- .../application-transfer_back.html | 11 +- .../application/application_in_multi.html | 2 +- .../pages/application/application_multi.html | 4 +- .../templates/pages/application/my-apply.html | 3 +- .../templates/pages/application/my-task.html | 8 +- .../templates/pages/company/company_add.html | 2 +- .../templates/pages/company/company_edit.html | 2 +- .../pages/material/material-add.html | 2 +- .../pages/material/material-view.html | 2 +- .../pages/materialtype/materialType_add.html | 2 +- .../pages/materialtype/materialType_edit.html | 2 +- .../templates/pages/other/welcome_mobile.html | 8 +- .../templates/pages/post/post-view.html | 2 +- .../pages/stockTaking/stockTakingReview.html | 4 +- .../resources/templates/pages/user/login.html | 2 +- .../templates/pages/user/login_back.html | 2 +- .../pages/warehouse/depository_add.html | 6 +- .../pages/warehouse/warehouse_view.html | 2 +- .../TestForDepositoryTree.java | 294 +++++++++++++ .../TestForMaterialTree.java | 1 + .../TestForMaterialTypeTree.java | 163 +++++++ 41 files changed, 918 insertions(+), 583 deletions(-) create mode 100644 src/test/java/com/dreamchaser/depository_manage/TestForDepositoryTree.java create mode 100644 src/test/java/com/dreamchaser/depository_manage/TestForMaterialTypeTree.java diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 247fbc6f..a3cd6191 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -1,16 +1,12 @@ package com.dreamchaser.depository_manage.controller; import cn.hutool.core.lang.Snowflake; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.dreamchaser.depository_manage.config.PortConfig; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.*; import com.dreamchaser.depository_manage.service.*; import com.dreamchaser.depository_manage.utils.*; import lombok.Data; -import org.apache.http.protocol.HTTP; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -416,7 +412,7 @@ public class DepositoryController { } List list = depositoryService.findDepositoryRecordPByCondition(map, userByPort); // 获取所有行政单位 - Map administration = findAdministration(userByPort); + Map administration = LinkInterfaceUtil.findAdministration(userByPort); List administrationPList = (List) administration.get("administrationPList"); Integer total = (Integer) administration.get("total"); for (int i = 0; i < list.size(); i++) { @@ -431,44 +427,6 @@ public class DepositoryController { } - /** - * 获取当前行政组织 - * - * @return - */ - public static Map findAdministration(UserByPort userByPort) { - Map map = new HashMap<>(); - String url = PortConfig.external_url + "/org/govlist"; - String superior = "313"; - map.put("superior", superior); - map.put("state", 1); - String jsonString = JSONObject.toJSONString(map); - JSONObject paramObject = JSONObject.parseObject(jsonString); - String post = null; - try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userByPort); - } catch (IOException e) { - e.printStackTrace(); - } - JSONObject jsonObject = JSONObject.parseObject(post); - JSONObject data = (JSONObject) jsonObject.get("data"); - JSONArray list = (JSONArray) data.get("list"); - if (list == null) { - list = new JSONArray(); - } - Integer total = ObjectFormatUtil.toInteger(data.get("total")); - Map result = new HashMap(); - List administrationPList = new ArrayList<>(); - for (int i = 0; i < list.size(); i++) { - Administration administration = JSONObject.toJavaObject((JSONObject) list.get(i), Administration.class); - AdministrationP administrationP = new AdministrationP(administration); - administrationPList.add(administrationP); - } - result.put("administrationPList", administrationPList); - result.put("total", total); - return result; - } - /** * 彻底删除仓库记录（硬删除） * @@ -1609,9 +1567,10 @@ public class DepositoryController { public RestResponse InitTreeMenus(@RequestParam(value = "adminorg", required = false) Integer adminorg) { List list = new ArrayList<>(); if (Integer.compare(0, adminorg) == 0) { - list = depositoryService.InitTreeMenus(); + list = depositoryService.InitTreeMenus(""); } else { list = depositoryService.InitTreeMenus(adminorg.toString()); + } return new RestResponse(list); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 32956152..a897622c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -348,7 +348,7 @@ public class PageController { UserByPort userByPort = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/warehouse/depository_add"); - Map administration = DepositoryController.findAdministration(userByPort); + Map administration = LinkInterfaceUtil.findAdministration(userByPort); List administrationPList = (List) administration.get("administrationPList"); mv.addObject("administrationPList", administrationPList); return mv; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java b/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java index df70bb98..004dfc90 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java @@ -1,11 +1,14 @@ package com.dreamchaser.depository_manage.entity; +import lombok.Data; + /** * depository * * @author bianj * @version 1.0.0 2021-05-20 */ +@Data public class Depository { /** 版本号 */ private static final long serialVersionUID = -2259445638130429647L; @@ -62,222 +65,5 @@ public class Depository { * 当前仓库最小存储量 */ private Integer minNumber; - /** - * 获取id - * - * @return id - */ - public Integer getId() { - return this.id; - } - - /** - * 设置id - * - * @param id - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取仓库名称 - * - * @return 仓库名称 - */ - public String getDname() { - return this.dname; - } - - /** - * 设置仓库名称 - * - * @param dname - * 仓库名称 - */ - public void setDname(String dname) { - this.dname = dname; - } - - /** - * 获取仓库地址 - * - * @return 仓库地址 - */ - public String getAddress() { - return this.address; - } - - /** - * 设置仓库地址 - * - * @param address - * 仓库地址 - */ - public void setAddress(String address) { - this.address = address; - } - - /** - * 获取仓库介绍 - * - * @return 仓库介绍 - */ - public String getIntroduce() { - return this.introduce; - } - - /** - * 设置仓库介绍 - * - * @param introduce - * 仓库介绍 - */ - public void setIntroduce(String introduce) { - this.introduce = introduce; - } - - /** - * 获取仓库状态 - * @return - */ - public Integer getState() { - return state; - } - - /** - * 设置仓库状态 - * @param state - */ - public void setState(Integer state) { - this.state = state; - } - - /** - * 获取父级编号 - * @return - */ - public Integer getParentId() { - return parentId; - } - - /** - * 设置父级编号 - * @param parentId - */ - public void setParentId(Integer parentId) { - this.parentId = parentId; - } - - /** - * 获取公司编号 - * @return - */ - public Integer getCid() { - return cid; - } - - /** - * 设置公司编号 - * @param cid - */ - public void setCid(Integer cid) { - this.cid = cid; - } - - /** - * 获取公司名称 - * @return - */ - public String getCname() { - return cname; - } - - /** - * 设置公司名称 - * @param cname - */ - public void setCname(String cname) { - this.cname = cname; - } - - /** - * 获取仓库编码 - * @return - */ - public String getCode() { - return code; - } - - /** - * 设置仓库编码 - * @param code - */ - public void setCode(String code) { - this.code = code; - } - - /** - * 获取所属部门 - * @return - */ - public String getAdminorg() { - return adminorg; - } - - /** - * 设置所属部门 - * @param adminorg - */ - public void setAdminorg(String adminorg) { - this.adminorg = adminorg; - } - - /** - * 获取部门名称 - * @return - */ - public String getAdminorgName() { - return adminorgName; - } - - /** - * 设置部门名称 - * @param adminorgName - */ - public void setAdminorgName(String adminorgName) { - this.adminorgName = adminorgName; - } - - /** - * 获取当前仓库存储最大值 - * @return - */ - public Integer getMaxNumber() { - return maxNumber; - } - /** - * 设置当前仓库存储最大值 - * @return - */ - public void setMaxNumber(Integer maxNumber) { - this.maxNumber = maxNumber; - } - /** - * 获取当前仓库存储最小值 - * @return - */ - public Integer getMinNumber() { - return minNumber; - } - - /** - * 设置当前仓库存储最小值 - * @return - */ - public void setMinNumber(Integer minNumber) { - this.minNumber = minNumber; - } - /* This code was generated by TableGo tools, mark 2 end. */ } \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java index 3a5ff4b1..5bbcd15d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java @@ -32,7 +32,7 @@ public interface DepositoryMapper { * @param ids * @return */ - List selectDepositoryRecordByIds(List ids); + List selectDepositoryByIds(List ids); /** * 根据仓库id查询仓库名称 @@ -73,6 +73,8 @@ public interface DepositoryMapper { */ Depository findDepositoryById(Integer id); + + /** * 根据条件修改数据信息 * @param map diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml index aa3d0b16..080ab495 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml @@ -58,6 +58,7 @@ Where dc.state != 3 + + + diff --git a/src/main/resources/templates/pages/application/application-in_back.html b/src/main/resources/templates/pages/application/application-in_back.html index 1cf85520..fccad9b7 100644 --- a/src/main/resources/templates/pages/application/application-in_back.html +++ b/src/main/resources/templates/pages/application/application-in_back.html @@ -26,6 +26,9 @@ .lay-step{ display: none; } + .layui-form-select .layui-input{ + border-style: none; + }
@@ -37,7 +40,7 @@