UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复第三方数据仓库信息查询未添加系统启用关联条件问题

Browse Source 
2.第三方产品信息新增使用页面传值进行赋值
3.第三方系统信息编辑增加系统名称校验
4.第三方产品信息查询接口增加第三方系统名称返回值
fengcang
x_z 3 years ago
parent ce8d6baceb
commit c49f18a34a
11 changed files with 101 additions and 28 deletions

13
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.admin.controller.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
@ -109,8 +110,18 @@ public class BasicThirdSysController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (basicThirdSysEntity != null) {
//校验系统名称
if (StrUtil.isBlank(basicThirdSysEntity.getThirdName())) {
return ResultVOUtils.error(500, "系统名称不能为空");
}
//校验系统名称是否重复
boolean exists = basicThirdSysService.selectThirdNameExists(basicThirdSysEntity.getThirdId(), basicThirdSysEntity.getThirdName());
if (exists) {
return ResultVOUtils.error(500, "第三方系统名称重复");
}
BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId());
if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) {
if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) {
if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
return ResultVOUtils.error(999, "设置主系统失败");
}

11
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java
Unescape Escape View File

@ -1,8 +1,6 @@
package com.glxp.api.admin.controller.basic;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.*;
@ -15,15 +13,16 @@ import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.service.basic.*;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.SyncUdiService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -245,7 +244,7 @@ public class UdiInfoController {
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity) {
if (null == thrProductsEntity)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
thrProductsEntity.setThirdSysFk("thirdId");
thrProductsEntity.setThirdSysFk(thrProductsEntity.getThirdSys());
thrProductsService.insertThrProducts(thrProductsEntity);
return ResultVOUtils.success();
}

14
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java
Unescape Escape View File

@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
@ -24,7 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 第三方仓库信息接口
@ -41,21 +42,12 @@ public class ThrInvWarehouseController {
@GetMapping("spms/thrsys/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest);
PageInfo<ThrInvWarehouseEntity> pageInfo;
pageInfo = new PageInfo<>(thrInvWarehouseEntities);
PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrInvWarehouseEntities);
return ResultVOUtils.success(pageSimpleResponse);
// List<ThrInvWarehouseResponse> merge = merge(thrInvWarehouseEntities, 0);
//
// Map<String, Object> restMap = new HashMap<>();
// restMap.put("list", merge);
// return ResultVOUtils.success(restMap);
}
public List<ThrInvWarehouseResponse> merge(List<ThrInvWarehouseEntity> thrInvWarehouseEntities, Integer pid) {

24
api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java
Unescape Escape View File

@ -23,4 +23,28 @@ public interface BasicThirdSysDao {
*/
List<String> selectEnabledThirdId();
/**
* 查询第三方系统名称数量
*
* @param thirdName
* @return
*/
int selectCountByThirdName(@Param("thirdName") String thirdName);
/**
* 根据系统ID和名称查询第三方系统配置信息
*
* @param thirdId
* @param thirdName
* @return
*/
BasicThirdSysEntity selectByThirdIdAndThirdName(@Param("thirdId") String thirdId, @Param("thirdName") String thirdName);
/**
* 根据第三方系统ID查询第三方系统名称
*
* @param thirdSysFk
* @return
*/
String selectThirdNameByThirdId(@Param("thirdId") String thirdId);
}

2
api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java
Unescape Escape View File

@ -14,6 +14,7 @@ public class ThrProductsEntity {
private String registerNo;
private String manufactory;
private String thirdSysFk;
private String thirdSys;
private String cplb;
private String flbm;
private String qxlb;
@ -41,4 +42,5 @@ public class ThrProductsEntity {
private String remark2; //备注2
private String remark3; //备注3
}

9
api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java
Unescape Escape View File

@ -15,4 +15,13 @@ public interface BasicThirdSysService {
List<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
BasicThirdSysEntity selectMainThrSys();
/**
* 校验第三方系统名称是否重复
*
* @param thirdId 第三方系统ID
* @param thirdName 第三方系统名称
* @return
*/
boolean selectThirdNameExists(String thirdId, String thirdName);
}

10
api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java
Unescape Escape View File

@ -75,4 +75,14 @@ public class BasicThirdSysServiceImpl implements BasicThirdSysService {
}
return null;
}
@Override
public boolean selectThirdNameExists(String thirdId, String thirdName) {
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysDao.selectByThirdIdAndThirdName(thirdId, thirdName);
if (null == basicThirdSysEntity) {
int count = basicThirdSysDao.selectCountByThirdName(thirdName);
return count > 0;
}
return false;
}
}

