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

Merge remote-tracking branch 'origin/fengcang' into fengcang

Browse Source
fengcang
anthonyywj2 3 years ago
parent 05591c1ff9 9f69fade66
commit 6803357b06
14 changed files with 97 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -119,6 +119,15 @@ public class BasicThirdSysController {
if (exists) {
return ResultVOUtils.error(500, "第三方系统名称重复");
}
if (!basicThirdSysEntity.getEnabled()) {
//如操作为禁用第三方系统，则需要判断是否是最后一个启用的第三方系统，需要保留至少启用一个第三方系统
FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
filterBasicThirdSysRequest.setEnabled(true);
int count = basicThirdSysService.countThirdSys(filterBasicThirdSysRequest);
if (count == 1) {
return ResultVOUtils.error(500, "至少需需用一个第三方系统！");
}
}
BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId());
if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) {

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

@ -1,9 +1,10 @@
package com.glxp.api.admin.controller.basic;
import cn.hutool.core.bean.BeanUtil;
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.BussinessChangeTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
@ -12,10 +13,11 @@ import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.res.basic.BussinessLocalTypeResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.BussinessChangeTypeService;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.business.StockOrderService;
import com.glxp.api.admin.util.CustomUtil;
@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -42,13 +45,13 @@ public class BussinessLocalTypeController {
@Resource
private BussinessChangeTypeService bussinessChangeTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private StockOrderService stockOrderService;
@Resource
CustomerService customerService;
private CustomerService customerService;
@Resource
private BussinessOriginTypeService bussinessOriginTypeService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterJoin")
@ -117,9 +120,19 @@ public class BussinessLocalTypeController {
bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest);
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<BussinessLocalTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(bussinessTypeEntities);
List<BussinessLocalTypeResponse> responses = new ArrayList<>(bussinessTypeEntities.size());
if (CollUtil.isNotEmpty(bussinessTypeEntities)) {
for (BussinessLocalTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
BussinessLocalTypeResponse response = new BussinessLocalTypeResponse();
BeanUtil.copyProperties(bussinessTypeEntity, response);
String originName = bussinessOriginTypeService.findNameByAction(bussinessTypeEntity.getOriginAction());
response.setOriginName(originName);
responses.add(response);
}
}
pageSimpleResponse.setList(responses);
return ResultVOUtils.success(pageSimpleResponse);
}
@ -184,7 +197,7 @@ public class BussinessLocalTypeController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/localBusType/update")
public BaseResponse updateBussinessType(@RequestBody BussinessLocalTypeEntity bussinessTypeEntity,
public BaseResponse updateBussinessType(@RequestBody @Valid BussinessLocalTypeEntity bussinessTypeEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {

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

@ -90,7 +90,7 @@ public class BussinessOriginTypeController {
@PostMapping("/udiwms/originBusType/update")
public BaseResponse updateBussinessType(@RequestBody BussinessOriginTypeEntity bussinessTypeEntity,
public BaseResponse updateBussinessType(@RequestBody @Valid BussinessOriginTypeEntity bussinessTypeEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {

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

@ -47,4 +47,6 @@ public interface BasicThirdSysDao {
* @return
*/
String selectThirdNameByThirdId(@Param("thirdId") String thirdId);
int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
}

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

@ -22,4 +22,12 @@ public interface BussinessOriginTypeDao {
boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id);
/**
* 查询单据类型名称
*
* @param action
* @return
*/
String selectNameByAction(@Param("action") String action);
}

3
api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java
Unescape Escape View File

@ -2,12 +2,15 @@ package com.glxp.api.admin.entity.basic;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import java.util.Date;
@Data
public class BussinessLocalTypeEntity {
private Integer id;
private String action;
@NotEmpty(message = "业务单据类型名称不能为空！")
private String name;
private String localAction;
private String originAction;

3
api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.admin.entity.basic;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import java.util.Date;
@Data
@ -9,6 +10,8 @@ public class BussinessOriginTypeEntity {
private String id;
private String name;
private String action;
@NotEmpty(message = "第三方系统不能为空！")
private String thirdSys;
private String thirdSysName;
private Boolean enable;

17
api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessLocalTypeResponse.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.glxp.api.admin.res.basic;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import lombok.Data;
/**
* 业务单据类型响应结果类
*/
@Data
public class BussinessLocalTypeResponse extends BussinessLocalTypeEntity {
/**
* 第三方单据类型名称
*/
private String originName;
}

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

@ -24,4 +24,7 @@ public interface BasicThirdSysService {
* @return
*/
boolean selectThirdNameExists(String thirdId, String thirdName);
int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
}

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

@ -5,7 +5,6 @@ import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -40,4 +39,11 @@ public interface BussinessOriginTypeService {
boolean deleteById(String id);
/**
* 查询第三方单据类型名称
*
* @param originAction
* @return
*/
String findNameByAction(String originAction);
}

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

@ -85,4 +85,9 @@ public class BasicThirdSysServiceImpl implements BasicThirdSysService {
}
return false;
}
@Override
public int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest) {
return basicThirdSysDao.countThirdSys(filterBasicThirdSysRequest);
}
}

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

@ -131,4 +131,9 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic
public boolean deleteById(String id) {
return bussinessOriginTypeDao.deleteById(id);
}
@Override
public String findNameByAction(String originAction) {
return bussinessOriginTypeDao.selectNameByAction(originAction);
}
}

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

@ -56,4 +56,13 @@
<select id="selectThirdNameByThirdId" resultType="java.lang.String">
select thirdName from basic_third_sys where thirdId = #{thirdId}
</select>
<select id="countThirdSys" resultType="java.lang.Integer">
select count(*) from basic_third_sys
<where>
<if test="enabled != null">
AND enabled = #{enabled}
</if>
</where>
</select>
</mapper>

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

@ -77,6 +77,10 @@
</where>
</select>
<select id="selectNameByAction" resultType="java.lang.String">
select name from basic_bustype_origin where action = #{action}
</select>
<insert id="insertBusOriginType" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity">
replace

Write Preview
Loading…
Cancel
Save