|
|
|
@ -41,9 +41,11 @@ import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo; |
|
|
|
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.*; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.app.*; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; |
|
|
|
@ -80,7 +82,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
|
@ -217,10 +218,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
PagerVo<BusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
List<BusSalesOrderVo> list = p.getRecords(); |
|
|
|
for (BusSalesOrderVo vo : list) { |
|
|
|
ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid()); |
|
|
|
if (resultBean.getSuccess() && resultBean.getData() != null) { |
|
|
|
SysFormStateVo formState = resultBean.getData(); |
|
|
|
vo.setNodeState(formState.getNodeState()); |
|
|
|
if (StringUtils.isNotBlank(vo.getNodeState())) { |
|
|
|
vo.setNodeState(vo.getNodeState()); |
|
|
|
} else { |
|
|
|
vo.setNodeState("待提交"); |
|
|
|
} |
|
|
|
@ -349,14 +348,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} else if ("2".equals(dto.getType())) { |
|
|
|
//采购订单
|
|
|
|
List<BusSalesVehicleOrderDto> busSalesVehicleOrderList = dto.getBusSalesVehicleOrderList(); |
|
|
|
if(busSalesVehicleOrderList.size()>0){ |
|
|
|
if (busSalesVehicleOrderList.size() > 0) { |
|
|
|
for (int i = 0; i < busSalesVehicleOrderList.size(); i++) { |
|
|
|
if(busSalesVehicleOrderList.get(i) != null){ |
|
|
|
if(busSalesVehicleOrderList.get(i).getUsingNum()>busSalesVehicleOrderList.get(i).getUseNum()){ |
|
|
|
return rb.setMsg("本次使用台数不允许大于可使用台数"); |
|
|
|
if (busSalesVehicleOrderList.get(i) != null) { |
|
|
|
//根据采购订单sid查询采购订单的可使用台数
|
|
|
|
ResultBean<BusVehicleOrderVo> busVehicleOrderVoResultBean = busVehicleOrderFeign.fetchBySid(busSalesVehicleOrderList.get(i).getLinkSid()); |
|
|
|
if (busVehicleOrderVoResultBean.getSuccess()) { |
|
|
|
Integer useNum = 0; |
|
|
|
String platformNo = busVehicleOrderVoResultBean.getData().getPlatformNo(); |
|
|
|
String lockingNum = busVehicleOrderVoResultBean.getData().getLockingNum(); |
|
|
|
if (StringUtils.isNotBlank(platformNo)) { |
|
|
|
if (StringUtils.isNotBlank(lockingNum)) { |
|
|
|
useNum = Integer.parseInt(platformNo) - Integer.parseInt(lockingNum); |
|
|
|
}else{ |
|
|
|
useNum = Integer.parseInt(platformNo); |
|
|
|
} |
|
|
|
} |
|
|
|
if (busSalesVehicleOrderList.get(i).getUsingNum() != null && useNum != 0) { |
|
|
|
if (busSalesVehicleOrderList.get(i).getUsingNum() > useNum) { |
|
|
|
return rb.setMsg("本次使用台数不允许大于可使用台数"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum(); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
return rb.setMsg("请选择采购订单数据"); |
|
|
|
} |
|
|
|
|
|
|
|
@ -467,6 +484,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void updateOrder(BusSalesOrderAllDto dto) { |
|
|
|
//主车车型信息
|
|
|
|
@ -531,7 +549,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
busSalesOrderDepositService.updateOrderDepo(busSalesOrderDepositDto, dto.getSid()); |
|
|
|
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(dto.getSid()); |
|
|
|
if(busSalesOrderDeposit != null){ |
|
|
|
if (busSalesOrderDeposit != null) { |
|
|
|
if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) { |
|
|
|
//结转金额
|
|
|
|
busDepositFictitiousService.deleteByOrderSid(busSalesOrderDeposit.getSid()); |
|
|
|
@ -543,6 +561,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public String save(BusSalesOrderAllDto dto) { |
|
|
|
//主车车型信息
|
|
|
|
@ -609,6 +628,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
return sid; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public ResultBean submit(BusSalesOrderAllDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
@ -618,18 +638,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
String businessSid = resultBean.getData(); |
|
|
|
//保存提交时补充的内容
|
|
|
|
BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getBusSalesOrderSubmit(); |
|
|
|
if(busSalesOrderSubmit != null){ |
|
|
|
if(StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())){ |
|
|
|
if (busSalesOrderSubmit != null) { |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())) { |
|
|
|
BigDecimal priceBig = new BigDecimal(busSalesOrderSubmit.getDistributorPrice()); |
|
|
|
BigDecimal priceAll = new BigDecimal(busSalesOrderSubmit.getDistributorPriceAll()); |
|
|
|
if(busSalesOrderSubmit.getNum() != null){ |
|
|
|
if(priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0){ |
|
|
|
if (busSalesOrderSubmit.getNum() != null) { |
|
|
|
if (priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0) { |
|
|
|
return rb.setMsg("返利合计计算错误"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit,businessSid); |
|
|
|
busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit, businessSid); |
|
|
|
} |
|
|
|
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
@ -717,7 +737,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
for (int i = 0; i < vehicleList.size(); i++) { |
|
|
|
//根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
|
|
|
|
ResultBean<BaseVehiclePriceVo> priceResultBean = baseVehiclePolicyFeign.selectPrice(vehicleList.get(i)); |
|
|
|
if(priceResultBean.getSuccess() && priceResultBean.getData() != null){ |
|
|
|
if (priceResultBean.getSuccess() && priceResultBean.getData() != null) { |
|
|
|
String price = priceResultBean.getData().getDiscountMoney(); |
|
|
|
BigDecimal bigDecimal1 = new BigDecimal(price); |
|
|
|
initBigDecimal = initBigDecimal.add(bigDecimal1); |
|
|
|
|
Zhao Qiqi
3 years ago