Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
commit
edb32ca9d3
  1. 17
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  5. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java
  7. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
  8. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
  9. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
  10. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  11. 37
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  12. 33
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  13. 104
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  14. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java
  15. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml
  16. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
  17. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
  18. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
  19. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  20. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
  21. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  22. 2
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
  23. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue
  24. 24
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  25. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  26. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  27. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java
  28. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
  29. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
  30. 3
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
  31. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
  32. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
  33. 9
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  34. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  35. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  36. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
  37. 20
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  38. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  39. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  40. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
  41. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
  42. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
  43. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
  44. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
  45. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  46. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
  47. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
  48. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

17
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;
}

4
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;*/
}

5
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<List<BaseManufacturerListVo>> selectNameByOrg(@SpringQueryMap BaseManufacturerListQuery query);
@ApiOperation("获取分公司按钮新增供应商信息")
@GetMapping("/saveAllByOrgSid")
@ResponseBody
ResultBean saveAllByOrgSid(@SpringQueryMap BaseManufaQuery query);
}

5
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<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
return null;
}
@Override
public ResultBean saveAllByOrgSid(BaseManufaQuery query) {
return null;
}
}

6
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;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java → 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;
//厂家销售通路

5
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(车型信息) <br/>
@ -116,6 +115,6 @@ public interface BusVehicleOrderFeign {
@GetMapping("/getAppReadyCar/{modelSid}/{configSid}")
public ResultBean<List<AppOrderReadyCar>> getAppReadyCar(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
@ApiOperation("查询采购系统(部门)sid、采购系统(部门)名称字段、厂家销售通路sid、厂家销售通路")
@GetMapping("/getActualAndOrgDept/{vehicleOrderSid}")
public ResultBean<ActualAndOrgDeptDto> getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid);
@GetMapping("/getActualAndOrgDept/{vehicleOrderSid}/{modelSid}/{configSid}")
public ResultBean<ActualAndOrgDeptVo> getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid, @PathVariable("modelSid")String modelSid, @PathVariable("configSid")String configSid);
}

3
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(车型信息) <br/>
@ -109,7 +108,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
}
@Override
public ResultBean<ActualAndOrgDeptDto> getActualAndOrgDept(String vehicleOrderSid) {
public ResultBean<ActualAndOrgDeptVo> getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) {
return null;
}

5
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<BaseMa
scmApplyInbound.setModelSid(vo.getVehicleSid());
scmApplyInbound.setModelName(vo.getVehicleName());
scmApplyInbound.setApplicationDate(DateUtil.today());
scmApplyInbound.setVehicleOrderSid(dto.getSid());
scmApplyInbound.setPurchaseOrderNo(baseManufactorSubscription.getProSchAppNo());
// scmApplyInbound.setVehicleOrderSid(dto.getSid());
scmApplyInbound.setVehicleOrderSid(vo.getApplySid());
// scmApplyInbound.setPurchaseOrderNo(baseManufactorSubscription.getProSchAppNo());
scmApplyInbound.setApplicationSid(dto.getUserSid());
scmApplyInbound.setUserSid(dto.getUserSid());
scmApplyInbound.setApplicationName(busVehicleApplyDetailsVo.getCreateByName());

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@ -121,4 +121,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<BaseManufacturerListVo> selectNameByOrg(@Param("modelSid") String modelSid);
BaseManufacturer fetchByManBankSid(String s);
List<String> selectOrgList(String type);
}

37
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}
</select>
<!--根据厂商名称查重-->
<select id="selectCountByName" resultType="int">
@ -110,13 +111,13 @@
<!--联系人姓名-->
bm.contactName
FROM base_manufacturer bm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<!--根据使用组织查询厂商下拉框数据-->
<select id="selectByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufactureSelectVo">
SELECT bm.manufacturerName, bm.sid
FROM base_manufacturer bm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectAppListByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAppSearchVo">
@ -142,7 +143,8 @@
</select>
<update id="updateBySidIsDelete">
UPDATE base_manufacturer SET isDelete = 1 WHERE sid IN
UPDATE base_manufacturer
SET isDelete = 1 WHERE sid IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@ -153,7 +155,7 @@
manufacturerName
FROM base_manufacturer
WHERE supplierType = "0004"
AND isDelete=0
AND isDelete = 0
AND createOrg = #{orgSid}
</select>
@ -163,21 +165,30 @@
bankAccount
FROM base_manufacturer_bank
WHERE manufacturerSid = #{manufacturerSid}
AND isDelete = 0
AND isDelete = 0
</select>
<select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
select bmb.sid, bmb.actualPay name
from base_manufacturer_bank bmb
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
where bvm.sid = #{modelSid}
and bmb.dueBankValue = '回款账户'
and bmb.isDelete=0 AND bm.isDelete=0
and bmb.dueBankValue = '回款账户'
and bmb.isDelete = 0
AND bm.isDelete = 0
</select>
<select id="fetchByManBankSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
select * from base_manufacturer where manBankSid = #{s}
select *
from base_manufacturer
where manBankSid = #{s}
</select>
<select id="selectOrgList" resultType="java.lang.String">
select useOrg
from base_manufacturer
where supplierTypeValue = #{type}
</select>
</mapper>

