|
|
|
@ -30,14 +30,15 @@ import cn.hutool.core.date.DateUtil; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
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.basebrandletpricepowimit.BaseBrandMitQuery; |
|
|
|
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign; |
|
|
|
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; |
|
|
|
import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign; |
|
|
|
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.*; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; |
|
|
|
@ -147,14 +148,12 @@ import com.yxt.messagecenter.api.message.MessageFeign; |
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowVo; |
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowableQuery; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.tomcat.util.threads.ThreadPoolExecutor; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.*; |
|
|
|
import java.util.concurrent.atomic.AtomicReference; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@ -3118,7 +3117,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
|
} |
|
|
|
BusSalesOrder busSalesOrderOne = fetchBySid(businessSid); |
|
|
|
if ("2".equals(busSalesOrderOne.getType())) { |
|
|
|
/*if ("2".equals(busSalesOrderOne.getType())) { |
|
|
|
List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid()); |
|
|
|
for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) { |
|
|
|
String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid(); |
|
|
|
@ -3128,7 +3127,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//更新该采购订单的锁定台数
|
|
|
|
ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count)); |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//保存提交时补充的内容
|
|
|
|
BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getInfo(); |
|
|
|
if (busSalesOrderSubmit != null) { |
|
|
|
@ -3157,14 +3156,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); |
|
|
|
/*List<String> orgPathList = Arrays.asList(orgSidPath.split("/")); |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); |
|
|
|
if(sysOrganization == null){ |
|
|
|
return rb.setMsg("当前所在的组织机构不存在"); |
|
|
|
} |
|
|
|
if(StringUtils.isBlank(sysOrganization.getManagerSid())){ |
|
|
|
return rb.setMsg("当前所在的组织机构未设置主管人员"); |
|
|
|
}*/ |
|
|
|
String nextNodeUserSids_ = sysOrganization.getManagerSid(); |
|
|
|
bv.setNextNodeUserSids(nextNodeUserSids_); |
|
|
|
if (r == 1) { |
|
|
|
@ -3174,7 +3165,41 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(ufVo)); |
|
|
|
try { |
|
|
|
//极光推送
|
|
|
|
busSalesOrder.set(fetchBySid(businessSid)); |
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app")); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
messageFlowableQuery.setModuleName("销售订单申请"); |
|
|
|
messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle("销售订单"); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid); |
|
|
|
AppOrderDetailsVo vo = resultBean.getData(); |
|
|
|
if ("现车".equals(vo.getOrderType())) { |
|
|
|
//更新已选择的车架号的状态为审批中
|
|
|
|
List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid); |
|
|
|
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); |
|
|
|
busMainDepositUpdateQuery.setVinSidList(list); |
|
|
|
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode()); |
|
|
|
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks()); |
|
|
|
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); |
|
|
|
} |
|
|
|
if ("2".equals(busSalesOrderOne.getType())) { |
|
|
|
List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid()); |
|
|
|
for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) { |
|
|
|
String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid(); |
|
|
|
//查询该采购订单的已使用台数
|
|
|
|
int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid); |
|
|
|
count = count + busSalesVehicleOrderDetailsVo.getUsingNum(); |
|
|
|
//更新该采购订单的锁定台数
|
|
|
|
ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count)); |
|
|
|
} |
|
|
|
} |
|
|
|
/*try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(2, 100, |
|
|
|
@ -3211,7 +3236,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
return voResultBean; |
|
|
|
} |
|
|
|
@ -3235,6 +3260,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks()); |
|
|
|
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); |
|
|
|
} |
|
|
|
if ("2".equals(busSalesOrderOne.getType())) { |
|
|
|
List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid()); |
|
|
|
for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) { |
|
|
|
String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid(); |
|
|
|
//查询该采购订单的已使用台数
|
|
|
|
int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid); |
|
|
|
count = count + busSalesVehicleOrderDetailsVo.getUsingNum(); |
|
|
|
//更新该采购订单的锁定台数
|
|
|
|
ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count)); |
|
|
|
} |
|
|
|
} |
|
|
|
return complete(bv); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
|
