diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java new file mode 100644 index 0000000000..23a072666b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.base.api.basemanufacturer; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/11 15:48 + * @Description + */ +@Data +public class BaseManufaQuery implements Query { + private static final long serialVersionUID = 4223191922440246912L; + @ApiModelProperty("分公司sid") + private String orgSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java index 81723e045c..c42c6fbe18 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java @@ -121,6 +121,6 @@ public class BaseManufacturerDto implements Dto { @ApiModelProperty(value = "使用组织名称") private String useOrgName; - @ApiModelProperty(value = "厂商开户行sid") - private String manBankSid; +/* @ApiModelProperty(value = "厂商开户行sid") + private String manBankSid;*/ } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index 7a451b4e77..b3b9543d81 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java @@ -176,4 +176,9 @@ public interface BaseManufacturerFeign { @ResponseBody ResultBean> selectNameByOrg(@SpringQueryMap BaseManufacturerListQuery query); + @ApiOperation("获取分公司按钮新增供应商信息") + @GetMapping("/saveAllByOrgSid") + @ResponseBody + ResultBean saveAllByOrgSid(@SpringQueryMap BaseManufaQuery query); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index ad4777202e..7170e6f8e0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java @@ -100,4 +100,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { public ResultBean> selectNameByOrg(BaseManufacturerListQuery query) { return null; } + + @Override + public ResultBean saveAllByOrgSid(BaseManufaQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java index 71e5611e3c..9b235db69a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basemanufacturer; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,4 +39,9 @@ public class BaseManufacturerVo implements Vo { private String contactMobile; @ApiModelProperty(value = "供应商分类Value") private String supplierTypeValue; + @JsonIgnore + @ApiModelProperty("供应商编码") + private String manufacturerCode; + @ApiModelProperty("是否允许编辑：true允许，false不允许") + private Boolean isShow; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java similarity index 74% rename from anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java rename to anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java index aa837a9d2d..af6359e675 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java @@ -1,12 +1,14 @@ package com.yxt.anrui.base.api.busvehicleorder; +import com.yxt.common.core.vo.Vo; import lombok.Data; /** * 采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路 */ @Data -public class ActualAndOrgDeptDto { +public class ActualAndOrgDeptVo implements Vo { + private static final long serialVersionUID = -8041909902044531946L; //厂家销售通路sid private String actualSid; //厂家销售通路 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java index f97312ab19..883c84ef06 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * Project: anrui-base(车型信息)
@@ -116,6 +115,6 @@ public interface BusVehicleOrderFeign { @GetMapping("/getAppReadyCar/{modelSid}/{configSid}") public ResultBean> getAppReadyCar(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路") - @GetMapping("/getActualAndOrgDept/{vehicleOrderSid}") - public ResultBean getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid); + @GetMapping("/getActualAndOrgDept/{vehicleOrderSid}/{modelSid}/{configSid}") + public ResultBean getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid, @PathVariable("modelSid")String modelSid, @PathVariable("configSid")String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java index 48ac50e9da..c7302c2636 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java @@ -32,7 +32,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; -import java.util.Map; /** * Project: anrui-base(车型信息)
@@ -109,7 +108,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { } @Override - public ResultBean getActualAndOrgDept(String vehicleOrderSid) { + public ResultBean getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index f10f6e4375..9e069743d0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -280,8 +280,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService { List selectNameByOrg(@Param("modelSid") String modelSid); BaseManufacturer fetchByManBankSid(String s); + + List selectOrgList(String type); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index f372488a85..cb90de67b3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -16,9 +16,10 @@ bm.contactName, bm.supplierTypeValue, - bm.createOrgName + bm.createOrgName, + bm.manufacturerCode FROM base_manufacturer bm - ${ew.customSqlSegment} + ${ew.customSqlSegment} - UPDATE base_manufacturer SET isDelete = 1 WHERE sid IN + UPDATE base_manufacturer + SET isDelete = 1 WHERE sid IN #{item} @@ -153,7 +155,7 @@ manufacturerName FROM base_manufacturer WHERE supplierType = "0004" - AND isDelete=0 + AND isDelete = 0 AND createOrg = #{orgSid} @@ -163,21 +165,30 @@ bankAccount FROM base_manufacturer_bank WHERE manufacturerSid = #{manufacturerSid} - AND isDelete = 0 + AND isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 67e1dfbf9e..d679d039cc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.*; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -17,9 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui-base(安瑞基础信息模块)
@@ -47,6 +49,8 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { private BaseManufacturerFinanceService baseManufacturerFinanceService;//供应厂商财务信息 @Autowired private HttpServletResponse response; + @Autowired + private BaseVehicleBrandService baseVehicleBrandService; @Override @@ -63,6 +67,20 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { ResultBean> rb = ResultBean.fireFail(); IPage page = baseManufacturerService.gysPagerList(pagerQuery); PagerVo pv = new PagerVo<>(); + List records = page.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (BaseManufacturerVo baseManufacturerVo : records) { + String code = baseManufacturerVo.getManufacturerCode(); + if (StringUtils.isNotBlank(code)) { + baseManufacturerVo.setIsShow(false); + } else { + baseManufacturerVo.setIsShow(true); + } + + } + + } PagerVo pv1 = PagerUtil.pageToVo(page, pv); return rb.success().setData(pv1); } @@ -79,7 +97,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { @Override public ResultBean update(BaseManufacturerAllDto dto, String sid) { - return baseManufacturerService.updateAll(dto,sid); + return baseManufacturerService.updateAll(dto, sid); } @Override @@ -107,7 +125,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { } @Override - public ResultBean>> wcgysNamesDown(String orgSid) { + public ResultBean>> wcgysNamesDown(String orgSid) { return baseManufacturerService.wcgysNamesDown(orgSid); } @@ -172,4 +190,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { public ResultBean> selectNameByOrg(BaseManufacturerListQuery query) { return baseManufacturerService.selectNameByOrg(query); } + + @Override + public ResultBean saveAllByOrgSid(BaseManufaQuery query) { + return baseManufacturerService.saveAllByOrgSid(query); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 57c978d5ad..1ecfc43f9e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.basemanufacturer; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basemanufacturer.*; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto; @@ -16,20 +17,22 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.concurrent.*; +import java.util.stream.Collectors; /** * Project: anrui-base(安瑞基础信息模块)
@@ -93,7 +96,6 @@ public class BaseManufacturerService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + String finalSid = sid; + Future future1 = pool.submit(() -> { + //查询所有分公司，并向所有分公司中插入供应商信息 + ResultBean> orgList = sysOrganizationFeign.selectOrgSidList(); + List list = orgList.getData(); + if (!list.isEmpty()) { + for (SysOrganizationVo s : list) { + BaseManufacturer baseManufacturer = new BaseManufacturer(); + BeanUtil.copyProperties(baseManufacturerDto, baseManufacturer, "sid", "manufacturerCode"); + baseManufacturer.setManBankSid(finalSid); + baseManufacturer.setCreateOrg(s.getSid()); + baseManufacturer.setUseOrg(s.getSid()); + baseManufacturer.setCreateOrgName(s.getName()); + baseManufacturer.setUseOrgName(s.getName()); + insert(baseManufacturer); + } + } + }); + Future future2 = pool.submit(() -> { + //金蝶推送 + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName()); + bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile()); + bdSupplier.setFUseOrgId("101"); // bdSupplier.setTOrgIds("101"); - bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode()); - ResultBean stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier); + bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode()); + ResultBean stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier); + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setMsg("操作成功"); } @@ -361,13 +394,16 @@ public class BaseManufacturerService extends MybatisBaseService baseManufacturerBankVo = baseManufacturerBankService.selectDetails(sid); BaseManufacturerFinanceVo baseManufacturerFinanceVo = baseManufacturerFinanceService.selectDetails(sid); - baseManufacturerAllVo.setBaseManufacturerDto(baseManufacturerDetailsVo); baseManufacturerAllVo.setBaseManufacturerBankDto(baseManufacturerBankVo); baseManufacturerAllVo.setBaseManufacturerFinanceDto(baseManufacturerFinanceVo); return rb.success().setData(baseManufacturerAllVo); @@ -467,4 +503,48 @@ public class BaseManufacturerService extends MybatisBaseService selectOrgList(String type) { + return baseMapper.selectOrgList(type); + } + + public ResultBean saveAllByOrgSid(BaseManufaQuery query) { + ResultBean rb = ResultBean.fireFail(); + String orgSid = query.getOrgSid(); + //根据分公司查询该分公司授权的品牌 + List brandSidList = baseVehicleBrandService.selectOrgSidBySid(orgSid); + List stringList = new ArrayList<>(); + for (String s : brandSidList) { + List list = Arrays.asList(s.split(",")); + for (String ss : list) { + stringList.add(ss); + } + } + //去重 + stringList = stringList.stream().distinct().collect(Collectors.toList()); + //查询类别为分公司的 + String type = "分公司"; + List orgList2 = selectOrgList(type); + HashSet h1 = new HashSet(stringList); + HashSet h2 = new HashSet(orgList2); + h1.removeAll(h2); + stringList.clear(); + stringList.addAll(h1); + for (String s : stringList) { + ResultBean resultBean = sysOrganizationFeign.fetchBySid(s); + SysOrganizationVo sysOrganizationVo = resultBean.getData(); + if (sysOrganizationVo != null) { + BaseManufacturer baseManufacturer = new BaseManufacturer(); + baseManufacturer.setSupplierType("0005"); + baseManufacturer.setSupplierTypeValue("分公司"); + baseManufacturer.setManufacturerName(sysOrganizationVo.getName()); + baseManufacturer.setCreateOrg(s); + baseManufacturer.setCreateOrgName(sysOrganizationVo.getName()); + baseManufacturer.setUseOrg(s); + baseManufacturer.setUseOrgName(sysOrganizationVo.getName()); + insert(baseManufacturer); + } + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index 9c5ccaac15..ff46277814 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -129,4 +129,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper { List selectManSidByOrgSid(String orgSid); String selectShortName(String modelSid); + + List selectOrgSidBySid(String orgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index 717dec7041..c656201191 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -15,7 +15,7 @@ WHERE brandCode = #{brandCode} AND isDelete = 0 AND sid - <> + <> #{sid} @@ -35,8 +35,8 @@ bm.manufacturerName, DATE_FORMAT(bvb.modifyTime, '%Y-%m-%d') AS modifyTime FROM base_vehicle_brand bvb - LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid - ${ew.customSqlSegment} + LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid + ${ew.customSqlSegment} @@ -67,8 +67,8 @@ bvb.modifyTime, bm.manufacturerName FROM base_vehicle_brand bvb - LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid - ${ew.customSqlSegment} + LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid + ${ew.customSqlSegment} SELECT bvb.brandName, bvb.sid FROM base_vehicle_brand bvb - ${ew.customSqlSegment} + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index af9732c674..3ea7f22f93 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -155,7 +155,7 @@ public class BaseVehicleBrandService extends MybatisBaseService selectOrgSidBySid(String orgSid) { + return baseMapper.selectOrgSidBySid(orgSid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java index b726ee1f6d..54f2b744e8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo; +import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,4 +48,6 @@ public interface BusVehicleApplyMapper extends BaseMapper { int selectByNodeState(String join); int selectCountBySids(String join); + + ActualAndOrgDeptVo getActualAndOrgDept(@Param("sid") String vehicleOrderSid, @Param("modelSid") String modelSid, @Param("configSid") String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index c9a901295a..86f78e4250 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -103,4 +103,13 @@ where bs.state = 1 and find_in_set(ba.sid, #{join}) + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 6b3f2657e8..23cf0e9b3d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -19,6 +19,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz; +import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; @@ -517,7 +518,7 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); + List busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid(); //根据车型sid查询账户名称和银行账号 List busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid); @@ -791,7 +792,7 @@ public class BusVehicleApplyService extends MybatisBaseService0){ + if (counts > 0) { return rb.setMsg("选择作废的数据中包含已认款的数据，不允许作废"); } List sidsList = Arrays.asList(sids); @@ -802,4 +803,8 @@ public class BusVehicleApplyService extends MybatisBaseService @@ -202,20 +201,21 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { } @Override - public ResultBean getActualAndOrgDept(String vehicleOrderSid) { - ResultBean rb = ResultBean.fireFail(); - BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(vehicleOrderSid); - if (vo == null) { - return rb; - } - BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.fetchAllBySid(vo.getPurchaseRequisitionSid()); - BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(vo.getPurchaseApplyMediumModelSid()); - ActualAndOrgDeptDto actualAndOrgDeptDto = new ActualAndOrgDeptDto(); - actualAndOrgDeptDto.setOrgDeptSid(busVehicleApplyDetailsVo.getOrgDeptSid()); - actualAndOrgDeptDto.setOrgDeptName(busVehicleApplyDetailsVo.getOrgDeptName()); - actualAndOrgDeptDto.setActualPay(busVehicleApplyDetail.getActualPay()); - actualAndOrgDeptDto.setActualSid(busVehicleApplyDetail.getActualSid()); - return rb.success().setData(actualAndOrgDeptDto); + public ResultBean getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) { + ResultBean rb = ResultBean.fireFail(); + ActualAndOrgDeptVo vo = busVehicleApplyService.getActualAndOrgDept(vehicleOrderSid,modelSid,configSid); +// BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(vehicleOrderSid); +// if (vo == null) { +// return rb; +// } +// BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.fetchAllBySid(vo.getPurchaseRequisitionSid()); +// BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(vo.getPurchaseApplyMediumModelSid()); +// ActualAndOrgDeptVo actualAndOrgDeptDto = new ActualAndOrgDeptVo(); +// actualAndOrgDeptDto.setOrgDeptSid(busVehicleApplyDetailsVo.getOrgDeptSid()); +// actualAndOrgDeptDto.setOrgDeptName(busVehicleApplyDetailsVo.getOrgDeptName()); +// actualAndOrgDeptDto.setActualPay(busVehicleApplyDetail.getActualPay()); +// actualAndOrgDeptDto.setActualSid(busVehicleApplyDetail.getActualSid()); + return rb.success().setData(vo); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index 5c426c93fb..d0536e2345 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -249,7 +249,8 @@ public class BusVehicleOrderService extends MybatisBaseService - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue index bd8c0b5982..4594735d0d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue @@ -1,7 +1,7 @@ - + - - + +
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index ba709426c1..335aa821d3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -25,7 +25,7 @@ import javax.validation.Valid; import java.util.List; /** - * 财务模块调用金蝶暂存业务单据的接口 + * 财务模块调用金蝶暂存业务单据的接口 @RequestBody */ @Api(tags = "财务模块调用金蝶暂存业务单据的接口") @FeignClient( @@ -42,7 +42,7 @@ public interface FinKingDeeFeign { @ApiOperation("入账暂存应付单的接口") @PostMapping("/draftEntryBill") @ResponseBody - ResultBean draftEntryBill(@RequestBody APPayable APPayable); + ResultBean draftEntryBill(@RequestBody @Valid APPayable APPayable); /** * 生成的应付单的数据，推送到金蝶的平台中 * @return @@ -50,23 +50,23 @@ public interface FinKingDeeFeign { @ApiOperation("入账暂存应收单的接口") @PostMapping("/draftReceivableBill") @ResponseBody - ResultBean draftReceivableBill(@RequestBody ARReceivable aRReceivable); + ResultBean draftReceivableBill(@RequestBody @Valid ARReceivable aRReceivable); @ApiOperation("暂存付款单的接口") @PostMapping("/draftApPayBill") @ResponseBody - public ResultBean draftApPayBill(@RequestBody ApPayBill apPayBill) ; + public ResultBean draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) ; @ApiOperation("暂存采购入库单的接口") @PostMapping("/draftStkInStock") @ResponseBody - public ResultBean draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception; + public ResultBean draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception; @ApiOperation("暂存采购退料单的接口") @PostMapping("/draftPurMrb") @ResponseBody - public ResultBean draftPurMrb(@RequestBody PurMrb purMrb) ; + public ResultBean draftPurMrb(@RequestBody @Valid PurMrb purMrb) ; @ApiOperation("暂存采购出库单的接口") @PostMapping("/draftSalOutStock") @ResponseBody - public ResultBean draftSalOutStock(@RequestBody SalOutStock salOutStock) ; + public ResultBean draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) ; @ApiOperation("暂存物料的接口") @PostMapping("/draftBdMaterialList") @ResponseBody @@ -78,19 +78,19 @@ public interface FinKingDeeFeign { @ApiOperation("暂存直接调拨单的接口") @PostMapping("/draftStkTransferDirect") @ResponseBody - public ResultBean draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) ; + public ResultBean draftStkTransferDirect(@RequestBody @Valid StkTransferDirect stkTransferDirect) ; @ApiOperation("暂存直接调拨单的接口") @PostMapping("/draftOrgOrganizations") @ResponseBody - public ResultBean draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) ; + public ResultBean draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations) ; @ApiOperation("暂存供应商的接口") @PostMapping("/draftBdSupplier") @ResponseBody - ResultBean draftBdSupplier(@RequestBody BdSupplier bdSupplier); + ResultBean draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier); @ApiOperation("暂存客户信息的接口") @PostMapping("/draftBdCustomer") @ResponseBody - ResultBean draftBdCustomer(@RequestBody BdCustomer bdCustomer); + ResultBean draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer); @ApiOperation("使用number查看数据表单") @GetMapping("/getKingDataInfoByNumber/{formId}/{number}") @ResponseBody @@ -102,7 +102,7 @@ public interface FinKingDeeFeign { @ApiOperation("下推") @PostMapping("/draftStkInStockPushPurMrb") @ResponseBody - public ResultBean draftStkInStockPushPurMrb(@RequestBody STKInStockPushPurmrb push) throws Exception; + public ResultBean draftStkInStockPushPurMrb(@RequestBody @Valid STKInStockPushPurmrb push) throws Exception; @ApiOperation("暂存仓库信息的接口") @PostMapping("/drafBDStock") @ResponseBody diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index a555e06047..a2154d861f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -194,7 +194,7 @@ public class FinPaymentrecordService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()); - if (!resultBean.getSuccess()) { + if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); if (vo != null) { apPayBill.setFPURCHASEORGID(vo.getOrgCode()); @@ -211,9 +211,9 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); if (finPaymentrecord.getCost() != null @@ -225,13 +225,16 @@ public class FinPaymentrecordService extends MybatisBaseService drafBDBank(BDBank bdBank) { + public ResultBean drafBDBank(@RequestBody @Valid BDBank bdBank) { return bdBankService.draftBDBank(bdBank);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } @@ -249,7 +249,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @PostMapping("/drafCNBankacnt") @ResponseBody @Override - public ResultBean drafCNBankacnt(CNBankacnt cNBankacnt) { + public ResultBean drafCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) { return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java index ab89dbc3ae..3ff3837c20 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java @@ -6,13 +6,17 @@ public class KingDeeConfig { public static String sessionValue = ""; public static String aspnetsessionValue = ""; /** - * 登录金蝶的账户信息 + * 登录金蝶的账户信息 20211011 + */ + public static String acctID = "61654d8e138fe6"; + /** + * 登录金蝶的账户信息 2022010测试 */ - public static String acctID = "61dce6601125a0"; + // public static String acctID = "61dce6601125a0"; /** * 登录金蝶的账户信息 */ - public static String userName = "信息部2"; + public static String userName = "信息部"; /** * 登录金蝶的账户信息 */ diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 1ba697296e..4d0fc5be2f 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -149,4 +149,9 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("查询分公司下的销售支持部") ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name); + + @GetMapping("/selectOrgSidList") + @ResponseBody + @ApiOperation("所有分公司sid") + ResultBean> selectOrgSidList(); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 8d4a8a4a4c..ab53e337c2 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -152,4 +152,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean selectByPSid(String sid, String name) { return null; } + + @Override + public ResultBean> selectOrgSidList() { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index ba2219a2c1..0edc2c4fd5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -224,4 +224,7 @@ public interface SysUserFeign { @ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户") @GetMapping(value = "selectSysUserList") ResultBean> selectSysUserList(@RequestParam("userSid") String userSid); + @ApiOperation(value = "查询是否需要更换密码") + @GetMapping(value = "/selectPasswordByUserSid/{userSid}") + ResultBean selectPasswordByUserSid(@PathVariable("userSid")String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index b7d69e96ce..4702c693e7 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -204,4 +204,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean> selectSysUserList(String userSid) { return null; } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 42ab950f2b..5998db7eec 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -111,4 +111,6 @@ public interface SysOrganizationMapper extends BaseMapper { List selectByOrgDeptSid(String orgDeptSid); SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name); + + List selectOrgSidList(); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 69d5a18ec4..1ea5f9e06b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -195,6 +195,13 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 420af12785..d340fe09b9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -371,4 +371,11 @@ public class SysOrganizationRest implements SysOrganizationFeign { public ResultBean selectByPSid(String sid, String name) { return sysOrganizationService.selectByPSid(sid,name); } + + @Override + public ResultBean> selectOrgSidList() { + ResultBean> rb = ResultBean.fireFail(); + List stringList = sysOrganizationService.selectOrgSidList(); + return rb.success().setData(stringList); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index ee71c6df3a..dce889491b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -513,4 +513,8 @@ public class SysOrganizationService extends MybatisBaseService selectOrgSidList() { + return baseMapper.selectOrgSidList(); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 952604d6b1..93c2d5eda1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -618,4 +618,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean> selectSysUserList(String userSid) { return sysUserService.selectSysUserList(userSid); } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return sysUserService.selectPasswordByUserSid(userSid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 692a819b4b..e80617c187 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -373,7 +373,7 @@ public class SysUserService extends MybatisBaseService { orgList1.setOrgName(sysOrganization.getName()); // orgList1.setOrgPath(vv.getOrgSidPath()); orgList1.setOrgPath(sysOrganization.getSid()); - }else{ + } else { continue; } orgList.add(orgList1); @@ -1054,4 +1054,22 @@ public class SysUserService extends MybatisBaseService { } return rb.success().setData(voList); } + + public ResultBean selectPasswordByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + boolean isTrue = false; + //查询手机号 + SysUser sysUser = fetchBySid(userSid); + if (sysUser != null) { + String mobile = sysUser.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (sysUser.getPassword().equals(md5)) { + isTrue = true; + } + } + } + return rb.success().setData(isTrue); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 83f2457350..f2f01556e1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -8,18 +8,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptDto; +import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; -import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.OperVehicleState; - import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -40,18 +38,20 @@ import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService; import com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemService; import com.yxt.common.base.config.component.FileUploadComponent; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -483,17 +483,17 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehicleDtos) { List baseVehicleDtos=new ArrayList<>(); //获取车辆对应的采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路 - ResultBean actualAndOrgDept = busVehicleOrderFeign.getActualAndOrgDept(booad.getVehicleOrderSid()); - ActualAndOrgDeptDto aaodd = actualAndOrgDept.getData(); + ResultBean actualAndOrgDept = busVehicleOrderFeign.getActualAndOrgDept(booad.getVehicleOrderSid(),booad.getModelSid(),booad.getConfigSid()); + ActualAndOrgDeptVo aaodd = actualAndOrgDept.getData(); if(!actualAndOrgDept.getSuccess()||aaodd==null){ return; } + + for(ScmApplyInboundVehicleDto s:scmApplyInboundVehicleDtos){ //车辆台账推送数据 BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); - /* BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderFeign.fetchBySid(booad.getVehicleOrderSid()).getData(); - //排产/采购申请sid - String purchaseRequisitionSid = busVehicleOrderVo.getPurchaseRequisitionSid();*/ + // //采购系统（部门）sid baseVehicleDto.setPurchaseSystemSid(aaodd.getOrgDeptSid()); //采购系统（部门） diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index ceeb54fa51..a048449366 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -367,6 +367,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} ") + @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} AND id IN ( SELECT max( id ) id FROM scm_vehicle_patrolinspection GROUP BY vinNo ORDER BY id DESC )") List selectListVo(@Param("useOrgSid") String useOrgSid); /** diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java index 7d877dc382..958fb24fe5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java @@ -229,18 +229,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService list = new ArrayList<>(); -// List splitName = Arrays.asList(vo.getLiableName().split(",")); -// List splitSid = Arrays.asList(vo.getLiableSid().split(",")); -// for (int i = 0; i < splitName.size(); i++) { -// AppLiableListVo v = new AppLiableListVo(); -// v.setLiableName(splitName.get(i)); -// v.setLiableSid(splitSid.get(i)); -// list.add(v); -// } -// vo.setLiableList(list); -// } List images = new ArrayList<>(); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { @@ -534,7 +522,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService vinNoList = new ArrayList<>(); List mainList = new ArrayList<>(); + //所有巡检记录 List patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid); List list = new ArrayList<>(); if (patrolinspectionVos.size() > 0) { @@ -198,11 +199,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService{{ scope.row.saleGuPrice }} - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue index 746a8742bf..57491df198 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue @@ -102,7 +102,7 @@ {{ scope.row.saleGuPrice }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index 5bfb502019..a5d3fe6e51 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -126,7 +126,7 @@ {{ scope.row.saleGuPrice }} - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue index dbc7bc950d..e2e370e2b2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue @@ -30,7 +30,7 @@ - +