33
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(安瑞基础信息模块) <br/>
@ -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<PagerVo<BaseManufacturerVo>> rb = ResultBean.fireFail();
IPage<BaseManufacturerVo> page = baseManufacturerService.gysPagerList(pagerQuery);
PagerVo<BaseManufacturerVo> pv = new PagerVo<>();
List<BaseManufacturerVo> 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<BaseManufacturerVo> 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<List<Map<String,String>>> wcgysNamesDown(String orgSid) {
public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
return baseManufacturerService.wcgysNamesDown(orgSid);
}
@ -172,4 +190,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
return baseManufacturerService.selectNameByOrg(query);
}
@Override
public ResultBean saveAllByOrgSid(BaseManufaQuery query) {
return baseManufacturerService.saveAllByOrgSid(query);
}
}

104
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(安瑞基础信息模块) <br/>
@ -93,7 +96,6 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
}
}
qw.eq("bm.isDelete", 0);
qw.ne("bm.supplierType", 0001);
qw.eq("bm.createOrg", params.getCreateOrgSid());
return baseMapper.pagerList(page, qw);
}
@ -288,13 +290,44 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
return resultBean2;
}
}
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile());
bdSupplier.setFUseOrgId("101");
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
String finalSid = sid;
Future future1 = pool.submit(() -> {
//查询所有分公司,并向所有分公司中插入供应商信息
ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
List<SysOrganizationVo> 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<String> stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier);
bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode());
ResultBean<String> stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success().setMsg("操作成功");
}
@ -361,13 +394,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
ResultBean rb = ResultBean.fireFail();
BaseManufacturer baseManufacturer = fetchBySid(sid);
if (baseManufacturer == null) {
return rb.setMsg("该厂商信息不存在");
return rb.setMsg("该信息不存在");
}
BaseManufacturerAllVo baseManufacturerAllVo = new BaseManufacturerAllVo();
BaseManufacturerDetailsVo baseManufacturerDetailsVo = selectDetailsBySid(sid);
baseManufacturerAllVo.setBaseManufacturerDto(baseManufacturerDetailsVo);
if (StringUtils.isNotBlank(baseManufacturer.getManBankSid())) {//原厂商sid
sid = baseManufacturer.getManBankSid();
}
List<BaseManufacturerBankVo> 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<BaseManufacturer
}
return rb.success().setData(stringList);
}
public List<String> selectOrgList(String type) {
return baseMapper.selectOrgList(type);
}
public ResultBean saveAllByOrgSid(BaseManufaQuery query) {
ResultBean rb = ResultBean.fireFail();
String orgSid = query.getOrgSid();
//根据分公司查询该分公司授权的品牌
List<String> brandSidList = baseVehicleBrandService.selectOrgSidBySid(orgSid);
List<String> stringList = new ArrayList<>();
for (String s : brandSidList) {
List<String> list = Arrays.asList(s.split(","));
for (String ss : list) {
stringList.add(ss);
}
}
//去重
stringList = stringList.stream().distinct().collect(Collectors.toList());
//查询类别为分公司的
String type = "分公司";
List<String> 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<SysOrganizationVo> 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();
}
}

2
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<BaseVehicleBrand> {
List<String> selectManSidByOrgSid(String orgSid);
String selectShortName(String modelSid);
List<String> selectOrgSidBySid(String orgSid);
}

