From 74964d66a2ebaf8f0abab0e460037b8628325c7e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 16 Aug 2022 15:44:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E3=80=81=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/BaseVehicle.java | 4 +- .../baseaccadjapply/BaseAccadjApplyMapper.xml | 96 ++++++++++--------- .../BaseAccadjApplyService.java | 2 + .../BaseShuntingInvoicingApplyMapper.xml | 2 + .../BaseShuntingInvoicingApplyService.java | 3 + .../biz/basevehicle/BaseVehicleService.java | 5 +- .../BaseVehmodelConfigMapper.xml | 2 + .../BaseVehmodelConfigService.java | 43 +++++---- .../api/scmapplyinbound/ScmApplyInbound.java | 5 +- .../scmapplyinbound/ScmApplyInboundDto.java | 4 + .../scmapplyinbound/ScmApplyInboundVo.java | 4 + .../ScmApplyInboundService.java | 2 + 12 files changed, 106 insertions(+), 66 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index a4f612b484..77fa99cf9d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -125,9 +125,9 @@ public class BaseVehicle extends BaseEntity { private String settlementStatus; @ApiModelProperty("结算状态value") private String settlementStatusValue; - @ApiModelProperty(value = "厂家采购订单类型key") + @ApiModelProperty(value = "采购类型key") private String manPurOrderTypeKey; - @ApiModelProperty(value = "厂家采购订单类型value") + @ApiModelProperty(value = "采购类型value") private String manPurOrderTypeValue; @ApiModelProperty("特殊或差异说明") private String specialInstructions; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml index 82cca8d8ca..6356931ffa 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml @@ -1,53 +1,63 @@ - - - - - + + + + + - + - - UPDATE base_accadj_apply - SET nodeState=#{nodeState} - , nodeSid=#{taskDefKey} - - , procDefId=#{procDefId} - - - , procInstId=#{procInsId} - - - , taskId=#{taskId} - - WHERE sid = #{sid} + + UPDATE base_accadj_apply + SET nodeState=#{nodeState} + , nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid = #{sid} - + SELECT COUNT(*) + FROM base_accadj_apply + WHERE nodeState != '待提交' and find_in_set(sid, #{list}) \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 7751b39728..66ff12c428 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService; import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -227,6 +228,7 @@ public class BaseAccadjApplyService extends MybatisBaseService wrapper.ne("bv.vehicleState", VehicleState.StockEnum.DH_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.fetchVeh(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml index db53f23eca..5fbe03a73c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml @@ -25,6 +25,8 @@ base_internal_purchase_vehicle bipv LEFT JOIN base_internal_purchase bip ON bipv.`mainSid` = bip.`sid` + LEFT JOIN base_vehicle bv + ON bv.`vinNo` = bipv.`vinNo` AND bip.`createOrgSid` = bv.`createOrgSid` ${ew.sqlSegment} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java index d53447aef6..42a7b68a51 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService; import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -204,10 +205,12 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService 0) { qw.notIn("bipv.sid", query.getSids()); } qw.eq("bip.nodeState", "已办结"); + qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.DH_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.fetchVeh(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); 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 b809f16398..263fa92390 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 @@ -1296,12 +1296,15 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bv.vinNo", params.getVinNoList()); } + qw.eq("bv.isDelete", 0); //锁定状态：未锁定 qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode()); //库存状态：库存 qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); + //订单类型 + qw.ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.NG_ORDER.getCode()); //调车状态：未调车 - qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode()); + //qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode()); } return qw; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index b7b94d1f8b..592637704f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -58,6 +58,8 @@ ON bvc.modelSid = bvm.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_brand bvb + ON bvm.carBrand = bvb.sid ${ew.sqlSegment} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index c595f8acbb..46e739f959 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.basevehmodelconfig.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; +import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -108,6 +109,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService qwq = new QueryWrapper<>(); - qwq.eq("bv.isDelete",0); - qwq.eq("bv.modelSid",modelSid); - qwq.eq("bv.modelConfigSid",configSid); - qwq.eq("bv.createOrgSid",query.getUseOrgSid()); + qwq.eq("bv.isDelete", 0); + qwq.eq("bv.modelSid", modelSid); + qwq.eq("bv.modelConfigSid", configSid); + qwq.eq("bv.createOrgSid", query.getUseOrgSid()); qwq.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); - qwq.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode()); - qwq.eq("bv.witPinState",VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState",VehicleState.ShuntingEnum.OUTCOLL.getCode()); + qwq.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode()); + qwq.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode()); int stockNum = baseVehicleService.getStockNum(qwq); record.setNum(stockNum); BaseVehmodelVo baseVehmodelVo = baseMapper.selectO(modelSid, configSid, query.getBuyerOrgSid()); - if (baseVehmodelVo != null){ + if (baseVehmodelVo != null) { String guidedPrice = baseVehmodelVo.getGuidedPrice(); - if (StringUtils.isBlank(guidedPrice)){ + if (StringUtils.isBlank(guidedPrice)) { record.setGuidedPrice("0"); - }else { + } else { record.setGuidedPrice(guidedPrice); } } @@ -712,25 +714,28 @@ public class BaseVehmodelConfigService extends MybatisBaseService qwq = new QueryWrapper<>(); - qwq.eq("bv.isDelete",0); - qwq.eq("bv.modelSid",modelSid); - qwq.eq("bv.modelConfigSid",configSid); - qwq.eq("bv.createOrgSid",query.getUseOrgSid()); + qwq.eq("bv.isDelete", 0); + qwq.eq("bv.modelSid", modelSid); + qwq.eq("bv.modelConfigSid", configSid); + qwq.eq("bv.createOrgSid", query.getUseOrgSid()); qwq.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); - qwq.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode()); - qwq.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode())); + qwq.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode()); + //订单类型 + qwq.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode()); + qwq.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode()); + //qwq.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode())); int stockNum = baseVehicleService.getStockNum(qwq); record.setNum(stockNum); BaseVehmodelVo baseVehmodelVo = baseMapper.selectO(modelSid, configSid, query.getBuyerOrgSid()); - if (baseVehmodelVo != null){ + if (baseVehmodelVo != null) { String guidedPrice = baseVehmodelVo.getGuidedPrice(); - if (StringUtils.isBlank(guidedPrice)){ + if (StringUtils.isBlank(guidedPrice)) { record.setGuidedPrice("0"); - }else { + } else { record.setGuidedPrice(guidedPrice); } } - if (stockNum > 0){ + if (stockNum > 0) { records1.add(record); } } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java index 863d97cde0..5a470c24e5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java @@ -125,5 +125,8 @@ public class ScmApplyInbound extends BaseEntity { private String deductionPolicyThreeOne; @ApiModelProperty("计算政策3:扣减政策2") private String deductionPolicyThreeTwo; - + @ApiModelProperty(value = "采购类型key") + private String manPurOrderTypeKey; + @ApiModelProperty(value = "采购类型value") + private String manPurOrderTypeValue; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index 5e7f5fc6af..940029b264 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -139,6 +139,10 @@ public class ScmApplyInboundDto implements Dto { private String deductionPolicyThreeOne; @ApiModelProperty("计算政策3:扣减政策2") private String deductionPolicyThreeTwo; + @ApiModelProperty(value = "采购类型key") + private String manPurOrderTypeKey; + @ApiModelProperty(value = "采购类型value") + private String manPurOrderTypeValue; @ApiModelProperty("车辆列表") private List vehicleList; @ApiModelProperty("附件信息表") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index e517b31cfc..a0729f561d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -135,6 +135,10 @@ public class ScmApplyInboundVo implements Vo { private String deductionPolicyThreeOne; @ApiModelProperty("计算政策3:扣减政策2") private String deductionPolicyThreeTwo; + @ApiModelProperty(value = "采购类型key") + private String manPurOrderTypeKey; + @ApiModelProperty(value = "采购类型value") + private String manPurOrderTypeValue; @ApiModelProperty("附件信息表") private List scmFiles; } 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 d96bede6f2..bc00f85caa 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 @@ -480,6 +480,8 @@ public class ScmApplyInboundService extends MybatisBaseService