From f6f0209efb9c8ec4eb9da107b8b15e7d2c4e856e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 8 Dec 2022 14:56:13 +0800 Subject: [PATCH] =?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 --- .../AppDiscountpackageQuery.java | 20 ++++++ .../AppDiscountpackageVo.java | 38 ++++++++++++ .../BaseDiscountpackageFeign.java | 4 ++ .../BaseDiscountpackageFeignFallback.java | 5 ++ .../api/basevehicle/BaseVehicleFeign.java | 4 ++ .../basevehicle/BaseVehicleFeignFallback.java | 5 ++ .../BaseDiscountpackageRest.java | 8 +++ .../BaseDiscountpackageService.java | 4 ++ .../biz/basevehicle/BaseVehicleMapper.java | 2 + .../biz/basevehicle/BaseVehicleMapper.xml | 61 +++++++++++-------- .../base/biz/basevehicle/BaseVehicleRest.java | 7 +++ .../biz/basevehicle/BaseVehicleService.java | 4 ++ .../saloutstock/SalOutStockService.java | 11 +++- .../api/scmapplyinbound/ScmApplyInbound.java | 3 + .../scmapplyinbound/ScmApplyInboundDto.java | 2 + .../scmapplyinbound/ScmApplyInboundVo.java | 4 ++ .../ScmCertInventoryService.java | 9 ++- 17 files changed, 165 insertions(+), 26 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java new file mode 100644 index 0000000000..459e62893f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.basediscountpackage; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppDiscountpackageQuery implements Query { + + @ApiModelProperty("userSid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; + @ApiModelProperty("合同编号 客户名称") + private String names; + @ApiModelProperty("申请日期") + private String date; + @ApiModelProperty("1待办 2已办") + private String type; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageVo.java new file mode 100644 index 0000000000..9f909013d5 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.base.api.basediscountpackage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel(value = "优惠包 视图数据对象", description = "优惠包 视图数据对象") +@Data +public class AppDiscountpackageVo implements Vo { + + @ApiModelProperty("优惠包sid") + private String sid; + + @ApiModelProperty("合同编号") + private String contractId; + + @ApiModelProperty("申请人") + private String applyName; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("流程状态") + private String nodeState; + + @ApiModelProperty("申请日期") + private String applyDate; + + @ApiModelProperty("是否显示办理按钮 提交后不显示") + private Boolean showHandleBtn; + + @ApiModelProperty("车型名称") + private String model; + + @ApiModelProperty("台数") + private String number; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java index 2e65f1696a..4ea038d83b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java @@ -76,6 +76,10 @@ public interface BaseDiscountpackageFeign { @ApiOperation("移动端-获取标签") @GetMapping("/selectAppLableListByUserSid") ResultBean> selectAppListByUserSid(@SpringQueryMap AppLableQuery appLableQuery); + + @ApiOperation("移动端-获取优惠包列表") + @PostMapping("/getDiscountManageApplyList") + ResultBean> getDiscountManageApplyList(@RequestBody PagerQuery pq); /*****************************销售政策流程****************************************************/ @ApiOperation("提交销售政策流程") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java index 30a1956bf7..3913610634 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java @@ -77,6 +77,11 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig return null; } + @Override + public ResultBean> getDiscountManageApplyList(PagerQuery pq) { + return null; + } + @Override public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 4c630be5c3..e4b88d88a9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -456,6 +456,10 @@ public interface BaseVehicleFeign { @PostMapping("/selectByVinNoAndOrgSid") ResultBean selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid); + @ApiOperation("根据物料编码查询排产申请编号") + @PostMapping("/selectByfMaterialID") + ResultBean selectByfMaterialID(@RequestParam("fMaterialID") String fMaterialID); + @ApiOperation("巡检获取车价号：已添加切换机构") @PostMapping("/getInspectionVinList") @ResponseBody diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 9fdd9b2b43..8aa983ceed 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -361,6 +361,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean selectByfMaterialID(String fMaterialID) { + return null; + } + @Override public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java index 0383158664..80cbeb4c06 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java @@ -146,6 +146,14 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign { return baseDiscountpackageService.selectAppListByUserSid(appLableQuery); } + @Override + public ResultBean> getDiscountManageApplyList(PagerQuery pq) { + PagerVo page = new PagerVo<>(); + IPage iPage = baseDiscountpackageService.getDiscountManageApplyList(pq); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + @Override public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) { return baseDiscountpackageService.submitBaseDiscountpackage(dto); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index c54766f119..93e77fa177 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -711,4 +711,8 @@ public class BaseDiscountpackageService extends MybatisBaseService getDiscountManageApplyList(PagerQuery pq) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index c8ed0b2671..1d7794a513 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -484,4 +484,6 @@ public interface BaseVehicleMapper extends BaseMapper { List getStockModelNowCarList(@Param(Constants.WRAPPER) QueryWrapper qw); AppBaseConfigOrderCarVo getStockModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); + + String selectByfMaterialID(String fMaterialID); } \ No newline at end of file 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 b02d2634ec..21c4416079 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 @@ -697,7 +697,7 @@ - select bv.vinNo vin, + select bv.vinNo vin, bv.locationName address, - bv.sid carSid, + bv.sid carSid, if(bv.lockedState = '01', 1, 0) - as isFictitious + as isFictitious from base_vehicle bv where bv.modelSid = #{modelSid} and bv.modelConfigSid = #{configSid} @@ -1061,7 +1064,7 @@ ) and bv.sid in - + #{item} @@ -1512,10 +1515,10 @@ SELECT bv.sid, bv.vinNo AS vin, bv.vehicleStateValue AS `state`, - bmc.carColor AS color, + bmc.carColor AS color, bv.locationName AS address, - bd.salesPolicy AS label, - bdv.guidedQKPrice AS promotionPrice + bd.salesPolicy AS label, + bdv.guidedQKPrice AS promotionPrice FROM base_vehicle bv LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid LEFT JOIN base_discountpackage_veh bdv @@ -1529,12 +1532,15 @@ select bvm.vehicleAlias AS modelName, convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price, bmc.configName AS commonlyConfig, - (SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl - LEFT JOIN base_vehmodelconfig_label bvcl - ON bvcl.labelSid = bvl.sid - LEFT JOIN base_vehmodel_config bvc - ON bvc.`sid` = bvcl.`vehmodelConfigSid` - WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{useOrg}) AS labelName + (SELECT GROUP_CONCAT(bvl.labelName) + FROM base_vehmodel_label bvl + LEFT JOIN base_vehmodelconfig_label bvcl + ON bvcl.labelSid = bvl.sid + LEFT JOIN base_vehmodel_config bvc + ON bvc.`sid` = bvcl.`vehmodelConfigSid` + WHERE bvc.modelSid = bvm.sid + AND bvc.`configurationItemsSid` = bmc.sid + AND bvc.`useOrgSid` = #{useOrg}) AS labelName from base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` @@ -1542,4 +1548,11 @@ AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index a099565527..eb5ed66040 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -1193,6 +1193,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(baseVehicle); } + @Override + public ResultBean selectByfMaterialID(String fMaterialID) { + ResultBean rb = ResultBean.fireFail(); + String orderingNo = baseVehicleService.selectByfMaterialID(fMaterialID); + return rb.success().setData(orderingNo); + } + @Override public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { 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 f36e81cec5..54d1ad90aa 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 @@ -3488,4 +3488,8 @@ public class BaseVehicleService extends MybatisBaseService createQueryWrapper(ScmCertInventoryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -158,10 +162,13 @@ public class ScmCertInventoryService extends MybatisBaseService