28
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
&lt;&gt;
&lt;&gt;
#{sid}
</select>
@ -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}
</select>
<!--根据sid查询品牌详情-->
<select id="selectBySid" resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDetailsVo">
@ -51,10 +51,10 @@
bvb.useOrgName,
bvb.isValidity,
case bvb.isValidity
when '1' then '是'
when '2' then '否' end as isValidityValue
when '1' then '是'
when '2' then '否' end as isValidityValue
FROM base_vehicle_brand bvb
LEFT JOIN base_manufacturer bm ON bm.sid = bvb.manufacturerSid
LEFT JOIN base_manufacturer bm ON bm.sid = bvb.manufacturerSid
WHERE bvb.sid = #{sid}
</select>
<!--品牌管理分页列表-->
@ -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>
<!--根据使用组织sid查询品牌下拉框-->
<select id="selectByOrgSid" resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectVo">
@ -85,7 +85,7 @@
<select id="namesDown" resultType="java.util.Map">
SELECT bvb.brandName, bvb.sid
FROM base_vehicle_brand bvb
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectAppListByManufacturerSid" resultType="com.yxt.common.core.result.AppResultData">
@ -114,7 +114,15 @@
</select>
<select id="selectShortName" resultType="java.lang.String">
SELECT bb.brandShortName FROM base_vehicle_model bm left join base_vehicle_brand bb on bm.carBrand = bb.sid
SELECT bb.brandShortName
FROM base_vehicle_model bm
left join base_vehicle_brand bb on bm.carBrand = bb.sid
where bm.sid = #{modelSid}
</select>
<select id="selectOrgSidBySid" resultType="java.lang.String">
select bvb.useOrg
from base_vehicle_brand bvb
where find_in_set(#{useOrg}, bvb.useOrg)
</select>
</mapper>

10
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<BaseVehicleBrand
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bvb.brandName", query.getName());
}
qw.eq("bvb.isValidity",1);
qw.eq("bvb.isValidity", 1);
}
return baseMapper.selectByOrgSid(qw);
}
@ -182,8 +182,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
if (StringUtils.isNotBlank(name)) {
qw.like("bvb.useOrg", name);
}
qw.eq("bvb.isDelete",0);
qw.eq("bvb.isValidity",1);
qw.eq("bvb.isDelete", 0);
qw.eq("bvb.isValidity", 1);
return baseMapper.namesDown(qw);
}
@ -235,4 +235,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
public String selectShortName(String modelSid) {
return baseMapper.selectShortName(modelSid);
}
public List<String> selectOrgSidBySid(String orgSid) {
return baseMapper.selectOrgSidBySid(orgSid);
}
}

3
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<BusVehicleApply> {
int selectByNodeState(String join);
int selectCountBySids(String join);
ActualAndOrgDeptVo getActualAndOrgDept(@Param("sid") String vehicleOrderSid, @Param("modelSid") String modelSid, @Param("configSid") String configSid);
}

9
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})
</select>
<select id="getActualAndOrgDept" resultType="com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo">
select ba.orgDeptSid, ba.orgDeptName, bd.actualPay, bd.actualSid
from bus_vehicle_apply ba
left join bus_vehicle_apply_detail bd on ba.sid = bd.applySid
where ba.sid = #{sid}
and bd.vehicleSid = #{modelSid}
and configSid = #{configSid}
</select>
</mapper>

