业务单据无法选择第三方单据问题

fengcang
anthonyywj2 3 years ago
parent 7a1a876a97
commit 10d7060e83

@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
@ -16,6 +13,7 @@ import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.BussinessOriginTypeService; import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
@ -41,6 +39,8 @@ public class BussinessOriginTypeController {
private BussinessOriginTypeService bussinessOriginTypeService; private BussinessOriginTypeService bussinessOriginTypeService;
@Resource @Resource
ErpBasicClient erpBasicClient; ErpBasicClient erpBasicClient;
@Resource
private BasicThirdSysService basicThirdSysService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/originBusType/filter") @GetMapping("/udiwms/originBusType/filter")
@ -50,8 +50,10 @@ public class BussinessOriginTypeController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
if (bussinessTypeFilterRequest.isOnlyMain()) {
if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) { BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
bussinessTypeFilterRequest.setThirdSys(basicThirdSysEntity.getThirdId());
} else if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) {
return ResultVOUtils.error(500, "请先选择第三系统"); return ResultVOUtils.error(500, "请先选择第三系统");
} }

@ -16,4 +16,5 @@ public class BussinessOriginTypeFilterRequest extends ListPageRequest {
private String lastUpdateTime; private String lastUpdateTime;
private Integer corpType; private Integer corpType;
private String key; private String key;
private boolean onlyMain;
} }

Loading…
Cancel
Save