17
api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.admin.service.thrsys.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao;
import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
@ -24,9 +25,11 @@ import java.util.List;
public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
@Resource
ThrInvWarehouseDao thrInvWarehouseDao;
private ThrInvWarehouseDao thrInvWarehouseDao;
@Resource
private ErpBasicClient erpBasicClient;
@Resource
private BasicThirdSysDao basicThirdSysDao;
@Override
public ThrInvWarehouseEntity findDefault(Boolean advaceType, Boolean isDefault) {
@ -41,15 +44,15 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
}
@Override
public List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest FilterThrInvWarehouseRequest) {
if (FilterThrInvWarehouseRequest == null) {
public List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
if (filterThrInvWarehouseRequest == null) {
return Collections.emptyList();
}
if (FilterThrInvWarehouseRequest.getPage() != null) {
int offset = (FilterThrInvWarehouseRequest.getPage() - 1) * FilterThrInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, FilterThrInvWarehouseRequest.getLimit());
if (filterThrInvWarehouseRequest.getPage() != null) {
int offset = (filterThrInvWarehouseRequest.getPage() - 1) * filterThrInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterThrInvWarehouseRequest.getLimit());
}
return thrInvWarehouseDao.filterThrInvWarehouse(FilterThrInvWarehouseRequest);
return thrInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest);
}
@Override

16
api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -1,8 +1,10 @@
package com.glxp.api.admin.service.thrsys.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
@ -17,7 +19,9 @@ public class ThrProductsServiceImpl implements ThrProductsService {
@Resource
ThrProductsDao thrProductsDao;
private ThrProductsDao thrProductsDao;
@Resource
private BasicThirdSysDao basicThirdSysDao;
@Override
@ -30,6 +34,14 @@ public class ThrProductsServiceImpl implements ThrProductsService {
PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
}
List<ThrProductsEntity> data = thrProductsDao.filterThrProductsRequest(filterThrProductsRequest);
if (CollUtil.isNotEmpty(data)) {
for (ThrProductsEntity thrProductsEntity : data) {
if (StrUtil.isNotBlank(thrProductsEntity.getThirdSysFk())) {
String thirdName = basicThirdSysDao.selectThirdNameByThirdId(thrProductsEntity.getThirdSysFk());
thrProductsEntity.setThirdSysName(thirdName);
}
}
}
return data;
}

9
api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml
Unescape Escape View File

@ -47,4 +47,13 @@
from basic_third_sys
where enabled = true
</select>
<select id="selectCountByThirdName" resultType="java.lang.Integer">
select count(*) from basic_third_sys where thirdName =#{thirdName}
</select>
<select id="selectByThirdIdAndThirdName" resultType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
select * from basic_third_sys where thirdId = #{thirdId} and thirdName = #{thirdName}
</select>
<select id="selectThirdNameByThirdId" resultType="java.lang.String">
select thirdName from basic_third_sys where thirdId = #{thirdId}
</select>
</mapper>

4
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
Unescape Escape View File

@ -5,8 +5,10 @@
<select id="filterThrInvWarehouse" parameterType="com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity">
SELECT *
FROM thr_inv_warehouse
FROM thr_inv_warehouse thrInv
left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId
<where>
thrSys.enabled = true
<if test="id != '' and id != null">
AND id = #{id}
</if>

Write Preview
Loading…
Cancel
Save