9
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<BusVehicleApplyMa
finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
//查询收款单位和收款账号
List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
//根据车型sid查询账户名称和银行账号
List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid);
@ -791,7 +792,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
}
//查询需要作废的数据中是否包含已认款的
int counts = baseMapper.selectCountBySids(StringUtils.join(sids, ","));
if(counts>0){
if (counts > 0) {
return rb.setMsg("选择作废的数据中包含已认款的数据,不允许作废");
}
List<String> sidsList = Arrays.asList(sids);
@ -802,4 +803,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
public BusVehicleApply selectByCode(String proSchAppNo) {
return baseMapper.selectByCode(proSchAppNo);
}
public ActualAndOrgDeptVo getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) {
return baseMapper.getActualAndOrgDept(vehicleOrderSid,modelSid,configSid);
}
}

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@ -28,9 +28,7 @@ package com.yxt.anrui.base.biz.busvehicleorder;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.busvehicleorder.*;
import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService;
import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
@ -45,7 +43,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.Collections;
import java.util.List;
/**
* Project: anrui-base(车型信息) <br/>
@ -202,20 +201,21 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
}
@Override
public ResultBean<ActualAndOrgDeptDto> getActualAndOrgDept(String vehicleOrderSid) {
ResultBean<ActualAndOrgDeptDto> 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<ActualAndOrgDeptVo> getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) {
ResultBean<ActualAndOrgDeptVo> 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);
}
}

3
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<BusVehicleOrderMa
scmApplyInbound.setModelSid(busVehicleApplyDetail.getVehicleSid());
scmApplyInbound.setModelName(busVehicleApplyDetail.getVehicleName());
scmApplyInbound.setApplicationDate(DateUtil.today());
scmApplyInbound.setVehicleOrderSid(dto.getSid());
// scmApplyInbound.setVehicleOrderSid(dto.getSid());
scmApplyInbound.setVehicleOrderSid(vehicleOrder.getPurchaseRequisitionSid());
scmApplyInbound.setPurchaseOrderNo(dto.getOrderNo());
scmApplyInbound.setApplicationSid(dto.getUserSid());
scmApplyInbound.setUserSid(dto.getUserSid());

2
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue

@ -50,7 +50,7 @@
<el-col :span="8">
<el-form-item prop="supplierType">
<el-select v-model="temp.supplierType" class="addinputw" placeholder="" @change="getSupplierType">
<el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" :disabled="item.dictValue === '挂车厂' || item.dictValue === '上装厂' || item.dictValue === '外采供应商'"/>
<el-option v-for="item in supplierType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" :disabled="item.dictValue === '挂车厂' || item.dictValue === '上装厂' || item.dictValue === '外采供应商' || item.dictValue === '分公司'"/>
</el-select>
</el-form-item>
</el-col>

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar view-title=" 公司开户账号管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title=" 公司银行账号管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -27,7 +27,7 @@
</div>
</div>
<div class="listtop">
<div class="tit">公司开户账号列表</div>
<div class="tit">公司银行账号列表</div>
<!-- 翻页分页 -->
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
@ -41,10 +41,10 @@
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="dueBankValue" width="140px" label="账户类型" align="center"/>
<el-table-column prop="dueBankValue" width="140" label="账户类型" align="center"/>
<el-table-column prop="depositBank" label="开户银行" align="center"/>
<el-table-column prop="bankAccount" width="270px" label="银行账号" align="center"/>
<el-table-column prop="accountName" label="账名称" align="center"/>
<el-table-column prop="bankAccount" width="270" label="银行账号" align="center"/>
<el-table-column prop="accountName" label="账名称" align="center"/>
</el-table>
</div>
<div class="pages">

24
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<String> draftEntryBill(@RequestBody APPayable APPayable);
ResultBean<String> draftEntryBill(@RequestBody @Valid APPayable APPayable);
/**
* 生成的应付单的数据推送到金蝶的平台中
* @return
@ -50,23 +50,23 @@ public interface FinKingDeeFeign {
@ApiOperation("入账暂存应收单的接口")
@PostMapping("/draftReceivableBill")
@ResponseBody
ResultBean<String> draftReceivableBill(@RequestBody ARReceivable aRReceivable);
ResultBean<String> draftReceivableBill(@RequestBody @Valid ARReceivable aRReceivable);
@ApiOperation("暂存付款单的接口")
@PostMapping("/draftApPayBill")
@ResponseBody
public ResultBean<String> draftApPayBill(@RequestBody ApPayBill apPayBill) ;
public ResultBean<String> draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) ;
@ApiOperation("暂存采购入库单的接口")
@PostMapping("/draftStkInStock")
@ResponseBody
public ResultBean<String> draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception;
public ResultBean<String> draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception;
@ApiOperation("暂存采购退料单的接口")
@PostMapping("/draftPurMrb")
@ResponseBody
public ResultBean<String> draftPurMrb(@RequestBody PurMrb purMrb) ;
public ResultBean<String> draftPurMrb(@RequestBody @Valid PurMrb purMrb) ;
@ApiOperation("暂存采购出库单的接口")
@PostMapping("/draftSalOutStock")
@ResponseBody
public ResultBean<String> draftSalOutStock(@RequestBody SalOutStock salOutStock) ;
public ResultBean<String> draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) ;
@ApiOperation("暂存物料的接口")
@PostMapping("/draftBdMaterialList")
@ResponseBody
@ -78,19 +78,19 @@ public interface FinKingDeeFeign {
@ApiOperation("暂存直接调拨单的接口")
@PostMapping("/draftStkTransferDirect")
@ResponseBody
public ResultBean<String> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) ;
public ResultBean<String> draftStkTransferDirect(@RequestBody @Valid StkTransferDirect stkTransferDirect) ;
@ApiOperation("暂存直接调拨单的接口")
@PostMapping("/draftOrgOrganizations")
@ResponseBody
public ResultBean<String> draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) ;
public ResultBean<String> draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations) ;
@ApiOperation("暂存供应商的接口")
@PostMapping("/draftBdSupplier")
@ResponseBody
ResultBean<String> draftBdSupplier(@RequestBody BdSupplier bdSupplier);
ResultBean<String> draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier);
@ApiOperation("暂存客户信息的接口")
@PostMapping("/draftBdCustomer")
@ResponseBody
ResultBean<String> draftBdCustomer(@RequestBody BdCustomer bdCustomer);
ResultBean<String> 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<String> draftStkInStockPushPurMrb(@RequestBody STKInStockPushPurmrb push) throws Exception;
public ResultBean<String> draftStkInStockPushPurMrb(@RequestBody @Valid STKInStockPushPurmrb push) throws Exception;
@ApiOperation("暂存仓库信息的接口")
@PostMapping("/drafBDStock")
@ResponseBody

15
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<FinPaymentrecord
//采购组织
//根据使用组织查询采购组织的编码
ResultBean<SysOrganizationVo> 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<FinPaymentrecord
}
// apPayBill.setFPURCHASEDEPTID("05.04");
//应付类别默认005定金
if ("排产".equals(finPaymentrecord.getCostTitleValue())) {
if ("排产".equals(finPaymentrecord.getCostTypeValue())) {
apPayBill.setF_PAEZ_AssistantKey("005");
apPayBill.setF_PAEZ_AssistantType("定金");
apPayBill.setF_PAEZ_AssistantType("payCostType");
}
List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
if (finPaymentrecord.getCost() != null
@ -225,13 +225,16 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
//我方银行账号
// fpaybillentry.setFACCOUNTID("100473861600010002");
fpaybillentry.setFACCOUNTID(finPaymentrecord.getPayBankAccount());
fpaybillentry.setFACCOUNTID("21010120005000143");
// fpaybillentry.setFACCOUNTID(finPaymentrecord.getPayBankAccount());
//付款用途
fpaybillentry.setFPURPOSEIDKey(finPaymentrecord.getCostTitleKey());
fpaybillentry.setFPURPOSEIDType(finPaymentrecord.getCostTitleValue());
// fpaybillentry.setFPURPOSEIDType(finPaymentrecord.getCostTitleValue());
fpaybillentry.setFPURPOSEIDType("payCostTitle");
//结算方式
fpaybillentry.setFSETTLETYPEIDKey(finPaymentrecord.getPayWayKey());
fpaybillentry.setFSETTLETYPEIDType(finPaymentrecord.getPayWayValue());
// fpaybillentry.setFSETTLETYPEIDType(finPaymentrecord.getPayWayValue());
fpaybillentry.setFSETTLETYPEIDType("paymentType");
/* if (ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())) {
//订金
fpaybillentry.setFPURPOSEIDKey("SFKYT09_SYS");

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -241,7 +241,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@PostMapping("/drafBDBank")
@ResponseBody
@Override
public ResultBean<String> drafBDBank(BDBank bdBank) {
public ResultBean<String> 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<String> drafCNBankacnt(CNBankacnt cNBankacnt) {
public ResultBean<String> drafCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) {
return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
}

10
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 = "信息部";
/**
* 登录金蝶的账户信息
*/

