|
|
|
@ -75,6 +75,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; |
|
|
|
@ -161,6 +162,7 @@ import com.yxt.messagecenter.api.message.MessageFlowVo; |
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowableQuery; |
|
|
|
import com.yxt.messagecenter.api.messagelist.MessageList; |
|
|
|
import com.yxt.messagecenter.api.messagelist.MessageListFeign; |
|
|
|
import org.apache.commons.beanutils.BeanUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@ -172,6 +174,7 @@ import java.io.ByteArrayOutputStream; |
|
|
|
import java.io.IOException; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.lang.reflect.InvocationTargetException; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigInteger; |
|
|
|
import java.net.HttpURLConnection; |
|
|
|
@ -1746,6 +1749,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), ""); |
|
|
|
for (AppBusSalesOrderVo record : pagging.getRecords()) { |
|
|
|
if (pq.getParams().getType().equals("2")) { |
|
|
|
record.setShowRePublishBtn(true); |
|
|
|
} |
|
|
|
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); |
|
|
|
if (commonContractVoResultBean.getData() != null) { |
|
|
|
record.setContractId(commonContractVoResultBean.getData().getContractNo()); |
|
|
|
@ -4356,10 +4362,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//用户sid
|
|
|
|
bv.setUserSid(busSalesOrder.get().getCreateBySid()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); |
|
|
|
String nextNodeUserSids_ = sysOrganization.getManagerSid(); |
|
|
|
bv.setNextNodeUserSids(nextNodeUserSids_); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); |
|
|
|
if (r == 1) { |
|
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); |
|
|
|
if (!voResultBean.getSuccess()) { |
|
|
|
@ -5030,13 +5036,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
String orgName = busSalesOrder.getOrgName(); |
|
|
|
String customerName = busSalesOrder.getCustomerName(); |
|
|
|
String typeValue = ""; |
|
|
|
if("1".equals(busSalesOrder.getPayTypeKey())){ |
|
|
|
if ("1".equals(busSalesOrder.getPayTypeKey())) { |
|
|
|
typeValue = "全款销售订单"; |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
typeValue = "贷款销售订单"; |
|
|
|
} |
|
|
|
String orderNames = orgName+"<"+customerName+">系列-"+typeValue; |
|
|
|
variables.put("orderNames",orderNames); |
|
|
|
String orderNames = orgName + "<" + customerName + ">系列-" + typeValue; |
|
|
|
variables.put("orderNames", orderNames); |
|
|
|
return variables; |
|
|
|
} |
|
|
|
|
|
|
|
@ -5910,13 +5916,230 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo(); |
|
|
|
BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo); |
|
|
|
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney(); |
|
|
|
if (oneBillMoney == null){ |
|
|
|
if (oneBillMoney == null) { |
|
|
|
busSalesOrderIsDTKPJVo.setIsEdit(false); |
|
|
|
busSalesOrderIsDTKPJVo.setOneBillMoney(""); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
busSalesOrderIsDTKPJVo.setIsEdit(true); |
|
|
|
busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString()); |
|
|
|
} |
|
|
|
return rb.success().setData(busSalesOrderIsDTKPJVo); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean<String> rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String newSalesOrderSid = ""; |
|
|
|
boolean saleOrderSave = false; |
|
|
|
//根据销售订单sid查询销售订单主表信息并复制
|
|
|
|
BusSalesOrder busSalesOrder = this.fetchBySid(saleOrderSid); |
|
|
|
if (null != busSalesOrder) { |
|
|
|
BusSalesOrder newSalesOrder = new BusSalesOrder(); |
|
|
|
newSalesOrderSid = newSalesOrder.getSid(); |
|
|
|
Date createTime = newSalesOrder.getCreateTime(); |
|
|
|
Date modifyTime = newSalesOrder.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrder, busSalesOrder); |
|
|
|
newSalesOrder.setSid(newSalesOrderSid); |
|
|
|
newSalesOrder.setCreateDate(null); |
|
|
|
newSalesOrder.setNodeState(null); |
|
|
|
newSalesOrder.setProcDefId(null); |
|
|
|
newSalesOrder.setProcDefId(null); |
|
|
|
newSalesOrder.setProcDefId(null); |
|
|
|
newSalesOrder.setNodeId(null); |
|
|
|
newSalesOrder.setProcInstId(null); |
|
|
|
newSalesOrder.setTaskId(null); |
|
|
|
newSalesOrder.setOneBillMoney(null); |
|
|
|
newSalesOrder.setCreateTime(createTime); |
|
|
|
newSalesOrder.setModifyTime(modifyTime); |
|
|
|
saleOrderSave = this.save(newSalesOrder); |
|
|
|
} |
|
|
|
//根据销售订单sid 复制销售订单-订金信息
|
|
|
|
List<BusSalesOrderDeposit> busSalesOrderDeposits = busSalesOrderDepositService.getListByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderDeposits) { |
|
|
|
for (BusSalesOrderDeposit busSalesOrderDeposit : busSalesOrderDeposits) { |
|
|
|
if (null != busSalesOrderDeposit) { |
|
|
|
//获取订金信息sid
|
|
|
|
String OldDepositSid = busSalesOrderDeposit.getSid(); |
|
|
|
BusSalesOrderDeposit newSalesOrderDeposit = new BusSalesOrderDeposit(); |
|
|
|
String depositSid = newSalesOrderDeposit.getSid(); |
|
|
|
Date depositCreateTime = newSalesOrderDeposit.getCreateTime(); |
|
|
|
Date depositModifyTime = newSalesOrderDeposit.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderDeposit, busSalesOrderDeposit); |
|
|
|
newSalesOrderDeposit.setSid(depositSid); |
|
|
|
newSalesOrderDeposit.setCreateTime(depositCreateTime); |
|
|
|
newSalesOrderDeposit.setModifyTime(depositModifyTime); |
|
|
|
newSalesOrderDeposit.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean depositSave = busSalesOrderDepositService.save(newSalesOrderDeposit); |
|
|
|
//根据订金信息sid查虚拟订单与订金信息关联表
|
|
|
|
List<BusDepositFictitious> fictitious = busDepositFictitiousService.getListByDepositSid(OldDepositSid); |
|
|
|
if (null != fictitious) { |
|
|
|
for (BusDepositFictitious busDepositFictitious : fictitious) { |
|
|
|
if (null != busDepositFictitious) { |
|
|
|
BusDepositFictitious newObject = new BusDepositFictitious(); |
|
|
|
String sid = newObject.getSid(); |
|
|
|
Date createTime = newObject.getCreateTime(); |
|
|
|
Date modifyTime = newObject.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newObject, busDepositFictitious); |
|
|
|
newObject.setSid(sid); |
|
|
|
newObject.setCreateTime(createTime); |
|
|
|
newObject.setModifyTime(modifyTime); |
|
|
|
newObject.setDepositSid(newSalesOrderDeposit.getSid()); |
|
|
|
boolean save = busDepositFictitiousService.save(newObject); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//根据销售订单sid复制销售订单-主车优惠明细
|
|
|
|
List<BusSalesOrderDiscount> busSalesOrderDiscounts = busSalesOrderDiscountService.selectBySaleOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderDiscounts) { |
|
|
|
for (BusSalesOrderDiscount busSalesOrderDiscount : busSalesOrderDiscounts) { |
|
|
|
if (null != busSalesOrderDiscount) { |
|
|
|
BusSalesOrderDiscount newSalesOrderDiscount = new BusSalesOrderDiscount(); |
|
|
|
String discountSid = newSalesOrderDiscount.getSid(); |
|
|
|
Date discountCreateTime = newSalesOrderDiscount.getCreateTime(); |
|
|
|
Date discountModifyTime = newSalesOrderDiscount.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderDiscount, busSalesOrderDiscount); |
|
|
|
newSalesOrderDiscount.setSid(discountSid); |
|
|
|
newSalesOrderDiscount.setCreateTime(discountCreateTime); |
|
|
|
newSalesOrderDiscount.setModifyTime(discountModifyTime); |
|
|
|
newSalesOrderDiscount.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean discountSave = busSalesOrderDiscountService.save(newSalesOrderDiscount); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//销售订单-保险信息
|
|
|
|
List<BusSalesOrderInsurance> busSalesOrderInsurances = busSalesOrderInsuranceService.selectBySaleOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderInsurances) { |
|
|
|
for (BusSalesOrderInsurance busSalesOrderInsurance : busSalesOrderInsurances) { |
|
|
|
if (null != busSalesOrderInsurance) { |
|
|
|
BusSalesOrderInsurance newSalesOrderInsurance = new BusSalesOrderInsurance(); |
|
|
|
String insuranceSid = newSalesOrderInsurance.getSid(); |
|
|
|
Date insuranceCreateTime = newSalesOrderInsurance.getCreateTime(); |
|
|
|
Date insuranceModifyTime = newSalesOrderInsurance.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderInsurance, busSalesOrderInsurance); |
|
|
|
newSalesOrderInsurance.setSid(insuranceSid); |
|
|
|
newSalesOrderInsurance.setCreateTime(insuranceCreateTime); |
|
|
|
newSalesOrderInsurance.setModifyTime(insuranceModifyTime); |
|
|
|
newSalesOrderInsurance.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean insurancetSave = busSalesOrderInsuranceService.save(newSalesOrderInsurance); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//销售订单-上装配置
|
|
|
|
List<BusSalesOrderMakeup> busSalesOrderMakeups = busSalesOrderMakeupService.selectListByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderMakeups) { |
|
|
|
for (BusSalesOrderMakeup busSalesOrderMakeup : busSalesOrderMakeups) { |
|
|
|
if (null != busSalesOrderMakeup) { |
|
|
|
BusSalesOrderMakeup newSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
String makeupSid = newSalesOrderMakeup.getSid(); |
|
|
|
Date makeupCreateTime = newSalesOrderMakeup.getCreateTime(); |
|
|
|
Date makeupModifyTime = newSalesOrderMakeup.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderMakeup, busSalesOrderMakeup); |
|
|
|
newSalesOrderMakeup.setSid(makeupSid); |
|
|
|
newSalesOrderMakeup.setCreateTime(makeupCreateTime); |
|
|
|
newSalesOrderMakeup.setModifyTime(makeupModifyTime); |
|
|
|
newSalesOrderMakeup.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean makeupSave = busSalesOrderMakeupService.save(newSalesOrderMakeup); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//销售订单-主车车型
|
|
|
|
List<BusSalesOrderModel> busSalesOrderModels = busSalesOrderModelService.selectListByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderModels) { |
|
|
|
for (BusSalesOrderModel busSalesOrderModel : busSalesOrderModels) { |
|
|
|
if (null != busSalesOrderModel) { |
|
|
|
BusSalesOrderModel newSalesOrderModel = new BusSalesOrderModel(); |
|
|
|
String modelSid = newSalesOrderModel.getSid(); |
|
|
|
Date modelCreateTime = newSalesOrderModel.getCreateTime(); |
|
|
|
Date modelModifyTime = newSalesOrderModel.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderModel, busSalesOrderModel); |
|
|
|
newSalesOrderModel.setSid(modelSid); |
|
|
|
newSalesOrderModel.setCreateTime(modelCreateTime); |
|
|
|
newSalesOrderModel.setModifyTime(modelModifyTime); |
|
|
|
newSalesOrderModel.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean makeupSave = busSalesOrderModelService.save(newSalesOrderModel); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//销售订单-价格信息
|
|
|
|
List<BusSalesOrderPrice> busSalesOrderPrices = busSalesOrderPriceService.selectListByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderPrices) { |
|
|
|
for (BusSalesOrderPrice busSalesOrderPrice : busSalesOrderPrices) { |
|
|
|
if (null != busSalesOrderPrice) { |
|
|
|
BusSalesOrderPrice newSalesOrderPrice = new BusSalesOrderPrice(); |
|
|
|
String priceSid = newSalesOrderPrice.getSid(); |
|
|
|
Date createTime = newSalesOrderPrice.getCreateTime(); |
|
|
|
Date modifyTime = newSalesOrderPrice.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderPrice, busSalesOrderPrice); |
|
|
|
newSalesOrderPrice.setSid(priceSid); |
|
|
|
newSalesOrderPrice.setCreateTime(createTime); |
|
|
|
newSalesOrderPrice.setModifyTime(modifyTime); |
|
|
|
newSalesOrderPrice.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean priceSave = busSalesOrderPriceService.save(newSalesOrderPrice); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// 销售订单-车辆信息
|
|
|
|
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderVehicles) { |
|
|
|
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { |
|
|
|
if (null != busSalesOrderVehicle) { |
|
|
|
BusSalesOrderVehicle newSalesOrderVehicle = new BusSalesOrderVehicle(); |
|
|
|
String sid = newSalesOrderVehicle.getSid(); |
|
|
|
Date createTime = newSalesOrderVehicle.getCreateTime(); |
|
|
|
Date modifyTime = newSalesOrderVehicle.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderVehicle, busSalesOrderVehicle); |
|
|
|
newSalesOrderVehicle.setSid(sid); |
|
|
|
newSalesOrderVehicle.setCreateTime(createTime); |
|
|
|
newSalesOrderVehicle.setModifyTime(modifyTime); |
|
|
|
newSalesOrderVehicle.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean vehicleSave = busSalesOrderVehicleService.save(newSalesOrderVehicle); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// 销售订单-订单提交时补充的返利信息
|
|
|
|
List<BusSalesOrderSubmit> busSalesOrderSubmits = busSalesOrderSubmitService.selectListByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesOrderSubmits) { |
|
|
|
for (BusSalesOrderSubmit busSalesOrderSubmit : busSalesOrderSubmits) { |
|
|
|
if (null != busSalesOrderSubmit) { |
|
|
|
BusSalesOrderSubmit newSalesOrderSubmit = new BusSalesOrderSubmit(); |
|
|
|
String sid = newSalesOrderSubmit.getSid(); |
|
|
|
Date createTime = newSalesOrderSubmit.getCreateTime(); |
|
|
|
Date modifyTime = newSalesOrderSubmit.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newSalesOrderSubmit, busSalesOrderSubmit); |
|
|
|
newSalesOrderSubmit.setSid(sid); |
|
|
|
newSalesOrderSubmit.setCreateTime(createTime); |
|
|
|
newSalesOrderSubmit.setModifyTime(modifyTime); |
|
|
|
newSalesOrderSubmit.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean vehicleSave = busSalesOrderSubmitService.save(newSalesOrderSubmit); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// 销售订单-采购订单信息
|
|
|
|
List<BusSalesVehicleOrder> busSalesVehicleOrders = busSalesVehicleOrderService.selectByOrderSid(saleOrderSid); |
|
|
|
if (null != busSalesVehicleOrders) { |
|
|
|
for (BusSalesVehicleOrder busSalesVehicleOrder : busSalesVehicleOrders) { |
|
|
|
if (null != busSalesVehicleOrder) { |
|
|
|
BusSalesVehicleOrder newObject = new BusSalesVehicleOrder(); |
|
|
|
String sid = newObject.getSid(); |
|
|
|
Date createTime = newObject.getCreateTime(); |
|
|
|
Date modifyTime = newObject.getModifyTime(); |
|
|
|
BeanUtils.copyProperties(newObject, busSalesVehicleOrder); |
|
|
|
newObject.setSid(sid); |
|
|
|
newObject.setCreateTime(createTime); |
|
|
|
newObject.setModifyTime(modifyTime); |
|
|
|
newObject.setSalesOrderSid(newSalesOrderSid); |
|
|
|
boolean save = busSalesVehicleOrderService.save(newObject); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (saleOrderSave) { |
|
|
|
return rb.success().setMsg("重新发起成功，请在待办理列表进行修改提交。"); |
|
|
|
} else { |
|
|
|
return rb.success().setMsg("重新发起失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
fanzongzhe
2 years ago