From daae63ef8eb078b1635a30164c7d0cad28432c58 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 28 Sep 2022 09:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=E3=80=81=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 8 +- .../basevehicle/BaseVehicleFeignFallback.java | 7 ++ .../basevehicle/app/InputVinListQuery.java | 20 +++ .../api/basevehicle/app/InputVinListVo.java | 20 +++ .../commoncontract/CommonContractFeign.java | 4 + .../CommonContractFeignFallback.java | 5 + .../biz/basevehicle/BaseVehicleMapper.java | 7 +- .../biz/basevehicle/BaseVehicleMapper.xml | 9 ++ .../base/biz/basevehicle/BaseVehicleRest.java | 115 ++++++++++-------- .../biz/basevehicle/BaseVehicleService.java | 24 +++- .../commoncontract/CommonContractMapper.java | 3 + .../commoncontract/CommonContractMapper.xml | 6 + .../commoncontract/CommonContractRest.java | 5 + .../commoncontract/CommonContractService.java | 9 ++ .../api/bussalesorder/BusSalesOrderFeign.java | 10 ++ .../BusSalesOrderFeignFallback.java | 11 ++ .../app/order/AppBusSalesOrderVo.java | 3 + .../api/bussalesorder/app/vin/VinListVo.java | 18 +++ .../api/bussalesorder/app/vin/VinVo.java | 20 +++ .../bussalesorder/BusSalesOrderMapper.java | 4 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 6 + .../biz/bussalesorder/BusSalesOrderRest.java | 11 ++ .../bussalesorder/BusSalesOrderService.java | 71 +++++++++++ .../saleOrders/AppBusSalesOrderFeign.java | 21 ++++ .../AppBusSalesOrderFeignFallback.java | 19 +++ .../saleOrders/vininput/BusVinNoVo.java | 24 ++++ .../saleOrders/vininput/InputVinDto.java | 19 +++ .../saleOrders/vininput/InputVinListDto.java | 14 +++ .../saleOrders/vininput/InputVinQuery.java | 20 +++ .../saleOrders/vininput/InputVinVo.java | 21 ++++ .../saleOrders/vininput/VinNoVo.java | 19 +++ .../saleOrders/AppBusSalesOrderRest.java | 19 +++ .../saleOrders/AppBusSalesOrderService.java | 38 +++++- 33 files changed, 549 insertions(+), 61 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java 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 e5237d115c..71bddc72d3 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 @@ -2,12 +2,13 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -404,4 +405,9 @@ public interface BaseVehicleFeign { @PostMapping("/getPCInspectionVinList") @ResponseBody public ResultBean>> getPCInspectionVinList(@RequestBody InspectionVinQuery query); + + @ApiOperation("销售订单补录选择车架号") + @PostMapping("/saleOrderVin") + @ResponseBody + public ResultBean> saleOrderVin(@RequestBody PagerQuery query); } \ No newline at end of file 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 119f5e14f0..176442b218 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 @@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -316,4 +318,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> saleOrderVin(PagerQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListQuery.java new file mode 100644 index 0000000000..f55c0aa829 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.basevehicle.app; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 16:48 + * @Description + */ +@Data +public class InputVinListQuery implements Query { + private static final long serialVersionUID = 8552949553126528497L; + + private String saleOrderSid; + private List list; + private String names; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java new file mode 100644 index 0000000000..065b223526 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.basevehicle.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 16:48 + * @Description + */ +@Data +public class InputVinListVo implements Vo { + private static final long serialVersionUID = -9168643121079621489L; + + private String vinNo; + private String vinSid; + @ApiModelProperty("是否已出库") + private Boolean state; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 89f3b6466f..f48fc801f6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -191,4 +191,8 @@ public interface CommonContractFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody CommonContractTaskQuery query); + @ApiOperation(value = "根据销售订单查询合同") + @GetMapping(value = "/getContractByBusSid/{sid}") + ResultBean getContractByBusSid(@PathVariable("sid") String sid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index e08894721f..05086f1601 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -203,4 +203,9 @@ public class CommonContractFeignFallback implements CommonContractFeign { public ResultBean breakProcess(CommonContractTaskQuery query) { return null; } + + @Override + public ResultBean getContractByBusSid(String sid) { + 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 95b3a47369..b6d4eed199 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 @@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; -import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery; -import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; -import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -461,4 +458,6 @@ public interface BaseVehicleMapper extends BaseMapper { List> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage saleOrderVin(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); } \ 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 1571fd98fb..ab5349f37c 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 @@ -1173,4 +1173,13 @@ ${ew.sqlSegment} + + \ 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 da541995d6..8f1016587f 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 @@ -9,6 +9,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; @@ -181,11 +183,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode())) baseVehicleService.updateVeh(baseVehicle); //入账生成台账 - if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())){ + if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) { baseVehicleService.saveVeh_rz(baseVehicle); } //外采入库生成台账 - if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){ + if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { baseVehicleService.saveVeh_wc(baseVehicle); } //调车入库生成台账 @@ -193,7 +195,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicleService.saveVeh_tc(baseVehicle); } if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()) - ||eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { + || eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { kingdeeStkInStock(dto); } return rb.success().setMsg("保存成功"); @@ -201,68 +203,69 @@ public class BaseVehicleRest implements BaseVehicleFeign { /** * 推送金蝶采购入库单 + * * @param dto */ - private void kingdeeStkInStock(List dto ) { - try{ - StkInStock stkInStock=new StkInStock(); + private void kingdeeStkInStock(List dto) { + try { + StkInStock stkInStock = new StkInStock(); + /** + * // 入库日期:FDate (必填项) + */ + stkInStock.setFDate(DateUtil.now()); + /** + * // 采购部门:FPurchaseDeptId (必填项) + */ + stkInStock.setFPurchaseDeptId("05.04"); + /** + * //采购组织:FPurchaseOrgId (必填项) + */ + stkInStock.setFPurchaseOrgId("101"); + /** + * // 供应商:FSupplierId (必填项) + */ + stkInStock.setFSupplierId("010001"); + /** + * //分配目标组织:TOrgId (必填项) + */ + stkInStock.setTOrgId("100012"); + /** + * // 物料列表:FInStockEntry (必填项) + */ + List fInStockEntry = new ArrayList<>(); + for (BaseVehicleDto baseVehicleDto : dto) { + StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); /** - * // 入库日期:FDate (必填项) + * 单价 对应厂家结算价 */ - stkInStock.setFDate(DateUtil.now()); + sf.setFPrice(baseVehicleDto.getCostPrice() + ""); + /** - * // 采购部门:FPurchaseDeptId (必填项) + * 车辆类型 */ - stkInStock.setFPurchaseDeptId("05.04"); + sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。 + /** - * //采购组织:FPurchaseOrgId (必填项) + * // 批号:FLot */ - stkInStock.setFPurchaseOrgId("101"); + sf.setFLot(baseVehicleDto.getVinNo()); /** - * // 供应商:FSupplierId (必填项) + * // 物料编码:FMaterialId (必填项) */ - stkInStock.setFSupplierId("010001"); + sf.setFMaterialId(baseVehicleDto.getVinNo()); /** - * //分配目标组织:TOrgId (必填项) + * // 仓库:FStockId */ - stkInStock.setTOrgId("100012"); + sf.setFStockId("CK001"); /** - * // 物料列表:FInStockEntry (必填项) + * 物料分组 */ - List fInStockEntry=new ArrayList<>(); - for (BaseVehicleDto baseVehicleDto : dto) { - StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry(); - /** - * 单价 对应厂家结算价 - */ - sf.setFPrice(baseVehicleDto.getCostPrice()+""); - - /** - * 车辆类型 - */ - sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。 - - /** - * // 批号:FLot - */ - sf.setFLot(baseVehicleDto.getVinNo()); - /** - * // 物料编码:FMaterialId (必填项) - */ - sf.setFMaterialId(baseVehicleDto.getVinNo()); - /** - * // 仓库:FStockId - */ - sf.setFStockId("CK001"); - /** - * 物料分组 - */ - sf.setWlfz("01"); - fInStockEntry.add(sf); - } - stkInStock.setFInStockEntry(fInStockEntry); - finKingDeeFeign.draftStkInStock(stkInStock); - }catch (Exception e){ + sf.setWlfz("01"); + fInStockEntry.add(sf); + } + stkInStock.setFInStockEntry(fInStockEntry); + finKingDeeFeign.draftStkInStock(stkInStock); + } catch (Exception e) { e.printStackTrace(); } } @@ -856,7 +859,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { PagerVo page = new PagerVo<>(); //查询在申请的存放地点变更车辆的车辆sid List stringList = baseVehicleTempstateService.selectAll("001"); - IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery,stringList); + IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery, stringList); PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); return new ResultBean>().success().setData(pagerVo); } @@ -868,7 +871,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Override public ResultBean> selectPatrolinspections(String userSid, List vinNoList) { - return baseVehicleService.selectPatrolinspections(userSid,vinNoList); + return baseVehicleService.selectPatrolinspections(userSid, vinNoList); } @Override @@ -898,5 +901,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { List> pcInspectionVinList = baseVehicleService.getPCInspectionVinList(query); return rb.success().setData(pcInspectionVinList); } + @Override + public ResultBean> saleOrderVin(PagerQuery query) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.saleOrderVin(query); + return rb.success().setData(pv); + } } 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 3257d5fd18..95df9a88ec 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 @@ -8,6 +8,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; @@ -26,6 +28,8 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -34,7 +38,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; @@ -102,6 +105,8 @@ public class BaseVehicleService extends MybatisBaseService saleOrderVin(PagerQuery query) { + IPage page = PagerUtil.queryToPage(query); + InputVinListQuery params = query.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + //根据销售订单查询list + List list = busSalesOrderFeign.getList(params.getSaleOrderSid()).getData(); + if (params.getList().size() > 0) { + qw.notIn("bv.vinNo", params.getList()); + } + qw.in("bv.orderingNo", list); + } + IPage pagging = baseMapper.saleOrderVin(page, qw, params.getNames()); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index ec8e3e9444..3b7aeaa4e5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.commoncontract.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.*; import java.util.List; @@ -85,4 +86,6 @@ public interface CommonContractMapper extends BaseMapper { @Update("update common_contract set `state`=#{state} where sid=#{businessSid}") void updateBySidAndState(@Param("businessSid") String businessSid, @Param("state") String state); + + CommonContract getContractByBusSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 9928c5f680..6d10d1a233 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -148,4 +148,10 @@ WHERE sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 044efaea2e..842aa5c773 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -566,4 +566,9 @@ public class CommonContractRest implements CommonContractFeign { public ResultBean breakProcess(CommonContractTaskQuery query) { return commonContractService.breakProcess(query); } + + @Override + public ResultBean getContractByBusSid(String sid) { + return commonContractService.getContractByBusSid(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index db36ffc275..d3a1a5309c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1652,4 +1652,13 @@ public class CommonContractService extends MybatisBaseService getContractByBusSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + CommonContract commonContract = baseMapper.getContractByBusSid(sid); + if(commonContract == null){ + return rb.setData(new CommonContract()); + } + return rb.success().setData(commonContract); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 4bef87cf1c..0a6e088a76 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -198,4 +199,13 @@ public interface BusSalesOrderFeign { @ResponseBody ResultBean submitOrder(@RequestBody SubmitSalesOrderDto dto); + @ApiOperation("初始化|录入车架号列表") + @GetMapping("/saleOrderInputVin") + @ResponseBody + ResultBean saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("采购订单编号list") + @GetMapping("/getList/{saleOrderSid}") + @ResponseBody + ResultBean> getList(String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 10847c0872..a7137f797d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -174,4 +175,14 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean submitOrder(SubmitSalesOrderDto dto) { return null; } + + @Override + public ResultBean saleOrderInputVin(String saleOrderSid) { + return null; + } + + @Override + public ResultBean> getList(String saleOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 64fa61b107..ffbcd28b3d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app.order; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo; @@ -142,4 +143,6 @@ public class AppBusSalesOrderVo implements Vo { @ApiModelProperty(value = "需补交订金") @JsonSerialize(using = ToStringSerializer.class) private String makeUpDeposit; + @JsonIgnore + private String type; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java new file mode 100644 index 0000000000..5a594c161d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:47 + * @Description + */ +@Data +public class VinListVo implements Vo { + private static final long serialVersionUID = 7025918939372350073L; + + private String linkNo; + private String linkSid; + private Boolean state; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java new file mode 100644 index 0000000000..682c5eeda9 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:46 + * @Description + */ +@Data +public class VinVo implements Vo { + private static final long serialVersionUID = -5568525598192648926L; + + private String saleOrderSid; + + private List vinList; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 41bcc97da8..ac84f359d2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -40,6 +40,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; +import java.util.List; import java.util.Map; /** @@ -159,4 +160,7 @@ public interface BusSalesOrderMapper extends BaseMapper { int updateFlowFiled(Map map); int selectNum(String bill); + + + List getList(String saleOrderSid); } \ No newline at end of file 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 b067cc9c00..5a02647ac6 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 @@ -214,4 +214,10 @@ from bus_sales_order where billNo LIKE concat(#{bill}, '%') + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 6f6abb009a..1fc426754a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -242,4 +243,14 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean submitOrder(SubmitSalesOrderDto dto) { return busSalesOrderService.submitOrder(dto); } + + @Override + public ResultBean saleOrderInputVin(String saleOrderSid) { + return busSalesOrderService.saleOrderInputVin(saleOrderSid); + } + + @Override + public ResultBean> getList(String saleOrderSid) { + return busSalesOrderService.getList(saleOrderSid); + } } 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 f99e7055c8..725a55a5f3 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 @@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceQuery; import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo; import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign; import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign; @@ -44,9 +45,11 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; +import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; @@ -55,6 +58,8 @@ import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; @@ -1280,6 +1285,23 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.getContractByBusSid(record.getSaleOrderSid()); + if (commonContractResultBean.getSuccess()) { + CommonContract commonContract = commonContractResultBean.getData(); + if ("已办结".equals(commonContract.getNodeState())) { + record.setShowInputBtn(true); + } else { + record.setShowInputBtn(false); + } + } + + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -2590,4 +2612,53 @@ public class BusSalesOrderService extends MybatisBaseService saleOrderInputVin(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + VinVo vinVo = new VinVo(); + //根据销售订单sid查询车辆台数 + ResultBean resultBean = getSaleOrderDetails(saleOrderSid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + List vinListVos = new ArrayList<>(); + //根据销售订单查询现车 + List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + nowCarList.removeAll(Collections.singleton(null)); + if (!nowCarList.isEmpty()) { + for (AppNowCarListVo vv : nowCarList) { + VinListVo vinListVo = new VinListVo(); + vinListVo.setLinkNo(vv.getVin()); + vinListVo.setLinkSid(vv.getCarSid()); + //根据车架号查询是否已出库 + ResultBean baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid()); + if (baseVehicleResultBean.getSuccess()) { + BaseVehicleSelectVo vo = baseVehicleResultBean.getData(); + if (vo != null) { + if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) { + vinListVo.setState(true); + } + } + } + vinListVos.add(vinListVo); + } + } else { + AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); + String num = appOrderDetailsVo.getPriceInfo().getNumber(); + for (int i = 0; i < Integer.valueOf(num).intValue(); i++) { + VinListVo vinListVo = new VinListVo(); + vinListVos.add(vinListVo); + } + } + vinVo.setSaleOrderSid(saleOrderSid); + vinVo.setVinList(vinListVos); + return rb.success().setData(vinVo); + } + + + public ResultBean> getList(String saleOrderSid) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseMapper.getList(saleOrderSid); + return rb.success().setData(stringList); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 75b95982fd..d9f7c182b5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -46,6 +46,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -264,5 +268,22 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean> contractInfo(@RequestBody InsuranceDto insuranceDto); + /*-------------------------------录入车架号---------------------------------------------*/ + + @ApiOperation("初始化|录入车架号列表") + @GetMapping("/init/saleOrderInputVin") + @ResponseBody + ResultBean getVinList(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("补录车架号，选择列表") + @PostMapping("/init/saleOrderVin") + @ResponseBody + ResultBean> saleOrderVin(@RequestBody PagerQuery query); + + @ApiOperation("保存销售订单车架号") + @PostMapping("/save/saleOrderVin") + @ResponseBody + ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index f64f05e11b..1d2edaa526 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -45,6 +45,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -232,4 +236,19 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean> contractInfo(InsuranceDto insuranceDto) { return null; } + + @Override + public ResultBean getVinList(String saleOrderSid) { + return null; + } + + @Override + public ResultBean> saleOrderVin(PagerQuery query) { + return null; + } + + @Override + public ResultBean saveSaleOrderVin(InputVinDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java new file mode 100644 index 0000000000..cf213e9ab7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:38 + * @Description + */ +@Data +public class BusVinNoVo implements Vo { + private static final long serialVersionUID = -5832863962678240592L; + + @ApiModelProperty("是否已出库") + private Boolean state; + @JsonProperty("vin") + private String linkNo; + @JsonProperty("carSid") + private String linkSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java new file mode 100644 index 0000000000..5e7fe4d6d1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/28 9:18 + * @Description + */ +@Data +public class InputVinDto implements Dto { + private static final long serialVersionUID = -1105390623554097436L; + private String saleOrderSid; + + private List vinList; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java new file mode 100644 index 0000000000..395100a9a6 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/28 9:20 + * @Description + */ +@Data +public class InputVinListDto implements Dto { + private static final long serialVersionUID = -6013714991280967471L; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java new file mode 100644 index 0000000000..caf35ee23b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 15:39 + * @Description + */ +@Data +public class InputVinQuery implements Query { + private static final long serialVersionUID = 8689735317478969417L; + + private String saleOrderSid; + private List list; + private String names; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java new file mode 100644 index 0000000000..e7950f48c4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 15:28 + * @Description + */ +@Data +public class InputVinVo implements Vo { + private static final long serialVersionUID = -3495013067534199733L; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("是否已出库") + private Boolean state; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java new file mode 100644 index 0000000000..3e6ebce2eb --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:35 + * @Description + */ +@Data +public class VinNoVo implements Vo { + private static final long serialVersionUID = -8321321070396276564L; + + private String saleOrderSid; + private List vinList; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index c78f923383..2b81cc6d98 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -46,6 +46,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -320,4 +324,19 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.contractInfo(insuranceDto); } + @Override + public ResultBean getVinList(String saleOrderSid) { + return appBusSalesOrderService.getVinList(saleOrderSid); + } + + @Override + public ResultBean> saleOrderVin(PagerQuery query) { + return appBusSalesOrderService.saleOrderVin(query); + } + + @Override + public ResultBean saveSaleOrderVin(InputVinDto dto) { + return appBusSalesOrderService.saveSaleOrderVin(dto); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 622c6339be..ad0ec7b7fb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.PrintConfirmDto; import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo; @@ -38,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto; @@ -86,6 +90,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -142,6 +150,8 @@ public class AppBusSalesOrderService { private SysUserFeign sysUserFeign; @Autowired private CommonContractFeign commonContractFeign; + @Autowired + private BaseVehicleFeign baseVehicleFeign; /************************************* 销售订单接口 *********************************************/ @@ -191,7 +201,7 @@ public class AppBusSalesOrderService { ResultBean rb = ResultBean.fireFail(); BusSalesOrderBillInfoVo vo = new BusSalesOrderBillInfoVo(); AppOrderInitQuery appOrderInitQuery = new AppOrderInitQuery(); - BeanUtil.copyProperties(orderInitQuery,appOrderInitQuery); + BeanUtil.copyProperties(orderInitQuery, appOrderInitQuery); ResultBean resultBean = busSalesOrderFeign.getBillInfo(appOrderInitQuery); AppBusSalesOrderBillInfoVo appBusSalesOrderBillInfoVo = resultBean.getData(); BeanUtil.copyProperties(appBusSalesOrderBillInfoVo, vo); @@ -551,9 +561,33 @@ public class AppBusSalesOrderService { public ResultBean> contractInfo(InsuranceDto insuranceDto) { ResultBean> rb = ResultBean.fireFail(); PrintConfirmDto printConfirmDto = new PrintConfirmDto(); - BeanUtil.copyProperties(insuranceDto,printConfirmDto); + BeanUtil.copyProperties(insuranceDto, printConfirmDto); ResultBean> resultBean = commonContractFeign.printConfirm(printConfirmDto); List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } + + public ResultBean getVinList(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + VinNoVo vinNoVo = new VinNoVo(); + ResultBean resultBean = busSalesOrderFeign.saleOrderInputVin(saleOrderSid); + VinVo vinVo = resultBean.getData(); + BeanUtil.copyProperties(vinVo, vinNoVo); + return rb.success().setData(vinNoVo); + } + + public ResultBean> saleOrderVin(PagerQuery query) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(query); + ResultBean> resultBean = baseVehicleFeign.saleOrderVin(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InputVinVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + } + + public ResultBean saveSaleOrderVin(InputVinDto dto) { + return null; + } } \ No newline at end of file