From 5aa43c0ee51a976c1026ed5d2e9d236d0192e1d4 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 7 Sep 2022 17:13:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehinstallModpriceService.java | 1 + .../scm/biz/scmvehiclereturn/ScmVehicleReturnService.java | 6 +++--- .../ScmVehrebateCheckapplyMapper.java | 2 ++ .../ScmVehrebateCheckapplyMapper.xml | 7 +++++++ .../ScmVehrebateCheckapplyService.java | 5 +++++ .../ScmVehRebateWithApplyMapper.java | 2 ++ .../scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml | 8 ++++++++ .../ScmVehRebateWithApplyService.java | 5 +++++ 8 files changed, 33 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java index d1ee23813b..e0fb0b08f7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java @@ -108,6 +108,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + qw.orderByDesc("createTime"); return qw; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 2ee1344a10..89f3f4100b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -253,14 +253,14 @@ public class ScmVehicleReturnService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + /*ResultBean voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); + updateFlowFiled(BeanUtil.beanToMap(ufVo));*/ //极光推送 ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); + BeanUtil.copyProperties(uff, messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setBusinessSid(businessSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java index 809d7adccc..931231f684 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java @@ -65,4 +65,6 @@ public interface ScmVehrebateCheckapplyMapper extends BaseMapper selectListVo(); int updateFlowFiled(Map beanToMap); + + int selectBySid(String join); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml index 267774b8d9..b615de3a5b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml @@ -43,4 +43,11 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index fa5ce25502..b59672c149 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -217,6 +217,11 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } delBySids(sids); for (String sid : sids) { scmVehrebateCheckapplydetailService.delByMainSid(sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.java index 70dc3c346e..48b5abc9bd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.java @@ -65,4 +65,6 @@ public interface ScmVehRebateWithApplyMapper extends BaseMapper selectListVo(); int updateFlowFiled(Map beanToMap); + + int selectBySid(String join); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml index be11bc0208..3dd16c3d0c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml @@ -16,6 +16,7 @@ ${ew.sqlSegment} + GROUP BY svrwa.sid + SELECT COUNT(*) + FROM scm_veh_rebate_with_apply + WHERE nodeState != '待提交' + and find_in_set(sid, #{list}) + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 73788ceabf..728fb92042 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -193,6 +193,11 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } delBySids(sids); for (String sid : sids) { scmVehRebateWithService.delByMainSid(sid); From 5868706a2d8eaccdeeab227fc40fb37f30aba9b3 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 7 Sep 2022 18:57:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicle/BaseVehicleMapper.xml | 2 +- .../api/busmaindeposit/AppBusMainDepositVo.java | 2 ++ .../buscenter/biz/busdeposit/BusDepositMapper.java | 2 ++ .../buscenter/biz/busdeposit/BusDepositMapper.xml | 3 +++ .../biz/busdeposit/BusDepositService.java | 4 ++++ .../BusDepositFictitiousMapper.java | 2 ++ .../BusDepositFictitiousMapper.xml | 6 ++++++ .../BusDepositFictitiousService.java | 4 ++++ .../biz/busmaindeposit/BusMainDepositMapper.xml | 9 ++++++--- .../biz/busmaindeposit/BusMainDepositService.java | 14 ++++++++++---- .../BusSalesOrderDepositService.java | 4 ++++ .../AppCrmOrderVehicleDemandQuery.java | 3 +++ .../crmvehicledemand/CrmVehicledemandService.java | 8 +++++++- .../model/CrmOrderVehicleDemandQuery.java | 2 ++ 14 files changed, 56 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index faa16d3bf7..89a01aa02d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -885,7 +885,7 @@ select bv.vinNo vin, bv.locationName address, bv.sid carSid, - if(bv.lockedState = 1, 1, 0) + if(bv.lockedState = '01', 1, 0) as isFictitious from base_vehicle bv where bv.modelSid = #{modelSid} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index 0ab2d32a4c..b46cd06b21 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java @@ -115,4 +115,6 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty("订车特殊：审批成功后不再显示流程状态显示为 ： 有效期：3天/2天/1天;失效") private String virtualOrderState2; + private String usedDeposit; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java index 8a0e33a2cb..1db99be7fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java @@ -63,4 +63,6 @@ public interface BusDepositMapper extends BaseMapper { * @return */ int updateFlowFiled(Map map); + + int updateDeposit(@Param("depositAll") String depositAll, @Param("depositBillNo") String depositBillNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml index 58d04e3d25..afcb4809c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml @@ -67,4 +67,7 @@ WHERE sid = #{sid} + + update bus_deposit set usedDeposit = #{depositAll} where billNo = #{depositBillNo} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index 0f49d2ac66..af59fc327d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -202,4 +202,8 @@ public class BusDepositService extends MybatisBaseService getList(String sid); + + String selectDeposit(String depositBillNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml index 74911bdef5..eefb64066a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml @@ -48,4 +48,10 @@ left join bus_deposit bd2 on bf.depositBillSid = bd2.billSid where bf.depositSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java index 88138745a9..06fecc0b3c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java @@ -99,4 +99,8 @@ public class BusDepositFictitiousService extends MybatisBaseService getList(String sid) { return baseMapper.getList(sid); } + + public String selectDeposit(String depositBillNo) { + return baseMapper.selectDeposit(depositBillNo); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index b4faf1f731..9ffd2a8f52 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -45,7 +45,8 @@ bmd.staffName AS sellerName, bmd.orgName, if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, - bmd.remarks + bmd.remarks, + bd.usedDeposit FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid @@ -67,7 +68,8 @@ bmd.staffName AS sellerName, bmd.orgName, if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, - bmd.remarks + bmd.remarks, + bd.usedDeposit FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid @@ -88,7 +90,8 @@ bmd.staffName AS sellerName, bmd.orgName, if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, - bmd.remarks + bmd.remarks, + bd.usedDeposit FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 511de27783..3ac4fb10a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -71,7 +71,6 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -94,7 +93,9 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.*; +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.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -643,7 +644,12 @@ public class BusMainDepositService extends MybatisBaseService depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId()); + if(StringUtils.isNotBlank(record.getUsedDeposit())){ + record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元"); + }else{ + record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元"); + } + /*List depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId()); if (depositRecords.size() > 0) { for (BusDepositRecordsVo depositRecord : depositRecords) { String usePrice = depositRecord.getUsePrice(); @@ -655,7 +661,7 @@ public class BusMainDepositService extends MybatisBaseService AppCreatePagePcWrapper(AppCrmOrderVehicleDemandQuery query) { QueryWrapper qw = new QueryWrapper<>(); if (query != null) { - qw.eq("cv.customerSid", query.getCustomerSid()); + if(StringUtils.isNotBlank(query.getCustomerSid())){ + qw.eq("cv.customerSid", query.getCustomerSid()); + } + if(StringUtils.isNotBlank(query.getNames())){ + qw.like("cv.modelName",query.getNames()); + } + } //是否意向：0非意向，1意向 qw.eq("states", 1); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java index f8336cb958..6b780b4257 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java @@ -15,4 +15,6 @@ public class CrmOrderVehicleDemandQuery implements Query { @ApiModelProperty("客户sid") private String customerSid; + + private String names; } From 08091b96d95f07b111dc981987a30df3d1812f77 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Wed, 7 Sep 2022 19:15:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/BusMainDepositService.java | 30 +++---- .../ScmVehicleGressionFeign.java | 6 ++ .../ScmVehicleGressionFeignFallback.java | 5 ++ .../ScmVehicleGressionPageQuery.java | 5 ++ .../ScmVehicleGressionRest.java | 17 ++++ .../ScmVehicleGressionService.java | 80 ++++++++++++++++++- 6 files changed, 127 insertions(+), 16 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 3ac4fb10a7..9464e465e5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1784,13 +1784,13 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; @@ -1905,13 +1905,13 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); // String msgSid = getMessage(ufVo, appMap, busMainDeposit); @@ -1961,7 +1961,7 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); // String msgSid = getMessage(ufVo, appMap, busMainDeposit); @@ -2051,7 +2051,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", appMap); + appMap.put("sid", query.getBusinessSid()); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -2066,7 +2066,7 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())){ - messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); - }else{ - messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } messageFlowableQuery.setMsgTitle("业务中心"); ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java index ca66019c8b..0b1ff199e6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java @@ -85,6 +85,12 @@ public interface ScmVehicleGressionFeign { @ResponseBody public ResultBean> selectCarTransferList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("PC端-获取车辆移位记录") + @PostMapping("/selectCarTransferListAll") + @ResponseBody + public ResultBean> selectCarTransferListAll(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("PC端-删除车辆移库申请") @DeleteMapping("/deleteBySids") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java index 076dc92f1e..ed412a3279 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java @@ -77,6 +77,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign return null; } + @Override + public ResultBean> selectCarTransferListAll(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean deleteBySids(String[] sids) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java index 2a1e1a6a5b..7df3385c23 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java @@ -4,6 +4,8 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class ScmVehicleGressionPageQuery implements Query { @@ -13,6 +15,9 @@ public class ScmVehicleGressionPageQuery implements Query { @ApiModelProperty("车架号 ") private String vin; + @ApiModelProperty("变更记录sid") + private List sids; + @ApiModelProperty("申请单编号") private String applyId; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java index 98b625c3d7..894054ba6a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java @@ -33,6 +33,7 @@ import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehiclegression.*; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.*; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -77,6 +78,9 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { @Autowired ScmFileService scmFileService; + @Autowired + private ScmVehicleGressionVehService scmVehicleGressionVehService; + @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -125,6 +129,19 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { return new ResultBean>().success().setData(pagerVo); } + @Override + public ResultBean> selectCarTransferListAll(PagerQuery pagerQuery) { + PagerVo page = new PagerVo<>(); + List list = scmVehicleGressionVehService.fetchVoByVins(pagerQuery.getParams().getVin()); + if (list.size() > 0) { + pagerQuery.getParams().setSids(list); + IPage iPage = scmVehicleGressionService.selectCarTransferListAll(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + return new ResultBean>().setMsg("该车架号没有变更记录"); + } + @Override public ResultBean deleteBySids(String[] sids) { return scmVehicleGressionService.deleteBySids(sids); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 216ba52c65..663fcf967b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -38,6 +38,8 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -141,6 +143,8 @@ public class ScmVehicleGressionService extends MybatisBaseService createQueryWrapper(ScmVehicleGressionQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -259,6 +263,43 @@ public class ScmVehicleGressionService extends MybatisBaseService selectCarTransferListAll(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = new QueryWrapper<>(); + qw.in("svg.sid", pagerQuery.getParams().getSids()); + if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { + qw.eq("svg.useOrgSid", pagerQuery.getParams().getUseOrgSid()); + } + IPage iPage = baseMapper.selectCarTransferList(page, qw); + List records = iPage.getRecords(); + for (ScmVehicleGressionPageVo record : records) { + record.setVin(pagerQuery.getParams().getVin()); + String sid = record.getSid(); + String type1 = "04"; //保单照片 + String type2 = "05"; //现场照片 + List policyImage = new ArrayList<>(); + List image = new ArrayList<>(); + //查询出门证 + + ScmExitPermit scmExitPermit = scmExitPermitService.selectByLinkSid(record.getSid()); + if (scmExitPermit != null) { + record.setDownloadUrl(fileUploadComponent.getUrlPrefix() + scmExitPermit.getUrl()); + } + List scmFiles1 = scmFileService.getByLinkSidAndType(sid, type1); + for (ScmFile scmFile : scmFiles1) { + policyImage.add(scmFile.getFilePath()); + } + record.setPolicyImage(policyImage); + List scmFiles2 = scmFileService.getByLinkSidAndType(record.getSid(), type2); + for (ScmFile scmFile : scmFiles2) { + image.add(scmFile.getFilePath()); + } + record.setImages(image); + } + return iPage; + } + /** * 手机端-获取车辆移位列表 * @@ -838,6 +879,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); //删除申请状态 baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid()); + //推送调拨单 + List vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid()); + if (vinList.size() > 0) { + for (String s : vinList) { + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); + List FPAYBILLENTRYs = new ArrayList<>(); + StkTransferDirect stkTransferDirect = new StkTransferDirect(); + stkTransferDirect.setFStockOutOrgId("100013"); //调出库存组织 + stkTransferDirect.setFTransferBizType("调车"); //调拨类型 + stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向 + stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型 + stkTransferDirect.setFStockOrgId("BD_OwnerOrg"); //调入库存组织 + stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型 + stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型 + stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期 + StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); + fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态 + fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态 + fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型 + fBillEntry.setFKeeperOutId("101");//调出保管者 + fBillEntry.setFOwnerOutId("101");//调出货主 + fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型 + fBillEntry.setFOwnerId("101");//调入货主 + fBillEntry.setFOwnerIdHead("101");//调入货主 + fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型 + fBillEntry.setFKeeperId("101");//调入保管者 + fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型 + fBillEntry.setFDestStockId("CK003");//调入仓库 + fBillEntry.setFMaterialId(s);//物料编码 + fBillEntry.setFSrcStockId("CK001");//调出仓库 + FPAYBILLENTRYs.add(fBillEntry); + stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); + finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); + } + } } return rb.success().setData(resultBean.getData()); @@ -1150,7 +1227,8 @@ public class ScmVehicleGressionService extends MybatisBaseService appMap, ScmVehicleGression scmVehicleGression) { + public String getMessage(UpdateFlowFieldVo ufVo, Map appMap, ScmVehicleGression + scmVehicleGression) { //=====极光推送信息========================================参数组装 String procId = scmVehicleGression.getProcInstId(); ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); From da013fc2d157b727ba3389a54a0355e46bec2991 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 8 Sep 2022 09:28:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehicle/BaseVehicleMapper.xml | 7 ++++- .../biz/basevehicle/BaseVehicleService.java | 2 +- .../busmaindeposit/BusMainDepositService.java | 30 +++++++++---------- .../biz/bussalesorder/BusSalesOrderMapper.xml | 2 +- .../bussalesorder/BusSalesOrderService.java | 1 + 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 89a01aa02d..332bf3ff7d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -891,7 +891,12 @@ where bv.modelSid = #{modelSid} and bv.modelConfigSid = #{configSid} and bv.useOrgSid = #{orgSid} - and bv.vehicleState = #{state} + and bv.lockedState = #{state} + AND ( + bv.vehicleStateValue = '库存' + or bv.vehicleStateValue = '在途' + or bv.vehicleStateValue = '调入' + ) order by isFictitious desc diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 797abb790c..e2f19b92cd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1636,7 +1636,7 @@ public class BaseVehicleService extends MybatisBaseService> selectAppList(String modelSid, String configSid, String orgSid) { ResultBean> rb = ResultBean.fireFail(); List orderVoList = new ArrayList<>(); - orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid, VehicleState.StockEnum.STOCK.getCode()); + orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid, VehicleState.LockEnum.UN_LOCK.getCode()); if (orderVoList.isEmpty()) { return rb.setData(orderVoList); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 9464e465e5..3ac4fb10a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1784,13 +1784,13 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; @@ -1905,13 +1905,13 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); // String msgSid = getMessage(ufVo, appMap, busMainDeposit); @@ -1961,7 +1961,7 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); // String msgSid = getMessage(ufVo, appMap, busMainDeposit); @@ -2051,7 +2051,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", query.getBusinessSid()); + appMap.put("sid", appMap); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -2066,7 +2066,7 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())){ + messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); + }else{ + messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); } messageFlowableQuery.setMsgTitle("业务中心"); ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 05b8391164..b040ed2877 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -99,7 +99,7 @@ billingTypeKey AS invoiceType, billingType AS invoiceValue, affiliatedCompany, - affiliatedCompany as affiliatedOrgSid, + affiliatedCompanySid as affiliatedOrgSid, financePlan, financePlanValue FROM bus_sales_order bo diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 639111f6aa..c11b11481a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1174,6 +1174,7 @@ public class BusSalesOrderService extends MybatisBaseService