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 92087f6c27..1b79ea7fbd 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 @@ -1,6 +1,7 @@ package com.yxt.anrui.scm.biz.scmapplyinbound; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -470,16 +471,10 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid); - List baseVehicleDtos = new ArrayList<>(); - ResultBean> resultBean1 = saveEntryCarInspectedInfo(bv, businessSid, booad, scmApplyInbound, scmApplyInboundVehicleDtos); - if (!resultBean1.getSuccess()) { - return rb.setMsg("验车业务模块的数据推送失败!"); - } - for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) { - saveItem(resultBean1); - newBaseVehicleDto(bv, booad, baseVehicleDtos, scmApplyInboundVehicleDto); - } - baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode()); + ResultBean> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(scmApplyInbound.getPriceDate(), + bv.getUserSid(),booad,businessSid,scmApplyInboundVehicleDtos); + saveItem(sids); + newBaseVehicleDto(booad, scmApplyInboundVehicleDtos); // 入账审批通关修改采购订单状态 state = 1 if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) { busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid()); @@ -491,45 +486,46 @@ public class ScmApplyInboundService extends MybatisBaseService baseVehicleDtos, ScmApplyInboundVehicleDto scmApplyInboundVehicleDto) { - //车辆台账推送数据 - BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); - baseVehicleDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); - baseVehicleDto.setModelSid(booad.getModelSid()); - baseVehicleDto.setModelName(booad.getModelName()); - String userSid = bv.getUserSid(); - ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); - String data = pathSidByUserSid.getData(); - baseVehicleDto.setCreateOrgSid(booad.getUseOrgSid()); - baseVehicleDto.setCreateOrgName(booad.getUseOrgName()); - baseVehicleDto.setUseOrgSid(booad.getUseOrgSid()); - baseVehicleDto.setUseOrgName(booad.getUseOrgName()); - baseVehicleDto.setModelConfigSid(booad.getConfigSid()); - baseVehicleDto.setConfigName(booad.getConfigName()); - baseVehicleDto.setInsideCode(booad.getInsideCode()); - baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo()); - //厂家合同价 - baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString())); - if (booad.getOnceFreight() == null && booad.getSecondaryFreight() == null) {//一次为空 二次为空 - //运费合计 - baseVehicleDto.setFreight(0); - } else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() != null) {//一次不为空 二次不空 - baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString())); - } else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() == null) {//一次不为空 二次空 - baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().toString())); - } else if (booad.getOnceFreight() == null && booad.getSecondaryFreight() != null) { //一次为空 二次不空 - baseVehicleDto.setFreight(Integer.parseInt(booad.getSecondaryFreight().toString())); + private void newBaseVehicleDto(ScmApplyInbound booad,List scmApplyInboundVehicleDtos) { + List baseVehicleDtos=new ArrayList<>(); + for(ScmApplyInboundVehicleDto s:scmApplyInboundVehicleDtos){ + //车辆台账推送数据 + BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); + baseVehicleDto.setVinNo(s.getVinNo()); + baseVehicleDto.setModelSid(booad.getModelSid()); + baseVehicleDto.setModelName(booad.getModelName()); + baseVehicleDto.setCreateOrgSid(booad.getUseOrgSid()); + baseVehicleDto.setCreateOrgName(booad.getUseOrgName()); + baseVehicleDto.setUseOrgSid(booad.getUseOrgSid()); + baseVehicleDto.setUseOrgName(booad.getUseOrgName()); + baseVehicleDto.setModelConfigSid(booad.getConfigSid()); + baseVehicleDto.setConfigName(booad.getConfigName()); + baseVehicleDto.setInsideCode(booad.getInsideCode()); + baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo()); + //厂家合同价 + baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString())); + if (booad.getOnceFreight() == null && booad.getSecondaryFreight() == null) {//一次为空 二次为空 + //运费合计 + baseVehicleDto.setFreight(0); + } else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() != null) {//一次不为空 二次不空 + baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString())); + } else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() == null) {//一次不为空 二次空 + baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().toString())); + } else if (booad.getOnceFreight() == null && booad.getSecondaryFreight() != null) { //一次为空 二次不空 + baseVehicleDto.setFreight(Integer.parseInt(booad.getSecondaryFreight().toString())); + } + // baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString())); + //厂家结算价 + baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString())); + + baseVehicleDto.setPriceDate(booad.getPriceDate()); + baseVehicleDto.setDepartureDate(booad.getDepartureDate()); + baseVehicleDto.setInsideCode(booad.getInsideCode()); + baseVehicleDto.setManPurOrderTypeKey(booad.getManPurOrderTypeKey()); + baseVehicleDto.setManPurOrderTypeValue(booad.getManPurOrderTypeValue()); + baseVehicleDtos.add(baseVehicleDto); } - // baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString())); - //厂家结算价 - baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString())); - - baseVehicleDto.setPriceDate(booad.getPriceDate()); - baseVehicleDto.setDepartureDate(booad.getDepartureDate()); - baseVehicleDto.setInsideCode(booad.getInsideCode()); - baseVehicleDto.setManPurOrderTypeKey(booad.getManPurOrderTypeKey()); - baseVehicleDto.setManPurOrderTypeValue(booad.getManPurOrderTypeValue()); - baseVehicleDtos.add(baseVehicleDto); + ThreadUtil.execute(() -> baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode())); } private void saveItem( ResultBean> resultBean1) { @@ -543,14 +539,6 @@ public class ScmApplyInboundService extends MybatisBaseService> saveEntryCarInspectedInfo(BusinessVariables bv, String businessSid, ScmApplyInbound booad, - ScmApplyInbound scmApplyInbound, - List scmApplyInboundVehicleDtos) { - ResultBean> resultBean1 = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(scmApplyInbound.getPriceDate(),bv.getUserSid(),booad,businessSid,scmApplyInboundVehicleDtos); - return resultBean1; - } - /** * 创建采购入库单 * @param scmApplyInbound diff --git a/anrui-scm/anrui-scm-ui/.env.development b/anrui-scm/anrui-scm-ui/.env.development index 20daa78374..569013981c 100644 --- a/anrui-scm/anrui-scm-ui/.env.development +++ b/anrui-scm/anrui-scm-ui/.env.development @@ -7,5 +7,5 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://26077a35f5.wicp.vip" ##VUE_APP_URL = "http://192.168.1.116:8111" -VUE_APP_URL = "http://120.46.172.184:8111" +VUE_APP_URL = "http://127.0.0.1:8111" ##VUE_APP_URL = "http://1mn7264414.qicp.vip"