5
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<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name);
@GetMapping("/selectOrgSidList")
@ResponseBody
@ApiOperation("所有分公司sid")
ResultBean<List<SysOrganizationVo>> selectOrgSidList();
}

5
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<SysOrganizationVo> selectByPSid(String sid, String name) {
return null;
}
@Override
public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
return null;
}
}

3
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<List<SysUserListVo>> selectSysUserList(@RequestParam("userSid") String userSid);
@ApiOperation(value = "查询是否需要更换密码")
@GetMapping(value = "/selectPasswordByUserSid/{userSid}")
ResultBean<Boolean> selectPasswordByUserSid(@PathVariable("userSid")String userSid);
}

5
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<List<SysUserListVo>> selectSysUserList(String userSid) {
return null;
}
@Override
public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
return null;
}
}

2
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<SysOrganization> {
List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
List<SysOrganizationVo> selectOrgSidList();
}

9
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -195,6 +195,13 @@
</select>
<select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
select * from sys_organization where psid = #{sid} and name = #{name}
select *
from sys_organization
where psid = #{sid}
and name = #{name}
</select>
<select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
select sid,name from sys_organization so where so.isDept = 0
</select>
</mapper>

7
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<SysOrganizationVo> selectByPSid(String sid, String name) {
return sysOrganizationService.selectByPSid(sid,name);
}
@Override
public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
ResultBean<List<SysOrganizationVo>> rb = ResultBean.fireFail();
List<SysOrganizationVo> stringList = sysOrganizationService.selectOrgSidList();
return rb.success().setData(stringList);
}
}

