purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从源更新

Browse Source
This commit is contained in:
qiankunpingtai
2019-06-06 18:13:41 +08:00
parent d4f3f6b663 4b782faba8
commit 9c07f55e57
40 changed files with 106 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erp_web/login.html
View File

@@ -4,7 +4,6 @@
<title>ERP系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=8" >
<meta name="referrer" content="Webkit">
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link type="text/css" rel="stylesheet" href="/css/css.css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jsh</groupId>
<artifactId>jshERP</artifactId>
<version>2.0.2-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jshERP</name>

2
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -417,7 +417,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);

38
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -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<DepotItemVo4HeaderId> 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

14
src/main/java/com/jsh/erp/controller/ResourceController.java
View File

@@ -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<String, Object> objectMap = new HashMap<String, Object>();
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,

15
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java
View File

@@ -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;
}
}

6
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -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);
String findMaterialsListByHeaderId(

4
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View File

@@ -27,10 +27,6 @@ public interface DepotItemMapperEx {
@Param("type") Integer type,
@Param("remark") String remark);
List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
@Param("materialParam") String materialParam,
@Param("depotIds") String depotIds);
List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
@Param("mId") Long mId,
@Param("offset") Integer offset,

4
src/main/java/com/jsh/erp/service/CommonQueryManager.java
View File

@@ -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;

6
src/main/java/com/jsh/erp/service/ICommonQuery.java
View File

@@ -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;
/**
* 自定义查询

4
src/main/java/com/jsh/erp/service/account/AccountComponent.java
View File

@@ -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

2
src/main/java/com/jsh/erp/service/account/AccountService.java
View File

@@ -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);
}

4
src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/app/AppComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/depot/DepotComponent.java
View File

@@ -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

15
src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java
View File

@@ -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
@@ -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

10
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -88,11 +88,12 @@ public class DepotHeadService {
return list;
}
public List<DepotHeadVo4List> select(String type, String subType, String number, String beginTime, String endTime, String dhIds, int offset, int rows)throws Exception {
public List<DepotHeadVo4List> select(String type, String subType, String number, String beginTime, String endTime,
String materialParam, String depotIds, int offset, int rows)throws Exception {
List<DepotHeadVo4List> resList = new ArrayList<DepotHeadVo4List>();
List<DepotHeadVo4List> 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);

4
src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java
View File

@@ -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

13
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -188,19 +188,6 @@ public class DepotItemService {
return list==null?0:list.size();
}
public List<DepotItemVo4HeaderId> getHeaderIdByMaterial(String materialParam, String depotIds)throws Exception {
List<DepotItemVo4HeaderId> 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<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(Map<String, String> map)throws Exception {
String mIdStr = map.get("mId");
Long mId = null;

4
src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/log/LogComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/material/MaterialComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java
View File

@@ -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

5
src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java
View File

@@ -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

5
src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java
View File

@@ -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);

5
src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java
View File

@@ -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

5
src/main/java/com/jsh/erp/service/organization/OrganizationService.java
View File

@@ -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);

4
src/main/java/com/jsh/erp/service/person/PersonComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/role/RoleComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/unit/UnitComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/user/UserComponent.java
View File

@@ -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

4
src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java
View File

@@ -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

20
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -60,12 +60,6 @@
<bind name="number" value="'%' + _parameter.number + '%'"/>
and dh.Number like #{number}
</if>
<if test="dhIds != null and dhIds != ''">
and dh.Id in
<foreach item="dhId" index="index" collection="dhIds.split(',')" open="(" separator="," close=")">
#{dhId}
</foreach>
</if>
<if test="beginTime != null and beginTime != ''">
and dh.OperTime >= #{beginTime}
</if>
@@ -93,19 +87,19 @@
<bind name="number" value="'%' + _parameter.number + '%'"/>
and Number like #{number}
</if>
<if test="dhIds != null and dhIds != ''">
and Id in
<foreach item="dhId" index="index" collection="dhIds.split(',')" open="(" separator="," close=")">
#{dhId}
</foreach>
</if>
<if test="beginTime != null and beginTime != ''">
and OperTime >= #{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and OperTime &lt;= #{endTime}
</if>
and ifnull(delete_Flag,'0') !='1'
<if test="materialParam != null">
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
</if>
<if test="depotIds != null">
and di.DepotId in (${depotIds})
</if>
and ifnull(jsh_depothead.delete_Flag,'0') !='1'
</select>

7
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -2,16 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapperEx">
<resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
</resultMap>
<resultMap id="DetailByTypeAndMIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4DetailByTypeAndMId">
<result column="Number" jdbcType="VARCHAR" property="number" />
<result column="newType" jdbcType="VARCHAR" property="newtype" />
<result column="b_num" jdbcType="BIGINT" property="bnum" />
<result column="oTime" jdbcType="TIMESTAMP" property="otime" />
</resultMap>
<resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
</resultMap>
<resultMap extends="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap" id="ResultAndMaterialMap" type="com.jsh.erp.datasource.entities.DepotItemVo4Material">
<result column="mName" jdbcType="VARCHAR" property="mname" />