From 90b09cf7ac78be0c13a5119eed824165cadcb879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 27 May 2019 23:49:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20pom.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38719f50..cde80653 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.jsh jshERP - 2.0.2-SNAPSHOT + 2.0.3-SNAPSHOT jar jshERP From d2d7af27acc96aca8ecd67b72c7f10258ee688d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <852955+jishenghua@users.noreply.gitee.com> Date: Tue, 28 May 2019 23:37:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/ResourceController.java | 14 ++++++++++++++ .../com/jsh/erp/service/CommonQueryManager.java | 4 ++-- .../java/com/jsh/erp/service/ICommonQuery.java | 6 +++--- .../jsh/erp/service/account/AccountComponent.java | 4 ++-- .../jsh/erp/service/account/AccountService.java | 2 +- .../service/accountHead/AccountHeadComponent.java | 4 ++-- .../service/accountItem/AccountItemComponent.java | 4 ++-- .../java/com/jsh/erp/service/app/AppComponent.java | 4 ++-- .../com/jsh/erp/service/depot/DepotComponent.java | 4 ++-- .../erp/service/depotHead/DepotHeadComponent.java | 4 ++-- .../erp/service/depotItem/DepotItemComponent.java | 4 ++-- .../erp/service/functions/FunctionsComponent.java | 4 ++-- .../erp/service/inOutItem/InOutItemComponent.java | 4 ++-- .../java/com/jsh/erp/service/log/LogComponent.java | 4 ++-- .../erp/service/material/MaterialComponent.java | 4 ++-- .../MaterialCategoryComponent.java | 4 ++-- .../MaterialPropertyComponent.java | 4 ++-- .../service/orgaUserRel/OrgaUserRelComponent.java | 5 +++-- .../service/orgaUserRel/OrgaUserRelService.java | 5 +++++ .../organization/OrganizationComponent.java | 5 +++-- .../service/organization/OrganizationService.java | 5 +++++ .../jsh/erp/service/person/PersonComponent.java | 4 ++-- .../com/jsh/erp/service/role/RoleComponent.java | 4 ++-- .../serialNumber/SerialNumberComponent.java | 4 ++-- .../erp/service/supplier/SupplierComponent.java | 4 ++-- .../systemConfig/SystemConfigComponent.java | 4 ++-- .../com/jsh/erp/service/unit/UnitComponent.java | 4 ++-- .../com/jsh/erp/service/user/UserComponent.java | 4 ++-- .../userBusiness/UserBusinessComponent.java | 4 ++-- 29 files changed, 78 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/jsh/erp/controller/ResourceController.java b/src/main/java/com/jsh/erp/controller/ResourceController.java index f1d15ab4..16c1dc1c 100644 --- a/src/main/java/com/jsh/erp/controller/ResourceController.java +++ b/src/main/java/com/jsh/erp/controller/ResourceController.java @@ -32,6 +32,20 @@ public class ResourceController { return JsonUtils.ok(); } + @GetMapping(value = "/{apiName}/info") + public String getList(@PathVariable("apiName") String apiName, + @RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Object obj = configResourceManager.selectOne(apiName, id); + Map objectMap = new HashMap(); + if(obj != null) { + objectMap.put("info", obj); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); + } + } + @GetMapping(value = "/{apiName}/list") public String getList(@PathVariable("apiName") String apiName, @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, diff --git a/src/main/java/com/jsh/erp/service/CommonQueryManager.java b/src/main/java/com/jsh/erp/service/CommonQueryManager.java index 7525a062..311a5223 100644 --- a/src/main/java/com/jsh/erp/service/CommonQueryManager.java +++ b/src/main/java/com/jsh/erp/service/CommonQueryManager.java @@ -30,8 +30,8 @@ public class CommonQueryManager { * @param apiName 接口名称 * @param id ID */ - public Object selectOne(String apiName, String id) throws Exception{ - if (StringUtil.isNotEmpty(apiName) && StringUtil.isNotEmpty(id)) { + public Object selectOne(String apiName, Long id) throws Exception { + if (StringUtil.isNotEmpty(apiName) && id!=null) { return container.getCommonQuery(apiName).selectOne(id); } return null; diff --git a/src/main/java/com/jsh/erp/service/ICommonQuery.java b/src/main/java/com/jsh/erp/service/ICommonQuery.java index 0927a71e..25d19880 100644 --- a/src/main/java/com/jsh/erp/service/ICommonQuery.java +++ b/src/main/java/com/jsh/erp/service/ICommonQuery.java @@ -13,12 +13,12 @@ import java.util.Map; */ public interface ICommonQuery { /** - * 查询：解析JSON，查询资源。 + * 根据id查询明细。 * - * @param condition 资源id + * @param id 资源id * @return 资源 */ - Object selectOne(String condition) throws Exception; + Object selectOne(Long id) throws Exception; /** * 自定义查询 diff --git a/src/main/java/com/jsh/erp/service/account/AccountComponent.java b/src/main/java/com/jsh/erp/service/account/AccountComponent.java index 3676bd8f..a1b159f9 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountComponent.java +++ b/src/main/java/com/jsh/erp/service/account/AccountComponent.java @@ -19,8 +19,8 @@ public class AccountComponent implements ICommonQuery { private AccountService accountService; @Override - public Object selectOne(String condition) { - return null; + public Object selectOne(Long id) throws Exception { + return accountService.getAccount(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index ba995fce..e49c5fc3 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -58,7 +58,7 @@ public class AccountService { @Resource private UserService userService; - public Account getAccount(long id) { + public Account getAccount(long id) throws Exception{ return accountMapper.selectByPrimaryKey(id); } diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java index a9b67219..01f9ca98 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java @@ -19,8 +19,8 @@ public class AccountHeadComponent implements ICommonQuery { private AccountHeadService accountHeadService; @Override - public Object selectOne(String condition) throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return accountHeadService.getAccountHead(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java index f7ae1daf..b2fd6d5d 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java +++ b/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java @@ -19,8 +19,8 @@ public class AccountItemComponent implements ICommonQuery { private AccountItemService accountItemService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return accountItemService.getAccountItem(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/app/AppComponent.java b/src/main/java/com/jsh/erp/service/app/AppComponent.java index a5759efd..9afec67f 100644 --- a/src/main/java/com/jsh/erp/service/app/AppComponent.java +++ b/src/main/java/com/jsh/erp/service/app/AppComponent.java @@ -19,8 +19,8 @@ public class AppComponent implements ICommonQuery { private AppService appService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return appService.getApp(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java index 7dc0f06c..aa78ad79 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java @@ -20,8 +20,8 @@ public class DepotComponent implements ICommonQuery { private DepotService depotService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return depotService.getDepot(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java index ba817286..a755bd55 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java @@ -19,8 +19,8 @@ public class DepotHeadComponent implements ICommonQuery { private DepotHeadService depotHeadService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return depotHeadService.getDepotHead(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java index 898d3999..0adc4089 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java @@ -19,8 +19,8 @@ public class DepotItemComponent implements ICommonQuery { private DepotItemService depotItemService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return depotItemService.getDepotItem(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java index a48aaff3..ebb0c67a 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java +++ b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java @@ -21,8 +21,8 @@ public class FunctionsComponent implements ICommonQuery { private FunctionsService functionsService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return functionsService.getFunctions(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java index 9cce46bc..cc8812f9 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java +++ b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java @@ -19,8 +19,8 @@ public class InOutItemComponent implements ICommonQuery { private InOutItemService inOutItemService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return inOutItemService.getInOutItem(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/log/LogComponent.java b/src/main/java/com/jsh/erp/service/log/LogComponent.java index 00857c87..1432c9f3 100644 --- a/src/main/java/com/jsh/erp/service/log/LogComponent.java +++ b/src/main/java/com/jsh/erp/service/log/LogComponent.java @@ -19,8 +19,8 @@ public class LogComponent implements ICommonQuery { private LogService logService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return logService.getLog(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java index 7b2ca3d2..77a9d271 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java @@ -21,8 +21,8 @@ public class MaterialComponent implements ICommonQuery { private MaterialService materialService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return materialService.getMaterial(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java index 70598d69..b6bb92ac 100644 --- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java +++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java @@ -21,8 +21,8 @@ public class MaterialCategoryComponent implements ICommonQuery { private MaterialCategoryService materialCategoryService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return materialCategoryService.getMaterialCategory(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java index 4d681484..33a39ccc 100644 --- a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java +++ b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java @@ -19,8 +19,8 @@ public class MaterialPropertyComponent implements ICommonQuery { private MaterialPropertyService materialPropertyService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return materialPropertyService.getMaterialProperty(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java index 1d6776d4..2024d2df 100644 --- a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java +++ b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java @@ -21,9 +21,10 @@ import java.util.Map; public class OrgaUserRelComponent implements ICommonQuery { @Resource private OrgaUserRelService orgaUserRelService; + @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return orgaUserRelService.getOrgaUserRel(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java index d422ae07..aaea62d6 100644 --- a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java +++ b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java @@ -41,6 +41,11 @@ public class OrgaUserRelService { private UserService userService; @Resource private LogService logService; + + public OrgaUserRel getOrgaUserRel(long id) throws Exception{ + return orgaUserRelMapper.selectByPrimaryKey(id); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertOrgaUserRel(String beanJson, HttpServletRequest request) throws Exception{ OrgaUserRel orgaUserRel = JSONObject.parseObject(beanJson, OrgaUserRel.class); diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java index 3b0a226a..435c8379 100644 --- a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java @@ -22,9 +22,10 @@ import java.util.Map; public class OrganizationComponent implements ICommonQuery { @Resource private OrganizationService organizationService; + @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return organizationService.getOrganization(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java index fcec30dc..cdae2fc0 100644 --- a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java @@ -44,6 +44,11 @@ public class OrganizationService { private UserService userService; @Resource private LogService logService; + + public Organization getOrganization(long id) throws Exception { + return organizationMapper.selectByPrimaryKey(id); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertOrganization(String beanJson, HttpServletRequest request)throws Exception { Organization organization = JSONObject.parseObject(beanJson, Organization.class); diff --git a/src/main/java/com/jsh/erp/service/person/PersonComponent.java b/src/main/java/com/jsh/erp/service/person/PersonComponent.java index b7b6a6cc..bb3f27dd 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonComponent.java +++ b/src/main/java/com/jsh/erp/service/person/PersonComponent.java @@ -21,8 +21,8 @@ public class PersonComponent implements ICommonQuery { private PersonService personService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return personService.getPerson(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/role/RoleComponent.java b/src/main/java/com/jsh/erp/service/role/RoleComponent.java index 9c491a15..b4b513ec 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleComponent.java +++ b/src/main/java/com/jsh/erp/service/role/RoleComponent.java @@ -19,8 +19,8 @@ public class RoleComponent implements ICommonQuery { private RoleService roleService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return roleService.getRole(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java index 7cc89dde..992a3117 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java @@ -26,8 +26,8 @@ public class SerialNumberComponent implements ICommonQuery { private SerialNumberService serialNumberService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return serialNumberService.getSerialNumber(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java b/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java index c018e2ac..67943682 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java @@ -21,8 +21,8 @@ public class SupplierComponent implements ICommonQuery { private SupplierService supplierService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return supplierService.getSupplier(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java index 427cd516..7fd76977 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java @@ -21,8 +21,8 @@ public class SystemConfigComponent implements ICommonQuery { private SystemConfigService systemConfigService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return systemConfigService.getSystemConfig(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java index 98a66249..cc17fb54 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java @@ -20,8 +20,8 @@ public class UnitComponent implements ICommonQuery { private UnitService unitService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return unitService.getUnit(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/user/UserComponent.java b/src/main/java/com/jsh/erp/service/user/UserComponent.java index 3a7bc58d..eabdfa2a 100644 --- a/src/main/java/com/jsh/erp/service/user/UserComponent.java +++ b/src/main/java/com/jsh/erp/service/user/UserComponent.java @@ -18,8 +18,8 @@ public class UserComponent implements ICommonQuery { private UserService userService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return userService.getUser(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java index 04ca587f..74b8e033 100644 --- a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java +++ b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java @@ -22,8 +22,8 @@ public class UserBusinessComponent implements ICommonQuery { private UserBusinessService userBusinessService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return userBusinessService.getUserBusiness(id); } @Override From 1c3ab2cb17e48143e4b730e6a44f94e274b20097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 3 Jun 2019 21:33:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=86=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=A4=E4=B8=AA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=88=E5=B9=B6=E4=B8=BA=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/pages/materials/in_out.js | 61 ++++++------------- erp_web/login.html | 1 - .../erp/controller/DepotHeadController.java | 2 +- .../erp/controller/DepotItemController.java | 38 ------------ .../entities/DepotItemVo4HeaderId.java | 15 ----- .../datasource/mappers/DepotHeadMapperEx.java | 6 +- .../datasource/mappers/DepotItemMapperEx.java | 4 -- .../service/depotHead/DepotHeadComponent.java | 11 ++-- .../service/depotHead/DepotHeadService.java | 10 +-- .../service/depotItem/DepotItemService.java | 13 ---- .../mapper_xml/DepotHeadMapperEx.xml | 26 +++++--- .../mapper_xml/DepotItemMapperEx.xml | 13 ---- 12 files changed, 54 insertions(+), 146 deletions(-) delete mode 100644 src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index 4c14f6e1..eb7d7371 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -2676,56 +2676,33 @@ function showDepotHeadDetails(pageNo,pageSize){ var materialParam = $.trim($("#searchMaterial").val()); $.ajax({ - type:"get", - url: "/depotItem/getHeaderIdByMaterial", + type: "get", + url: "/depotHead/list", dataType: "json", data: ({ - materialParam: materialParam, - depotIds: depotString + search: JSON.stringify({ + type: listType, + subType: listSubType, + state: $.trim($("#searchState").val()), + number: $.trim($("#searchNumber").val()), + beginTime: $("#searchBeginTime").val(), + endTime: $("#searchEndTime").val(), + materialParam: materialParam, + depotIds: depotString + }), + currentPage: pageNo, + pageSize: pageSize }), success: function (res) { - if(res && res.code === 200) { - var ids = res.data; - if(ids){ - $.ajax({ - type: "get", - url: "/depotHead/list", - dataType: "json", - data: ({ - search: JSON.stringify({ - type: listType, - subType: listSubType, - state: $.trim($("#searchState").val()), - number: $.trim($("#searchNumber").val()), - beginTime: $("#searchBeginTime").val(), - endTime: $("#searchEndTime").val(), - dhIds: ids - }), - currentPage: pageNo, - pageSize: pageSize - }), - success: function (res) { - if(res && res.code === 200){ - if(res.data && res.data.page) { - $("#tableData").datagrid('loadData', res.data.page); - } - } - }, - //此处添加错误处理 - error: function () { - $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); - return; - } - }); - } - else { - $("#tableData").datagrid('loadData', []); + if(res && res.code === 200){ + if(res.data && res.data.page) { + $("#tableData").datagrid('loadData', res.data.page); } } }, //此处添加错误处理 - error:function() { - $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); + error: function () { + $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); return; } }); diff --git a/erp_web/login.html b/erp_web/login.html index 6b6a8fb1..f675bd62 100644 --- a/erp_web/login.html +++ b/erp_web/login.html @@ -4,7 +4,6 @@ ERP系统 - diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index c3559e76..2e497446 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -438,7 +438,7 @@ public class DepotHeadController { JSONObject result = ExceptionConstants.standardSuccess(); if(("open").equals(mybatisPlusStatus)) { Long billsNumLimit = Long.parseLong(request.getSession().getAttribute("billsNumLimit").toString()); - Long count = depotHeadService.countDepotHead(null,null,null,null,null,null); + Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null); if(count>= billsNumLimit) { throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG); diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index 0b4a11fd..f78f0f86 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -42,44 +42,6 @@ public class DepotItemController { @Resource private MaterialService materialService; - /** - * 根据材料信息获取 - * @param materialParam 商品参数 - * @param depotIds 拥有的仓库信息 - * @param request - * @return - */ - @GetMapping(value = "/getHeaderIdByMaterial") - public BaseResponseInfo getHeaderIdByMaterial(@RequestParam("materialParam") String materialParam, - @RequestParam("depotIds") String depotIds, - HttpServletRequest request)throws Exception { - BaseResponseInfo res = new BaseResponseInfo(); - try { - List depotItemList = depotItemService.getHeaderIdByMaterial(materialParam, depotIds); - String allReturn = ""; - if (depotItemList != null&&depotItemList.size()>0) { - for (DepotItemVo4HeaderId d : depotItemList) { - Long dl = d.getHeaderid(); //获取对象 - allReturn = allReturn + dl.toString() + ","; - } - /** - * 2019-01-17修复depotItemList集合为空时，程序异常 - * */ - allReturn = allReturn.substring(0, allReturn.length() - 1); - } - if (allReturn.equals("null")) { - allReturn = ""; - } - res.code = 200; - res.data = allReturn; - } catch(Exception e){ - e.printStackTrace(); - res.code = 500; - res.data = "获取数据失败"; - } - return res; - } - /** * 只根据商品id查询单据列表 * @param mId diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java deleted file mode 100644 index 0e6eda79..00000000 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.datasource.entities; - -public class DepotItemVo4HeaderId { - - private Long headerid; - - public Long getHeaderid() { - return headerid; - } - - public void setHeaderid(Long headerid) { - this.headerid = headerid; - } - -} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 1ce76911..6cfecf33 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -24,7 +24,8 @@ public interface DepotHeadMapperEx { @Param("number") String number, @Param("beginTime") String beginTime, @Param("endTime") String endTime, - @Param("dhIds") String dhIds, + @Param("materialParam") String materialParam, + @Param("depotIds") String depotIds, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -34,7 +35,8 @@ public interface DepotHeadMapperEx { @Param("number") String number, @Param("beginTime") String beginTime, @Param("endTime") String endTime, - @Param("dhIds") String dhIds); + @Param("materialParam") String materialParam, + @Param("depotIds") String depotIds); Long getMaxId(); diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 34a30d14..9a7723c8 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -27,10 +27,6 @@ public interface DepotItemMapperEx { @Param("type") Integer type, @Param("remark") String remark); - List getHeaderIdByMaterial( - @Param("materialParam") String materialParam, - @Param("depotIds") String depotIds); - List findDetailByTypeAndMaterialIdList( @Param("mId") Long mId, @Param("offset") Integer offset, diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java index a755bd55..74326b00 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java @@ -35,9 +35,9 @@ public class DepotHeadComponent implements ICommonQuery { String number = StringUtil.getInfo(search, "number"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); - String dhIds = StringUtil.getInfo(search, "dhIds"); - String order = QueryUtils.order(map); - return depotHeadService.select(type, subType, number, beginTime, endTime, dhIds, QueryUtils.offset(map), QueryUtils.rows(map)); + String materialParam = StringUtil.getInfo(search, "materialParam"); + String depotIds = StringUtil.getInfo(search, "depotIds"); + return depotHeadService.select(type, subType, number, beginTime, endTime, materialParam, depotIds, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override @@ -48,8 +48,9 @@ public class DepotHeadComponent implements ICommonQuery { String number = StringUtil.getInfo(search, "number"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); - String dhIds = StringUtil.getInfo(search, "dhIds"); - return depotHeadService.countDepotHead(type, subType, number, beginTime, endTime, dhIds); + String materialParam = StringUtil.getInfo(search, "materialParam"); + String depotIds = StringUtil.getInfo(search, "depotIds"); + return depotHeadService.countDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds); } @Override diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 9af976aa..d9bf7380 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -88,11 +88,12 @@ public class DepotHeadService { return list; } - public List select(String type, String subType, String number, String beginTime, String endTime, String dhIds, int offset, int rows)throws Exception { + public List select(String type, String subType, String number, String beginTime, String endTime, + String materialParam, String depotIds, int offset, int rows)throws Exception { List resList = new ArrayList(); List list=null; try{ - list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, number, beginTime, endTime, dhIds, offset, rows); + list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds, offset, rows); }catch(Exception e){ logger.error("异常码[{}],异常提示[{}],异常[{}]", ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); @@ -127,10 +128,11 @@ public class DepotHeadService { - public Long countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) throws Exception{ + public Long countDepotHead(String type, String subType, String number, String beginTime, String endTime, + String materialParam, String depotIds) throws Exception{ Long result=null; try{ - result=depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds); + result=depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds); }catch(Exception e){ logger.error("异常码[{}],异常提示[{}],异常[{}]", ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 55b1ee5c..35157466 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -188,19 +188,6 @@ public class DepotItemService { return list==null?0:list.size(); } - public List getHeaderIdByMaterial(String materialParam, String depotIds)throws Exception { - List list =null; - try{ - list = depotItemMapperEx.getHeaderIdByMaterial(materialParam, depotIds); - }catch(Exception e){ - logger.error("异常码[{}],异常提示[{}],异常[{}]", - ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); - throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE, - ExceptionConstants.DATA_READ_FAIL_MSG); - } - return list; - } - public List findDetailByTypeAndMaterialIdList(Map map)throws Exception { String mIdStr = map.get("mId"); Long mId = null; diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index ef7d6285..90b8f379 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -49,6 +49,8 @@ left join jsh_person p on dh.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1' left join jsh_account a on dh.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1' left join jsh_depot dd on dh.AllocationProjectId=dd.id and ifnull(dd.delete_Flag,'0') !='1' + inner join jsh_depotitem di on dh.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1' + inner join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1' where 1=1 and dh.Type='${type}' @@ -59,15 +61,18 @@ and dh.Number like '%${number}%' - - and dh.Id in (${dhIds}) - and dh.OperTime >= '${beginTime}' and dh.OperTime <= '${endTime}' + + and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%') + + + and di.DepotId in (${depotIds}) + and ifnull(dh.delete_Flag,'0') !='1' order by dh.Id desc @@ -76,8 +81,10 @@ -