|
|
|
@ -4,22 +4,20 @@ 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.*;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
|
|
|
|
|
import com.glxp.api.admin.httpclient.ErpBasicClient;
|
|
|
|
|
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
|
|
|
|
|
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
|
|
|
|
|
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
|
|
|
|
|
import com.glxp.api.admin.req.inout.DeleteRequest;
|
|
|
|
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
|
|
|
|
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
|
|
|
|
|
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.util.CustomUtil;
|
|
|
|
|
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.validation.BindingResult;
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
@ -54,7 +52,7 @@ public class BussinessOriginTypeController {
|
|
|
|
|
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
|
|
|
|
|
bussinessTypeFilterRequest.setThirdSys(basicThirdSysEntity.getThirdId());
|
|
|
|
|
} else if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) {
|
|
|
|
|
return ResultVOUtils.error(500, "请先选择第三系统");
|
|
|
|
|
return ResultVOUtils.error(500, "请先选择第三方系统");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<BussinessOriginTypeEntity> bussinessTypeEntities;
|
|
|
|
|