4
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<SysOrganizationMa
SysOrganizationVo vo = baseMapper.selectByPSid(sid,name);
return rb.success().setData(vo);
}
public List<SysOrganizationVo> selectOrgSidList() {
return baseMapper.selectOrgSidList();
}
}

5
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<List<SysUserListVo>> selectSysUserList(String userSid) {
return sysUserService.selectSysUserList(userSid);
}
@Override
public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
return sysUserService.selectPasswordByUserSid(userSid);
}
}

20
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<SysUserMapper, SysUser> {
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<SysUserMapper, SysUser> {
}
return rb.success().setData(voList);
}
public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
ResultBean<Boolean> 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);
}
}

24
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<ScmApplyInboundMa
private void newBaseVehicleDto(ScmApplyInbound booad,List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos) {
List<BaseVehicleDto> baseVehicleDtos=new ArrayList<>();
//获取车辆对应的采购系统(部门)sid、采购系统(部门)名称字段、厂家销售通路sid、厂家销售通路
ResultBean<ActualAndOrgDeptDto> actualAndOrgDept = busVehicleOrderFeign.getActualAndOrgDept(booad.getVehicleOrderSid());
ActualAndOrgDeptDto aaodd = actualAndOrgDept.getData();
ResultBean<ActualAndOrgDeptVo> 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());
//采购系统(部门)

3
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<ScmVehicleInv
String inventoryName = dto.getInventoryName();
String inventoryStateKey = dto.getInventoryStateKey();
String remarks = dto.getRemarks();
if (StringUtils.isBlank(inventoryStateKey)){
return rb.setMsg("请选择盘库状态");
}
if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
return rb.setMsg("备注请填写盘损原因");
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@ -66,7 +66,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> 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<ScmVehiclePatrolinspectionVo> selectListVo(@Param("useOrgSid") String useOrgSid);
/**

14
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<S
public AppScmVehiclePatroVo getInspectionInfo(String recordSid) {
String type1 = "06"; // 巡检相关照片
AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid);
// if (StringUtils.isNotBlank(vo.getLiableName())) {
// List<AppLiableListVo> list = new ArrayList<>();
// List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
// List<String> 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<String> images = new ArrayList<>();
List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
if (scmFiles1.size() > 0) {
@ -534,7 +522,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
messageDto.setApp_type("2");
messageDto.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd");
JSONObject json = new JSONObject();
json.put("recordSid", appPatrolinspectionDto.getMainSid());
json.put("sid", appPatrolinspectionDto.getMainSid());
messageDto.setArgs_json(json.toJSONString());
String msgSid = (String) messageFeign.saveOrUpdateAppMessage(messageDto).getData();
String msgTypeSid = messageDto.getMsgTypeSid();

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@ -189,6 +189,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
List<String> vinNoList = new ArrayList<>();
List<String> mainList = new ArrayList<>();
//所有巡检记录
List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
List<AppScmInventoryRecordsVo> list = new ArrayList<>();
if (patrolinspectionVos.size() > 0) {
@ -198,11 +199,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录
return rb.setMsg("上次巡检记录未生成报告,请先生成再操作!");
}
//问题未解决
if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
String vinNo = patrolinspectionVo.getVinNo();
String sid = patrolinspectionVo.getSid();
vinNoList.add(vinNo);
mainList.add(sid);
if (vinNoList.contains(vinNo)){
mainList.add(sid);
}
}
if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@ -127,7 +127,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" @change="changeActualPay($event, scope.row)" clearable>
<el-option v-for="item in actualPay_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue

@ -100,7 +100,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@ -102,7 +102,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@ -126,7 +126,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" @change="changeActualPay($event, scope.row)" clearable>
<el-option v-for="item in actualPay_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

@ -100,7 +100,7 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<el-table-column label="厂家回款通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

@ -30,7 +30,7 @@
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车型" align="center" width="250">
<el-table-column label="品牌" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>

Loading…
Cancel
Save