diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java index 793ae8e6a6..562c30f6e6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java @@ -41,4 +41,7 @@ public class AppVehicleApplyListVo implements Vo { @ApiModelProperty(value = "配置名称") private String configName; + + @ApiModelProperty("厂家销售通路") + private String actualPay; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java index 58b5b54cb1..41b92e9c1e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java @@ -48,4 +48,6 @@ public class AppVehicleApplyVo implements Vo { private String applyType; @ApiModelProperty("订金付款备注") private String payRemarks; + @ApiModelProperty("采购系统") + private String orgDeptName; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml index a8021c9840..21325e4539 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml @@ -64,7 +64,8 @@ reason, money, case isPay when '1' then '1' when '0' then '0' end payStateKey, - case isPay when '1' then '是' when '0' then '否' end payState + case isPay when '1' then '是' when '0' then '否' end payState, + useOrgName from base_vehicle_actual_sales where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 80334eb196..08fb599ce1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -7,6 +7,10 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicleout.*; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -17,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @Author dimengzhe @@ -29,6 +35,10 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); + if (!resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleOrgId(vo.getOrgCode()); + } + } + //客户 + //销售部门id + ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); + if (resultBean1.getSuccess()) { + SysOrganizationVo vo = resultBean1.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + + //业务员 + + //中介单位 + + //物料列表 + List fEntityList = new ArrayList<>(); + + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + //物料编码 + //批号 + //仓库id + //销售折让 + //返利金额 + //备注 + fEntityList.add(fEntity); + if (fEntityList.size() > 0) { + salOutStock.setFEntity(fEntityList); + return salOutStock; + } else { + return null; + } + + } + public PagerVo pagerList(PagerQuery query) { IPage page = PagerUtil.queryToPage(query); BaseVehicleOutQuery params = query.getParams(); 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 796bd32a82..c9a901295a 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 @@ -74,7 +74,8 @@ ba.createOrgSid as userSid, ba.createOrgName, ba.applyType, - ba.payRemarks + ba.payRemarks, + ba.orgDeptName from bus_vehicle_apply ba where sid = #{sid} @@ -99,6 +100,7 @@ select count(*) from bus_vehicle_apply ba left join base_manufactor_subscription bs on ba.applicationCode = bs.proSchAppNo - where bs.state = 1 and find_in_set(ba.sid, #{join}) + 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/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 6c29662e3a..1dc25b7eb7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -55,7 +55,8 @@ left join bus_vehicle_apply bv on bd.applySid = bv.sid left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid where bd.vehicleSid = #{modelSid} - and bd.configSid = #{configSid} and length(bo.platformNo)>0 + and bd.configSid = #{configSid} + and length(bo.platformNo) > 0 \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index a38974aa53..ce3bc3ebe3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -259,6 +259,9 @@ public class FinCostapplyService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid",businessSid); + variables.put("app",appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java index 1736e63bc4..654e09bc3f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java @@ -42,7 +42,7 @@ public class CostDetailsVo implements Vo { private String remarks; //是否涉及车辆 - + @JsonProperty("isVeh") private boolean isVeh;