diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java index 39bbd7f491..c539353c78 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java @@ -62,11 +62,11 @@ public class BaseDistributorVo implements Vo { @ApiModelProperty("创建组织（陕汽必须字段）") private String createOrg; -// @ApiModelProperty(value = "使用组织sid：string类型") -// private String useOrgSid; + @ApiModelProperty(value = "使用组织sid：string类型") + private String useOrgSid; - @ApiModelProperty(value = "使用组织sid:List类型") - private String[][] useOrg; + /*@ApiModelProperty(value = "使用组织sid:List类型") + private String[][] useOrg;*/ @ApiModelProperty(value = "使用组织名称") private String useOrgName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java index bf1c7c1f56..b04dfacafd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java @@ -141,6 +141,9 @@ public class BaseVehicleCertificate extends BaseEntity { @ApiModelProperty("合格证照片（陕汽必须字段）") private String certificatePhoto; + @ApiModelProperty("公告型号") + private String noticeModel; + @ApiModelProperty("备注（陕汽必须字段）") private String remarks; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java index 3c8c4538e3..bd623d7576 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java @@ -134,6 +134,9 @@ public class BaseVehicleCertificateDetailsVo implements Vo { @ApiModelProperty("底盘型号（陕汽必须字段）") private String chassisModel; + @ApiModelProperty("公告型号") + private String noticeModel; + @ApiModelProperty("备注（陕汽必须字段）") private String remarks; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java index f3bb53b549..e763cad1c3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java @@ -144,6 +144,9 @@ public class BaseVehicleCertificateDto implements Dto { @ApiModelProperty("底盘型号（陕汽必须字段）") private String chassisModel; + @ApiModelProperty("公告型号") + private String noticeModel; + @ApiModelProperty("备注（陕汽必须字段）") private String remarks; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java index 35b41863b3..94ec2d9f32 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java @@ -104,8 +104,8 @@ public interface BaseVehicleModelFeign { * @return */ @ApiOperation("修改回显") - @GetMapping("/getAll/{sid}") - public ResultBean getAll(@PathVariable("sid") String sid); + @GetMapping("/getAll/{sid}/{userSid}") + public ResultBean getAll(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid); /** diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java index af73de0e41..014b25e60f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java @@ -59,7 +59,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { @Override - public ResultBean getAll(String sid) { + public ResultBean getAll(String sid,String userSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 07d3350e8e..cbb0e02f16 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -94,7 +94,7 @@ bd.address, bd.zipCode, bd.createOrg, - + bd.useOrg useOrgSid, bd.useOrgName from base_distributor bd where sid = #{sid}; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 96bcfe0943..457ee11f56 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -206,21 +206,6 @@ public class BaseDistributorService extends MybatisBaseService list = Arrays.asList(baseDistributor.getUseOrg().split(",")); - String[][] s = new String[list.size()][]; - for (int i = 0; i < list.size(); i++) { - String[] list1 = {}; - //根据使用组织查询上级 - ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i)); - if (resultBean.getSuccess()) { - list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(","); - } - s[i] = list1; - } - baseDistributorVo.setUseOrg(s); - } return baseDistributorVo; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml index 63621df5a7..5fcd11dfd5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml @@ -134,6 +134,8 @@ bvc.power, bvc.chassisModel, + + bvc.noticeModel, bvc.remarks from base_vehicle_certificate bvc diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java index ef0582b2da..e7027a8639 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java @@ -163,12 +163,22 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { } @Override - public ResultBean getAll(String sid) { + public ResultBean getAll(String sid,String userSid) { ResultBean rb = ResultBean.fireFail(); BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid); if (vo == null) { return rb.setMsg("该车型信息不存在"); } + int i3 = baseVehmodelConfigService.checkByModelSid(sid); + if (i3 > 0){ + return rb.setMsg("该车型已有关联配置，无法修改"); + } + ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); + String sid1 = useOrgByUserSid.getData().getSid(); + int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid); + if (i4 == 0){ + return rb.setMsg("该车型不属于当前分公司，无法修改"); + } return rb.success().setData(vo); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index d2b1062cc9..0714bb3a32 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -544,17 +544,6 @@ public class BaseVehicleModelService extends MybatisBaseService 0){ - return rb.setMsg("该车型已有关联配置，无法修改"); - } - String userSid = dto.getUserSid(); - ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); - String sid1 = useOrgByUserSid.getData().getSid(); - int i4 = this.checkByCreateOrgAndModelSid(sid1, sid); - if (i4 == 0){ - return rb.setMsg("该车型不属于当前分公司，无法修改"); - } dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue()); dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue()); String modelName = dto.getModelName(); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java index 8a10dfc2f7..4c4e84c4ac 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java @@ -25,8 +25,13 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesorderdeposit; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; /** * Project: anrui-buscenter(业务管理)
@@ -49,5 +54,9 @@ import org.springframework.cloud.openfeign.FeignClient; fallback = BusSalesOrderDepositFeignFallback.class) public interface BusSalesOrderDepositFeign { - + @ApiOperation("初始化订金信息") + @GetMapping(value = "/getDepositInfo/{sid}") + ResultBean getDepositInfo(@PathVariable(value = "sid") String sid); + + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java index 9b01667521..1fd85ddcaa 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesorderdeposit; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -48,4 +49,8 @@ import java.util.List; @Component public class BusSalesOrderDepositFeignFallback implements BusSalesOrderDepositFeign { + @Override + public ResultBean getDepositInfo(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java new file mode 100644 index 0000000000..917d7b06d7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.buscenter.api.bussalesorderdeposit.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/7 13:38 + * @Description + */ +@Data +public class AppBusSalesOrderDepositListVo implements Vo { + private static final long serialVersionUID = -9212964561264321091L; + + @ApiModelProperty(value = "虚拟订单sid") + private String virtualOrderSid; + @ApiModelProperty(value = "虚拟订单编号") + private String virtualOrderId; + @ApiModelProperty(value = "剩余金额") + private String remainderMoney; + @ApiModelProperty(value = "结转金额") + private String payMoney; + @ApiModelProperty(value = "款项支付委托书:销售订单与客户为同一人时，list为空") + private List entrustImage = new ArrayList<>(); + @ApiModelProperty(value = "款项支付委托书") + private String payPath; + + private Boolean showImage; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java new file mode 100644 index 0000000000..b22794e991 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.buscenter.api.bussalesorderdeposit.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/7 13:37 + * @Description + */ +@Data +public class AppBusSalesOrderDepositVo implements Vo { + private static final long serialVersionUID = 1890442022147551234L; + + @ApiModelProperty(value = "销售订单sid") + private String saleOrderSid; + @ApiModelProperty(value = "车辆数量") + private String carNumber; + @ApiModelProperty(value = "订金合计") + private String depositTotal; + @ApiModelProperty(value = "订金缴纳方式") + private String payType; + @ApiModelProperty(value = "订金缴纳方式key") + private String payTypeKey; + @ApiModelProperty(value = "订金信息sid") + private String sid; + + private List virtualOrderList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java index bec3f4ecaf..196849d5aa 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java @@ -25,15 +25,16 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesorderinsurance; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * Project: anrui-buscenter(业务管理)
@@ -56,5 +57,13 @@ import java.util.List; fallback = BusSalesOrderInsuranceFeignFallback.class) public interface BusSalesOrderInsuranceFeign { + @ApiOperation("保存保险信息") + @PostMapping("/save") + ResultBean save(@RequestBody AppBusSalesOrderInsuranceDto dto); + + @ApiOperation("初始化保险信息") + @GetMapping("/getInsurance/{sid}") + ResultBean getInsurance(@PathVariable(value = "sid") String sid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java index b336f0c877..8e40efc860 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java @@ -25,13 +25,11 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesorderinsurance; -import com.yxt.common.core.query.PagerQuery; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderInsuranceFeignFallback.java
@@ -47,5 +45,14 @@ import java.util.List; */ @Component public class BusSalesOrderInsuranceFeignFallback implements BusSalesOrderInsuranceFeign { - + + @Override + public ResultBean save(AppBusSalesOrderInsuranceDto dto) { + return null; + } + + @Override + public ResultBean getInsurance(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java new file mode 100644 index 0000000000..35a2e11d1b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.buscenter.api.bussalesorderinsurance.app; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/6 17:35 + * @Description + */ +@Data +public class AppBusSalesOrderInsuranceDto implements Dto { + private static final long serialVersionUID = 1342650142192192917L; + + @ApiModelProperty(value = "是否在公司投保：1是，0否") + private String isInsureType; + @ApiModelProperty(value = "保险公司名称") + private String insuranceName; + @ApiModelProperty(value = "单台车保费预估金额") + private String insuranceCarMoney; + @ApiModelProperty(value = "公司入保期数") + private String insuranceNum; + @ApiModelProperty(value = "备注") + private String remarks; + @ApiModelProperty(value = "销售订单sid") + private String salesOrderSid; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java new file mode 100644 index 0000000000..68c72b2c38 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.buscenter.api.bussalesorderinsurance.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/6 17:43 + * @Description + */ +@Data +public class AppBusSalesOrderInsuranceVo implements Vo { + private static final long serialVersionUID = 3954141367510797986L; + + @ApiModelProperty(value = "销售订单sid") + private String saleOrderSid; + @ApiModelProperty(value = "是否在公司投保") + private String isInsureType; + @ApiModelProperty(value = "是否投保") + private String isInsureValue; + @ApiModelProperty(value = "保险公司名称") + private String name; + @ApiModelProperty(value = "单台保费") + private String price; + @ApiModelProperty(value = "入保期数") + private String number; + @ApiModelProperty(value = "备注") + private String remarks; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java index 88933000e5..81551ac42a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java @@ -25,17 +25,13 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.busdepositfictitious; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; -import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo; import java.util.List; @@ -79,4 +75,12 @@ public interface BusDepositFictitiousMapper extends BaseMapper getDepositRecords(@Param("depositBillNo") String depositBillNo); + + /** + * 根据订金信息sid查询虚拟订单和订金信息的关联 + * + * @param sid 订金信息sid + * @return + */ + List getList(String sid); } \ 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 17205d4a31..dee40389d5 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 @@ -31,4 +31,16 @@ LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid WHERE bdf.depositBillNo = #{depositBillNo} + + \ 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 797a6eb8d2..88138745a9 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 @@ -26,18 +26,14 @@ package com.yxt.anrui.buscenter.biz.busdepositfictitious; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.busdepositfictitious.*; -import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -99,4 +95,8 @@ public class BusDepositFictitiousService extends MybatisBaseService list = baseMapper.getDepositRecords(depositBillNo); return list; } + + public List getList(String sid) { + return baseMapper.getList(sid); + } } \ No newline at end of file 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 85802a1951..c590e2aa05 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 @@ -106,7 +106,30 @@ public interface BusSalesOrderMapper extends BaseMapper { */ int updateCompanySidBySid(String sid); + /** + * 根据销售订单sid更新销售订单的车辆类型字段 + * + * @param type 类型 + * @param salesOrderSid 销售订单sid + * @return + */ int updateTypeBySid(@Param("type") String type, @Param("sid") String salesOrderSid); + /** + * 根据销售订单sid更新是否上装的状态 + * + * @param salesOrderSid 销售订单sid + * @param state 是否包含上装 + * @return + */ int updateIsTop(@Param("salesOrderSid") String salesOrderSid, @Param("state") String state); + + /** + * 根据销售订单sid更新是否在公司入保字段 + * + * @param isInsureType 是否在公司入保 + * @param saleOrderSid 销售订单sid + * @return + */ + int updateIsInsurance(@Param("isInsureType") String isInsureType, @Param("saleOrderSid") 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 9786cfb906..e93393ff6d 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 @@ -27,7 +27,7 @@ ${ew.sqlSegment} - + update bus_sales_order set procDefId=#{procDefId}, @@ -105,22 +105,28 @@ AND orgSid = #{orgSid} AND billNo LIKE concat(#{billsType}, '%') - + update bus_sales_order set affiliatedCompanySid = NULL where sid = #{sid} - + update bus_sales_order set type = #{type} where sid = #{sid} - + update bus_sales_order set isTop = #{state} where sid = #{salesOrderSid} + + + update bus_sales_order + set isInsurance = #{isInsureType} + where sid = #{saleOrderSid} + \ No newline at end of file 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 72e74ce4e4..2fc248b33d 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 @@ -1628,11 +1628,36 @@ public class BusSalesOrderService extends MybatisBaseService @@ -72,4 +65,12 @@ public interface BusSalesOrderDepositMapper extends BaseMapper - + + select bd.salesOrderSid as saleOrderSid, + bd.depositAll as depositTotal, + bd.depositType as payType, + bd.depositTypeKey as payTypeKey, + bd.sid + from bus_sales_order_deposit bd + where bd.salesOrderSid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java index 2f35ef35c0..16b4dce511 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java @@ -25,14 +25,13 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesorderdeposit; -import com.yxt.anrui.buscenter.api.bussalesorderdeposit.*; -import com.yxt.common.core.query.PagerQuery; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Project: anrui-buscenter(业务管理)
@@ -51,5 +50,12 @@ import org.springframework.web.bind.annotation.*; @RestController("com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositRest") @RequestMapping("v1/bussalesorderdeposit") public class BusSalesOrderDepositRest implements BusSalesOrderDepositFeign { - + + @Autowired + private BusSalesOrderDepositService busSalesOrderDepositService; + + @Override + public ResultBean getDepositInfo(String sid) { + return busSalesOrderDepositService.getDepositInfo(sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index d33a288854..17d1e3b3d5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -26,15 +26,26 @@ package com.yxt.anrui.buscenter.biz.bussalesorderdeposit; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.bussalesorderdeposit.*; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderDepositService.java
@@ -51,6 +62,14 @@ import org.springframework.stereotype.Service; @Service public class BusSalesOrderDepositService extends MybatisBaseService { + + @Autowired + private BusSalesOrderService busSalesOrderService; + @Autowired + private BusDepositFictitiousService busDepositFictitiousService; + @Autowired + private BusSalesOrderPriceService busSalesOrderPriceService; + public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) { BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit(); BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid"); @@ -88,5 +107,37 @@ public class BusSalesOrderDepositService extends MybatisBaseService getDepositInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + //查询销售订单是否存在 + BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid); + if (busSalesOrder == null) { + return rb.setMsg("该销售订单单据不存在"); + } + //查询该订金信息是否存在 + AppBusSalesOrderDepositVo vo = baseMapper.getDepositInfo(sid); + //根据销售订单sid查询价格信息 + BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid); + if (vo == null) { + vo = new AppBusSalesOrderDepositVo(); + vo.setSaleOrderSid(sid); + } else { + //根据订金sid查询虚拟订单和订金的关联 + List listVos = busDepositFictitiousService.getList(vo.getSid()); + listVos.parallelStream().filter(Objects::nonNull).collect(Collectors.toList()); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + String payPath = listVo.getPayPath(); + List stringList = Arrays.asList(payPath.split(",")); + listVo.setEntrustImage(stringList); + } + } + vo.setVirtualOrderList(listVos); + } + if (busSalesOrderPrice != null) { + vo.setCarNumber(busSalesOrderPrice.getQuantity().toString()); + } + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java index 631e20aab8..bf3bc3e655 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java @@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderinsurance; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -61,4 +62,20 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper - + + select * + from bus_sales_order_insurance + where salesOrderSid = #{saleOrderSid} + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java index fd90475ca9..98a2bb4516 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java @@ -25,14 +25,14 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesorderinsurance; -import com.yxt.anrui.buscenter.api.bussalesorderinsurance.*; -import com.yxt.common.core.query.PagerQuery; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceFeign; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Project: anrui-buscenter(业务管理)
@@ -52,5 +52,16 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("v1/bussalesorderinsurance") public class BusSalesOrderInsuranceRest implements BusSalesOrderInsuranceFeign { - + @Autowired + private BusSalesOrderInsuranceService busSalesOrderInsuranceService; + + @Override + public ResultBean save(AppBusSalesOrderInsuranceDto dto) { + return busSalesOrderInsuranceService.saveAppInsurance(dto); + } + + @Override + public ResultBean getInsurance(String sid) { + return busSalesOrderInsuranceService.getInsurance(sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java index 6c032eb2d1..480b6e2081 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java @@ -26,10 +26,17 @@ package com.yxt.anrui.buscenter.biz.bussalesorderinsurance; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -48,6 +55,9 @@ import org.springframework.stereotype.Service; @Service public class BusSalesOrderInsuranceService extends MybatisBaseService { + @Autowired + private BusSalesOrderService busSalesOrderService; + public void saveInsurance(BusSalesOrderInsuranceDto busSalesOrderInsuranceDto, String sid) { BusSalesOrderInsurance busSalesOrderInsurance = new BusSalesOrderInsurance(); BeanUtil.copyProperties(busSalesOrderInsuranceDto, busSalesOrderInsurance, "sid"); @@ -82,4 +92,66 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService getInsurance(String sid) { + ResultBean rb = ResultBean.fireFail(); + //根据销售订单sid查询销售订单是否存在 + BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid); + if (busSalesOrder == null) { + return rb.setMsg("该销售订单单据不存在"); + } + AppBusSalesOrderInsuranceVo vo = baseMapper.getInsurance(sid); + if (vo == null) { + vo = new AppBusSalesOrderInsuranceVo(); + vo.setSaleOrderSid(sid); + } + if (StringUtils.isNotBlank(busSalesOrder.getIsInsurance())) { + vo.setIsInsureType(busSalesOrder.getIsInsurance()); + if ("1".equals(busSalesOrder.getIsInsurance())) { + vo.setIsInsureValue("是"); + } else { + vo.setIsInsureValue("否"); + } + } + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 5d64a26996..97c104c763 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -105,6 +105,11 @@ public interface SysOrganizationFeign { @GetMapping("/selectBySid") ResultBean selectBySid(@RequestParam("sid") String sid); + @ApiOperation("根据组织架构sid查询组织下所有分公司") + @ResponseBody + @GetMapping("/selectUseOrgSidBySid") + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid); + /** * 查询公司所有的部门 * diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index e1a470ef10..d7b1664ffe 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -112,6 +113,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { return null; } + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + return null; + } + @Override public ResultBean> selectListOne() { return null; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index c3ce6e78f7..12c66500f2 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -83,6 +84,26 @@ public interface SysStaffinfoFeign { @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); + /** + * 获取集团内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffName") + public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName); + + /** + * 获取部门内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffNameByDeptSid") + public ResultBean>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid); + @ApiOperation("获取App通讯录") @ResponseBody @@ -104,4 +125,5 @@ public interface SysStaffinfoFeign { @GetMapping("/selectStaffList") ResultBean> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 28328879d8..cfa7bf12a2 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -50,6 +51,16 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } + @Override + public ResultBean>> getStaffName(String staffName) { + return null; + } + + @Override + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + return null; + } + @Override public ResultBean selectAppContactsList(String names) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfoselectAppContactsList无法访问"); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 1375fb0cd1..c2487e9076 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -99,4 +100,6 @@ public interface SysOrganizationMapper extends BaseMapper { @Select("select * from sys_organization WHERE staffSid=#{sid}") SysOrganizationVo getUseOrgByStaffSid(String sid); + + List> selectUseOrgSidBySid(String psid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 295251961c..57bd0b375d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -153,4 +153,15 @@ WHERE so.sid = #{sid} ORDER BY so.sort ASC + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index fef20725d8..8ab39112cf 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -216,6 +216,13 @@ public class SysOrganizationRest implements SysOrganizationFeign { return new ResultBean().success().setData(sysOrganization); } + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List> maps = sysOrganizationService.selectUseOrgSidBySid(sid); + return rb.success().setData(maps); + } + /** * 查询公司所有的部门 * diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 5c2be390c6..7185b9700a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -377,4 +377,9 @@ public class SysOrganizationService extends MybatisBaseService> selectUseOrgSidBySid(String sid) { + SysOrganization sysOrganization = fetchBySid(sid); + String psid = sysOrganization.getPsid(); + return baseMapper.selectUseOrgSidBySid(psid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java index 83a5b9ae06..071f15e137 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -110,4 +111,8 @@ public interface SysStaffinfoMapper extends BaseMapper { * @return */ List selectStaffList(String orgSid); + + List> getStaffName(@Param(Constants.WRAPPER) Wrapper> qw); + + List> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper> qw); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 38bf794811..978057c1e9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -8,22 +8,23 @@ resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsVo"> SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage FROM sys_staffinfo staff - LEFT JOIN sys_user user ON staff.sid = user.staffSid + LEFT JOIN sys_user user + ON staff.sid = user.staffSid ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName @@ -65,15 +67,15 @@ IFNULL(NULL, 0) AS staffNum FROM sys_staff_org org INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid - LEFT JOIN sys_user user ON staff.sid = user.staffSid + LEFT JOIN sys_user user + ON staff.sid = user.staffSid WHERE org.orgSid = #{sid} - select sso.staffSid,si.name staffName from sys_staff_org sso - left join sys_staffinfo si on sso.staffSid = si.sid - where find_in_set(#{orgSid},replace(sso.orgSidPath,'/',',')) + select sso.staffSid, si.name staffName + from sys_staff_org sso + left join sys_staffinfo si on sso.staffSid = si.sid + where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ',')) + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index bef147f7d2..2e52daf5ae 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -131,6 +132,20 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return rb.success().setData(sysStaffinfo); } + @Override + public ResultBean>> getStaffName(String staffName) { + ResultBean rb = ResultBean.fireFail(); + List> staffNameList = sysStaffinfoService.getStaffName(staffName); + return rb.success().setData(staffNameList); + } + + @Override + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List> staffNameList = sysStaffinfoService.getStaffNameByDeptSid(staffName,deptSid); + return rb.success().setData(staffNameList); + } + @Override public ResultBean> selectAppContactsList(String names) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 6a3b28adbd..5e1f862597 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -192,6 +193,14 @@ public class SysStaffinfoService extends MybatisBaseService> getStaffName(String staffName) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(staffName)) { + qw.like("name", staffName); + } + qw.eq("isDelete",0); + return baseMapper.getStaffName(qw); + } + + public List> getStaffNameByDeptSid(String staffName, String deptSid) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(staffName)) { + qw.like("name", staffName); + } + //qw.eq("") + qw.eq("isDelete",0); + return baseMapper.getStaffNameByDeptSid(qw); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFile.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFile.java new file mode 100644 index 0000000000..583238b8c0 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFile.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmFile.java
+ * Class: scm.api.scmfile.ScmFile
+ * Description: 供应链附件表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应链附件表", description = "供应链附件表") +@TableName("scm_file") +public class ScmFile extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("上传人姓名") + private String name; // 上传人姓名 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件相对路径") + private String filePath; // 文件相对路径 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDetailsVo.java new file mode 100644 index 0000000000..582e649b9b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmFileVo.java
+ * Class: scm.api.scmfile.ScmFileVo
+ * Description: 供应链附件表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应链附件表 视图数据详情", description = "供应链附件表 视图数据详情") +public class ScmFileDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("上传人姓名") + private String name; // 上传人姓名 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件相对路径") + private String filePath; // 文件相对路径 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDto.java new file mode 100644 index 0000000000..8e18d5b15b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDto.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmFileDto.java
+ * Class: scm.api.scmfile.ScmFileDto
+ * Description: 供应链附件表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应链附件表 数据传输对象", description = "供应链附件表 数据传输对象") +public class ScmFileDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("上传人姓名") + private String name; // 上传人姓名 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件相对路径") + private String filePath; // 文件相对路径 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeign.java new file mode 100644 index 0000000000..226d85a1cc --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmFileFeign.java
+ * Class: scm.api.scmfile.ScmFileFeign
+ * Description: 供应链附件表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应链附件表") +@FeignClient( + contextId = "scm-ScmFile", + name = "scm", + path = "v1/scmfile", + fallback = ScmFileFeignFallback.class) +public interface ScmFileFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmFileDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeignFallback.java new file mode 100644 index 0000000000..d2d8fbc863 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmFileFeignFallback.java
+ * Class: scm.api.scmfile.ScmFileFeignFallback
+ * Description: 供应链附件表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmFileFeignFallback implements ScmFileFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmfile/listPage无法访问"); + } + + @Override + public ResultBean save(ScmFileDto dto){ + return ResultBean.fireFail().setMsg("接口scm/scmfile/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口scm/scmfile/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmfile/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileQuery.java new file mode 100644 index 0000000000..f31381f722 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileQuery.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmFileQuery.java
+ * Class: scm.api.scmfile.ScmFileQuery
+ * Description: 供应链附件表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应链附件表 查询条件", description = "供应链附件表 查询条件") +public class ScmFileQuery implements Query { + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("上传人姓名") + private String name; // 上传人姓名 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件相对路径") + private String filePath; // 文件相对路径 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileVo.java new file mode 100644 index 0000000000..e32d1ab88d --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmfile; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmFileVo.java
+ * Class: scm.api.scmfile.ScmFileVo
+ * Description: 供应链附件表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应链附件表 视图数据对象", description = "供应链附件表 视图数据对象") +public class ScmFileVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("上传人姓名") + private String name; // 上传人姓名 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件相对路径") + private String filePath; // 文件相对路径 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java new file mode 100644 index 0000000000..d934117d7e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java @@ -0,0 +1,90 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibrary.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibrary
+ * Description: 入库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "入库单", description = "入库单") +@TableName("scm_vehicle_enterlibrary") +public class ScmVehicleEnterlibrary extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("常用配置") + private String configName; // 常用配置 + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("入库日期") + private String inboundDate; // 入库日期 + @ApiModelProperty("入库人") + private String inbound; // 入库人 + @ApiModelProperty("存放地点") + private String location; // 存放地点 + @ApiModelProperty("仓库管理员") + private String storekeeper; // 仓库管理员 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("入库状态（已入库，未入库）") + private String inboundState; // 入库状态（已入库，未入库） + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDetailsVo.java new file mode 100644 index 0000000000..3b32f5d000 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDetailsVo.java @@ -0,0 +1,91 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryVo.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo
+ * Description: 入库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "入库单 视图数据详情", description = "入库单 视图数据详情") +public class ScmVehicleEnterlibraryDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("常用配置") + private String configName; // 常用配置 + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("入库日期") + private String inboundDate; // 入库日期 + @ApiModelProperty("入库人") + private String inbound; // 入库人 + @ApiModelProperty("存放地点") + private String location; // 存放地点 + @ApiModelProperty("仓库管理员") + private String storekeeper; // 仓库管理员 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("入库状态（已入库，未入库）") + private String inboundState; // 入库状态（已入库，未入库） + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDto.java new file mode 100644 index 0000000000..14e95d1bb2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDto.java @@ -0,0 +1,91 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryDto.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryDto
+ * Description: 入库单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "入库单 数据传输对象", description = "入库单 数据传输对象") +public class ScmVehicleEnterlibraryDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("常用配置") + private String configName; // 常用配置 + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("入库日期") + private String inboundDate; // 入库日期 + @ApiModelProperty("入库人") + private String inbound; // 入库人 + @ApiModelProperty("存放地点") + private String location; // 存放地点 + @ApiModelProperty("仓库管理员") + private String storekeeper; // 仓库管理员 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("入库状态（已入库，未入库）") + private String inboundState; // 入库状态（已入库，未入库） + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java new file mode 100644 index 0000000000..4efebf16ea --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryFeign.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign
+ * Description: 入库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "入库单") +@FeignClient( + contextId = "scm-ScmVehicleEnterlibrary", + name = "scm", + path = "v1/scmvehicleenterlibrary", + fallback = ScmVehicleEnterlibraryFeignFallback.class) +public interface ScmVehicleEnterlibraryFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java new file mode 100644 index 0000000000..eb747a5314 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryFeignFallback.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeignFallback
+ * Description: 入库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibraryFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmvehicleenterlibrary/listPage无法访问"); + } + + @Override + public ResultBean save(ScmVehicleEnterlibraryDto dto){ + return ResultBean.fireFail().setMsg("接口scm/scmvehicleenterlibrary/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口scm/scmvehicleenterlibrary/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmvehicleenterlibrary/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryQuery.java new file mode 100644 index 0000000000..cad81f3cfa --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryQuery.java @@ -0,0 +1,89 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryQuery.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryQuery
+ * Description: 入库单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "入库单 查询条件", description = "入库单 查询条件") +public class ScmVehicleEnterlibraryQuery implements Query { + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("常用配置") + private String configName; // 常用配置 + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("入库日期") + private String inboundDate; // 入库日期 + @ApiModelProperty("入库人") + private String inbound; // 入库人 + @ApiModelProperty("存放地点") + private String location; // 存放地点 + @ApiModelProperty("仓库管理员") + private String storekeeper; // 仓库管理员 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("入库状态（已入库，未入库）") + private String inboundState; // 入库状态（已入库，未入库） + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryVo.java new file mode 100644 index 0000000000..241c0a3873 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryVo.java @@ -0,0 +1,91 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleenterlibrary; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryVo.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo
+ * Description: 入库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "入库单 视图数据对象", description = "入库单 视图数据对象") +public class ScmVehicleEnterlibraryVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("常用配置") + private String configName; // 常用配置 + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("入库日期") + private String inboundDate; // 入库日期 + @ApiModelProperty("入库人") + private String inbound; // 入库人 + @ApiModelProperty("存放地点") + private String location; // 存放地点 + @ApiModelProperty("仓库管理员") + private String storekeeper; // 仓库管理员 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("入库状态（已入库，未入库）") + private String inboundState; // 入库状态（已入库，未入库） + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java new file mode 100644 index 0000000000..1fa57f9d08 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppScmVehicleExamineDetailsVo implements Vo { + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("订单类型") + private String type; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("配置") + private String config; + + @ApiModelProperty("发车日期") + private String dispatchedDate; + + @ApiModelProperty("验车人") + private String inspectedName; + + @ApiModelProperty("验车日期") + private String inspectedDate; + + @ApiModelProperty(" 1 已验车 2 未验车 验车状态") + private String state; + + @ApiModelProperty("验车相关图片") + private List carInspectedImage; + + @ApiModelProperty("厂家验车单图片") + private List factoryImage; + + @ApiModelProperty("验车情况说明 为空时默认 -") + private String remarks; + + @ApiModelProperty("定位") + private String location; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java new file mode 100644 index 0000000000..841f5c9fe7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppScmVehicleExamineDto implements Dto { + + @ApiModelProperty("车架号") + private String vinNo; + + @ApiModelProperty("订单类型") + private String purchaseKey; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("配置") + private String config; + + @ApiModelProperty("厂家验车照片") + private List factoryImage; + + @ApiModelProperty("验车相关照片") + private List carInspectedImage; + + @ApiModelProperty("验车情况说明") + private String remarks; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("sid") + private String inspectedSid; + + @ApiModelProperty("经纬度") + private String location; + + @ApiModelProperty("地址") + private String address; + + @ApiModelProperty("洗车费") + private String price; + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java new file mode 100644 index 0000000000..744eb8a320 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppScmVehicleExamineInfoVo implements Vo { + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("采购类型") + private String purchaseKey; + + @ApiModelProperty("配置") + private String config; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("厂家验车照片") + private List factoryImage; + + @ApiModelProperty("验车相关照片") + private List carInspectedImage; + + @ApiModelProperty("检验情况说明") + private String remarks; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("sid") + private String inspectedSid; + + @ApiModelProperty("经纬度") + private String location; + + @ApiModelProperty("定位地址") + private String address; + + @ApiModelProperty("洗车费") + private String price; + + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageQuery.java new file mode 100644 index 0000000000..13bfe185ef --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppScmVehicleExaminePageQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("类型 “ ” 或 null 全部 1待验车 2已验车") + private String type; + + @ApiModelProperty("车架号、车型 、订单类型") + private String names; + + @ApiModelProperty("使用组织分公司sid") + private String useOrgSid; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java new file mode 100644 index 0000000000..10e9a8afe8 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "验车单 视图数据对象", description = "验车单 视图数据对象") +public class AppScmVehicleExaminePageVo implements Vo { + + + private String inspectedSid; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("发车日期") + private String dispatchedDate; + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; + + @ApiModelProperty("验车人") + private String inspectedName; + + @ApiModelProperty("验车日期") + private String inspectedDate; + + @ApiModelProperty("验车按钮 显示 只要通过了就不显示") + private boolean showInspectedBtn; + + @ApiModelProperty("是否验车 key 未验车 1 以验车2") + private String inspectedType; + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java new file mode 100644 index 0000000000..99438dbfb5 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppScmVehicleExamineSubmitDto implements Dto { + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("订单类型") + private String purchaseKey; + @ApiModelProperty("配置") + private String config; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("厂商验车照片") + private List factoryImage; + @ApiModelProperty("验车相关照片") + private List carInspectedImage; + @ApiModelProperty("验车情况说明") + private String remarks; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("sid") + private String inspectedSid; + @ApiModelProperty("经纬度") + private String location; + @ApiModelProperty("定位位置") + private String address; + @ApiModelProperty("洗车费") + private String price; + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java new file mode 100644 index 0000000000..2c667a165c --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamine.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamine
+ * Description: 验车单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单", description = "验车单") +@TableName("scm_vehicle_examine") +public class ScmVehicleExamine extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("配置（常用配置）") + private String configName; // 配置（常用配置） + @ApiModelProperty("验车情况说明") + private String inspectionSituation; // 验车情况说明 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("验车状态（已验车，未验车）") + private String inspectionResult; // 验车状态（已验车，未验车） + @ApiModelProperty("洗车费") + private String price; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDetailsVo.java new file mode 100644 index 0000000000..51bb473a6c --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDetailsVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineVo.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineVo
+ * Description: 验车单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单 视图数据详情", description = "验车单 视图数据详情") +public class ScmVehicleExamineDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("配置（常用配置）") + private String configName; // 配置（常用配置） + @ApiModelProperty("验车情况说明") + private String inspectionSituation; // 验车情况说明 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("验车状态（已验车，未验车）") + private String inspectionResult; // 验车状态（已验车，未验车） + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDto.java new file mode 100644 index 0000000000..23d934b063 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDto.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineDto.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineDto
+ * Description: 验车单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单 数据传输对象", description = "验车单 数据传输对象") +public class ScmVehicleExamineDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("配置（常用配置）") + private String configName; // 配置（常用配置） + @ApiModelProperty("验车情况说明") + private String inspectionSituation; // 验车情况说明 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("验车状态（已验车，未验车）") + private String inspectionResult; // 验车状态（已验车，未验车） + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java new file mode 100644 index 0000000000..1518c46f1c --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineFeign.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineFeign
+ * Description: 验车单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "验车单") +@FeignClient( + contextId = "scm-ScmVehicleExamine", + name = "scm", + path = "v1/scmvehicleexamine", + fallback = ScmVehicleExamineFeignFallback.class) +public interface ScmVehicleExamineFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmVehicleExamineDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + + @ApiOperation("手机端-获取验车管理列表") + @PostMapping("/getCarInspectedList") + @ResponseBody + public ResultBean> getCarInspectedList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-初始化验车单信息") + @GetMapping("/getCarInspectedInfo/{inspectedSid}/{userSid}") + @ResponseBody + public ResultBean getCarInspectedInfo(@PathVariable("inspectedSid") String inspectedSid, @PathVariable("userSid") String userSid); + + @ApiOperation("手机端-验车管理详情") + @GetMapping("/getCarInspected/{inspectedSid}") + @ResponseBody + public ResultBean getCarInspected(@PathVariable("inspectedSid") String inspectedSid); + + @ApiOperation("手机端-保存验车单") + @PostMapping("/saveCarInspectedInfo") + @ResponseBody + public ResultBean saveCarInspectedInfo(@RequestBody AppScmVehicleExamineDto dto); + + @ApiOperation("手机端-通过验车单") + @PostMapping("/submitCarInspectedInfo") + @ResponseBody + public ResultBean submitCarInspectedInfo(@RequestBody AppScmVehicleExamineSubmitDto dto); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java new file mode 100644 index 0000000000..91c6e22794 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineFeignFallback.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineFeignFallback
+ * Description: 验车单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmvehicleexamine/listPage无法访问"); + } + + @Override + public ResultBean save(ScmVehicleExamineDto dto){ + return ResultBean.fireFail().setMsg("接口scm/scmvehicleexamine/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口scm/scmvehicleexamine/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean> getCarInspectedList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean getCarInspectedInfo(String inspectedSid, String userSid) { + return null; + } + + @Override + public ResultBean getCarInspected(String inspectedSid) { + return null; + } + + @Override + public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) { + return null; + } + + @Override + public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) { + return null; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineQuery.java new file mode 100644 index 0000000000..b5b218ee69 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineQuery.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineQuery.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineQuery
+ * Description: 验车单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单 查询条件", description = "验车单 查询条件") +public class ScmVehicleExamineQuery implements Query { + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("配置（常用配置）") + private String configName; // 配置（常用配置） + @ApiModelProperty("验车情况说明") + private String inspectionSituation; // 验车情况说明 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("验车状态（已验车，未验车）") + private String inspectionResult; // 验车状态（已验车，未验车） + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineVo.java new file mode 100644 index 0000000000..17b1142064 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineVo.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineVo
+ * Description: 验车单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单 视图数据对象", description = "验车单 视图数据对象") +public class ScmVehicleExamineVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; // 采购订单类型（外采，内购，排产） + @ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）") + private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产） + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("发车日期") + private String departureDate; // 发车日期 + @ApiModelProperty("验车日期") + private String inspectionDate; // 验车日期 + @ApiModelProperty("验车人") + private String inspection; // 验车人 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型别名") + private String modelName; // 车型别名 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid + @ApiModelProperty("配置（常用配置）") + private String configName; // 配置（常用配置） + @ApiModelProperty("验车情况说明") + private String inspectionSituation; // 验车情况说明 + @ApiModelProperty("地址") + private String address; // 地址 + @ApiModelProperty("地址经纬度") + private String addressCode; // 地址经纬度 + @ApiModelProperty("验车状态（已验车，未验车）") + private String inspectionResult; // 验车状态（已验车，未验车） + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java new file mode 100644 index 0000000000..8e92e14373 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGression.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGression
+ * Description: 移位单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "移位单", description = "移位单") +@TableName("scm_vehicle_gression") +public class ScmVehicleGression extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("申请编号") + private String applicantNo; // 申请编号 + @ApiModelProperty("现存地点") + private String location; // 现存地点 + @ApiModelProperty("目标地点") + private String targetLocation; // 目标地点 + @ApiModelProperty("变更原因") + private String changeReason; // 变更原因 + @ApiModelProperty("申请经费") + private String applicantFunds; // 申请经费 + @ApiModelProperty("经办人") + private String operator; // 经办人 + @ApiModelProperty("保险状态") + private String InsuranceState; // 保险状态 + @ApiModelProperty("临牌") + private String temporaryCard; // 临牌 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDetailsVo.java new file mode 100644 index 0000000000..f493ff9666 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDetailsVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionVo.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo
+ * Description: 移位单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "移位单 视图数据详情", description = "移位单 视图数据详情") +public class ScmVehicleGressionDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("申请编号") + private String applicantNo; // 申请编号 + @ApiModelProperty("现存地点") + private String location; // 现存地点 + @ApiModelProperty("目标地点") + private String targetLocation; // 目标地点 + @ApiModelProperty("变更原因") + private String changeReason; // 变更原因 + @ApiModelProperty("申请经费") + private String applicantFunds; // 申请经费 + @ApiModelProperty("经办人") + private String operator; // 经办人 + @ApiModelProperty("保险状态") + private String InsuranceState; // 保险状态 + @ApiModelProperty("临牌") + private String temporaryCard; // 临牌 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDto.java new file mode 100644 index 0000000000..e69f362908 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDto.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionDto.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionDto
+ * Description: 移位单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "移位单 数据传输对象", description = "移位单 数据传输对象") +public class ScmVehicleGressionDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("申请编号") + private String applicantNo; // 申请编号 + @ApiModelProperty("现存地点") + private String location; // 现存地点 + @ApiModelProperty("目标地点") + private String targetLocation; // 目标地点 + @ApiModelProperty("变更原因") + private String changeReason; // 变更原因 + @ApiModelProperty("申请经费") + private String applicantFunds; // 申请经费 + @ApiModelProperty("经办人") + private String operator; // 经办人 + @ApiModelProperty("保险状态") + private String InsuranceState; // 保险状态 + @ApiModelProperty("临牌") + private String temporaryCard; // 临牌 + +} \ No newline at end of file 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 new file mode 100644 index 0000000000..2e3da04320 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionFeign.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionFeign
+ * Description: 移位单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "移位单") +@FeignClient( + contextId = "scm-ScmVehicleGression", + name = "scm", + path = "v1/scmvehiclegression", + fallback = ScmVehicleGressionFeignFallback.class) +public interface ScmVehicleGressionFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmVehicleGressionDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file 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 new file mode 100644 index 0000000000..b5f7ff8908 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionFeignFallback.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionFeignFallback
+ * Description: 移位单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问"); + } + + @Override + public ResultBean save(ScmVehicleGressionDto dto){ + return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionQuery.java new file mode 100644 index 0000000000..9ba1cc79d8 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionQuery.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionQuery.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionQuery
+ * Description: 移位单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "移位单 查询条件", description = "移位单 查询条件") +public class ScmVehicleGressionQuery implements Query { + + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("申请编号") + private String applicantNo; // 申请编号 + @ApiModelProperty("现存地点") + private String location; // 现存地点 + @ApiModelProperty("目标地点") + private String targetLocation; // 目标地点 + @ApiModelProperty("变更原因") + private String changeReason; // 变更原因 + @ApiModelProperty("申请经费") + private String applicantFunds; // 申请经费 + @ApiModelProperty("经办人") + private String operator; // 经办人 + @ApiModelProperty("保险状态") + private String InsuranceState; // 保险状态 + @ApiModelProperty("临牌") + private String temporaryCard; // 临牌 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java new file mode 100644 index 0000000000..fb6f3b8391 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclegression; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionVo.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo
+ * Description: 移位单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "移位单 视图数据对象", description = "移位单 视图数据对象") +public class ScmVehicleGressionVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("申请编号") + private String applicantNo; // 申请编号 + @ApiModelProperty("现存地点") + private String location; // 现存地点 + @ApiModelProperty("目标地点") + private String targetLocation; // 目标地点 + @ApiModelProperty("变更原因") + private String changeReason; // 变更原因 + @ApiModelProperty("申请经费") + private String applicantFunds; // 申请经费 + @ApiModelProperty("经办人") + private String operator; // 经办人 + @ApiModelProperty("保险状态") + private String InsuranceState; // 保险状态 + @ApiModelProperty("临牌") + private String temporaryCard; // 临牌 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java index 71f6a60d52..b601a994ba 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java @@ -60,8 +60,8 @@ public class ScmWarehouseQuery implements Query { @ApiModelProperty("名称") private String warehouseName; // 名称 - @ApiModelProperty("仓库属性") - private String warehouseAttribute; // 仓库属性 + @ApiModelProperty("详细地址") + private String warehouseAttribute; // 详细地址 @ApiModelProperty("仓库负责人") private String warehouseContract; // 仓库负责人 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java new file mode 100644 index 0000000000..d26b15b986 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmfile; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmfile.ScmFileVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmFileMapper.java
+ * Class: scm.biz.scmfile.ScmFileMapper
+ * Description: 供应链附件表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmFileMapper extends BaseMapper { + + //@Update("update scm_file set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_file") + List selectListVo(); + + @Select("select * from scm_file where linkSid = #{sid} and attachType = #{type}") + List selectByLinkSid(@Param("sid") String sid, @Param("type") String type); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml new file mode 100644 index 0000000000..63dc379d72 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java new file mode 100644 index 0000000000..3947d621f1 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmfile; + +import com.yxt.anrui.scm.api.scmfile.*; +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.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * Project: scm(scm)
+ * File: ScmFileFeignFallback.java
+ * Class: scm.biz.scmfile.ScmFileRest
+ * Description: 供应链附件表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应链附件表") +@RestController("scm.biz.scmfile.ScmFileRest") +@RequestMapping("v1/scmfile") +public class ScmFileRest implements ScmFileFeign { + + @Autowired + private ScmFileService scmFileService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmFileService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmFileDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmFileService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmFileService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmFileDetailsVo vo = scmFileService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java new file mode 100644 index 0000000000..b8fbf92dd5 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmfile; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmfile.*; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmFileService.java
+ * Class: scm.biz.scmfile.ScmFileService
+ * Description: 供应链附件表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmFileService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmFileQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmFileQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmFileDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmFileDto dto) { + ScmFile entity = new ScmFile(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmFileDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmFile entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmFileDetailsVo fetchDetailsVoBySid(String sid) { + ScmFile entity = fetchBySid(sid); + ScmFileDetailsVo vo = new ScmFileDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 根据业务sid和附件类型查询附件 + * + * @param sid + * @param type + * @return + */ + public List selectByLinkSid(String sid, String type) { + List list = baseMapper.selectByLinkSid(sid, type); + return list; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java new file mode 100644 index 0000000000..50c43c4f42 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehicleenterlibrary; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibrary; +import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryMapper.java
+ * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryMapper
+ * Description: 入库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmVehicleEnterlibraryMapper extends BaseMapper { + + //@Update("update scm_vehicle_enterlibrary set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_vehicle_enterlibrary") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml new file mode 100644 index 0000000000..6fbc90d91b --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java new file mode 100644 index 0000000000..a49f86d239 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehicleenterlibrary; + +import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; +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.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryFeignFallback.java
+ * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryRest
+ * Description: 入库单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "入库单") +@RestController("scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryRest") +@RequestMapping("v1/scmvehicleenterlibrary") +public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign { + + @Autowired + private ScmVehicleEnterlibraryService scmVehicleEnterlibraryService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehicleEnterlibraryService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmVehicleEnterlibraryService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmVehicleEnterlibraryService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmVehicleEnterlibraryDetailsVo vo = scmVehicleEnterlibraryService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java new file mode 100644 index 0000000000..03093fcba0 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -0,0 +1,106 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehicleenterlibrary; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryService.java
+ * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryService
+ * Description: 入库单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmVehicleEnterlibraryService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmVehicleEnterlibraryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmVehicleEnterlibraryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmVehicleEnterlibraryDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehicleEnterlibraryDto dto){ + ScmVehicleEnterlibrary entity = new ScmVehicleEnterlibrary(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehicleEnterlibraryDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmVehicleEnterlibrary entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehicleEnterlibraryDetailsVo fetchDetailsVoBySid(String sid){ + ScmVehicleEnterlibrary entity = fetchBySid(sid); + ScmVehicleEnterlibraryDetailsVo vo = new ScmVehicleEnterlibraryDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java new file mode 100644 index 0000000000..bffa3d6962 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehicleexamine; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmvehicleexamine.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineMapper.java
+ * Class: scm.biz.scmvehicleexamine.ScmVehicleExamineMapper
+ * Description: 验车单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmVehicleExamineMapper extends BaseMapper { + + //@Update("update scm_vehicle_examine set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_vehicle_examine") + List selectListVo(); + + + /** + * 手机端-获取验车管理列表 + * + * @param page + * @param qw + * @param names + * @return + */ + IPage getCarInspectedList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + + + /** + * 手机端-初始化验车单信息 + * + * @param inspectedSid + * @param useOrgSid + * @return + */ + AppScmVehicleExamineInfoVo getCarInspectedInfo(@Param("inspectedSid") String inspectedSid, @Param("useOrgSid") String useOrgSid); + + /** + * 手机端-验车管理详情 + * + * @param inspectedSid + * @return + */ + AppScmVehicleExamineDetailsVo getCarInspected(@Param("inspectedSid") String inspectedSid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml new file mode 100644 index 0000000000..f2c47bf321 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java new file mode 100644 index 0000000000..a600e9c7bf --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java @@ -0,0 +1,147 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehicleexamine; + +import com.alibaba.nacos.api.config.filter.IFilterConfig; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehicleexamine.*; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +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.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineFeignFallback.java
+ * Class: scm.biz.scmvehicleexamine.ScmVehicleExamineRest
+ * Description: 验车单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "验车单") +@RestController("scm.biz.scmvehicleexamine.ScmVehicleExamineRest") +@RequestMapping("v1/scmvehicleexamine") +public class ScmVehicleExamineRest implements ScmVehicleExamineFeign { + + @Autowired + private ScmVehicleExamineService scmVehicleExamineService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehicleExamineService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmVehicleExamineDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleExamineService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleExamineService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmVehicleExamineDetailsVo vo = scmVehicleExamineService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + + @Override + @ApiOperation("手机端-获取验车管理列表") + @PostMapping("/getCarInspectedList") + public ResultBean> getCarInspectedList(PagerQuery pagerQuery) { + if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { + new ResultBean<>().success().setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = scmVehicleExamineService.getCarInspectedList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + + @Override + @ApiOperation("手机端-初始化验车单信息") + @GetMapping("/getCarInspectedInfo/{inspectedSid}/{userSid}") + public ResultBean getCarInspectedInfo(String inspectedSid, String userSid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehicleExamineInfoVo vo = scmVehicleExamineService.getCarInspectedInfo(inspectedSid, userSid); + return rb.success().setData(vo); + } + + @Override + @ApiOperation("手机端-验车管理详情") + @GetMapping("/getCarInspected/{inspectedSid}") + public ResultBean getCarInspected(String inspectedSid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehicleExamineDetailsVo vo = scmVehicleExamineService.getCarInspected(inspectedSid); + return rb.success().setData(vo); + } + + @Override + @ApiOperation("手机端-保存验车单") + @PostMapping("/saveCarInspectedInfo") + public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleExamineService.saveCarInspectedInfo(dto); + return rb.success(); + } + + @Override + @ApiOperation("手机端-通过验车单") + @PostMapping("/submitCarInspectedInfo") + public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleExamineService.submitCarInspectedInfo(dto); + return rb.success(); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java new file mode 100644 index 0000000000..e6c3786f83 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -0,0 +1,319 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehicleexamine; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmvehicleexamine.*; +import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineService.java
+ * Class: scm.biz.scmvehicleexamine.ScmVehicleExamineService
+ * Description: 验车单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmVehicleExamineService extends MybatisBaseService { + + @Autowired + SysUserFeign sysUserFeign; + + @Autowired + SysOrganizationFeign sysOrganizationFeign; + + @Autowired + ScmFileService scmFileService; + + @Autowired + FileUploadComponent fileUploadComponent; + + private QueryWrapper createQueryWrapper(ScmVehicleExamineQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmVehicleExamineQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmVehicleExamineDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehicleExamineDto dto) { + ScmVehicleExamine entity = new ScmVehicleExamine(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehicleExamineDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmVehicleExamine entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehicleExamineDetailsVo fetchDetailsVoBySid(String sid) { + ScmVehicleExamine entity = fetchBySid(sid); + ScmVehicleExamineDetailsVo vo = new ScmVehicleExamineDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 手机端-获取验车管理列表 + * + * @param pagerQuery + * @return + */ + public IPage getCarInspectedList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid(); + pagerQuery.getParams().setUseOrgSid(useOrgSid); + QueryWrapper qw = appQueryWrapper(pagerQuery.getParams()); + AppScmVehicleExaminePageQuery params = pagerQuery.getParams(); + IPage iPage = baseMapper.getCarInspectedList(page, qw, params.getNames()); + return iPage; + } + + /** + * 手机端-获取验车管理列表 查询条件 + * + * @param query + * @return + */ + private QueryWrapper appQueryWrapper(AppScmVehicleExaminePageQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("sve.useOrgSid", query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getType())) { + qw.eq("sve.inspectionResult", query.getType()); + } + return qw; + } + + /** + * 手机端-初始化验车单信息 + * + * @param inspectedSid + * @param userSid + * @return + */ + public AppScmVehicleExamineInfoVo getCarInspectedInfo(String inspectedSid, String userSid) { + String type1 = "01"; // 厂家验车照片 01 + String type2 = "02"; // 验车相关照片 02 + List factoryImages = new ArrayList<>(); + List carInspectedImages = new ArrayList<>(); + + String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + + AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid); + + List scmFiles1 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type1); + for (ScmFile scmFile : scmFiles1) { + factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setFactoryImage(factoryImages); + + List scmFiles2 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type2); + for (ScmFile scmFile : scmFiles2) { + carInspectedImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setCarInspectedImage(carInspectedImages); + return vo; + } + + /** + * 手机端-验车管理详情 + * + * @param inspectedSid + * @return + */ + public AppScmVehicleExamineDetailsVo getCarInspected(String inspectedSid) { + String type1 = "01"; // 厂家验车照片 01 + String type2 = "02"; // 验车相关照片 02 + List factoryImages = new ArrayList<>(); + List carInspectedImages = new ArrayList<>(); + + AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid); + + List scmFiles1 = scmFileService.selectByLinkSid(inspectedSid, type1); + for (ScmFile scmFile : scmFiles1) { + factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setFactoryImage(factoryImages); + + List scmFiles2 = scmFileService.selectByLinkSid(inspectedSid, type2); + for (ScmFile scmFile : scmFiles2) { + carInspectedImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setCarInspectedImage(carInspectedImages); + return vo; + } + + /** + * 手机端-保存验车单 + * + * @param dto + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) { + ResultBean rb = ResultBean.fireFail(); + String s1 = ""; + String s2 = ""; + if (StringUtils.isNotBlank(dto.getInspectedSid())) { + ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid()); + if ("1".equals(scmVehicleExamine.getInspectionResult())) { + scmVehicleExamine.setVinNo(dto.getVinNo()); + scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); + scmVehicleExamine.setModelName(dto.getModel()); + scmVehicleExamine.setConfigName(dto.getConfig()); + scmVehicleExamine.setRemarks(dto.getRemarks()); + scmVehicleExamine.setAddress(dto.getAddress()); + scmVehicleExamine.setAddressCode(dto.getLocation()); + scmVehicleExamine.setPrice(dto.getPrice()); + baseMapper.updateById(scmVehicleExamine); + List factoryImage = dto.getFactoryImage(); + for (String s : factoryImage) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType("01"); + scmFile1.setFileName("厂家验车照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile1); + + List carInspectedImage = dto.getCarInspectedImage(); + for (String s : carInspectedImage) { + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile2 = new ScmFile(); + scmFile2.setAttachType("02"); + scmFile1.setFileName("验车相关照片"); + scmFile2.setFilePath(s2); + scmFile2.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile2); + } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { + return rb.fail().setMsg("当前车辆已验车完成，请勿重复保存"); + } + } + return rb.fail().setMsg("保存失败"); + } + + /** + * 手机端-通过验车单 + * + * @param dto + * @return + */ + public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) { + ResultBean rb = ResultBean.fireFail(); + String s1 = ""; + String s2 = ""; + if (StringUtils.isNotBlank(dto.getInspectedSid())) { + ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid()); + if ("1".equals(scmVehicleExamine.getInspectionResult())) { + scmVehicleExamine.setVinNo(dto.getVin()); + scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); + scmVehicleExamine.setModelName(dto.getModel()); + scmVehicleExamine.setConfigName(dto.getConfig()); + scmVehicleExamine.setRemarks(dto.getRemarks()); + scmVehicleExamine.setAddress(dto.getAddress()); + scmVehicleExamine.setAddressCode(dto.getLocation()); + scmVehicleExamine.setPrice(dto.getPrice()); + baseMapper.updateById(scmVehicleExamine); + List factoryImage = dto.getFactoryImage(); + for (String s : factoryImage) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType("01"); + scmFile1.setFileName("厂家验车照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile1); + + List carInspectedImage = dto.getCarInspectedImage(); + for (String s : carInspectedImage) { + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile2 = new ScmFile(); + scmFile2.setAttachType("02"); + scmFile1.setFileName("验车相关照片"); + scmFile2.setFilePath(s2); + scmFile2.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile2); + } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { + return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); + } + } + return rb.fail().setMsg("提交失败"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java new file mode 100644 index 0000000000..ab1e2fa3ad --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehiclegression; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionMapper.java
+ * Class: scm.biz.scmvehiclegression.ScmVehicleGressionMapper
+ * Description: 移位单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmVehicleGressionMapper extends BaseMapper { + + //@Update("update scm_vehicle_gression set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_vehicle_gression") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml new file mode 100644 index 0000000000..bbde834cb5 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000000..8b68f25082 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehiclegression; + +import com.yxt.anrui.scm.api.scmvehiclegression.*; +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.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionFeignFallback.java
+ * Class: scm.biz.scmvehiclegression.ScmVehicleGressionRest
+ * Description: 移位单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "移位单") +@RestController("scm.biz.scmvehiclegression.ScmVehicleGressionRest") +@RequestMapping("v1/scmvehiclegression") +public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { + + @Autowired + private ScmVehicleGressionService scmVehicleGressionService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehicleGressionService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmVehicleGressionDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmVehicleGressionService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmVehicleGressionService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmVehicleGressionDetailsVo vo = scmVehicleGressionService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} 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 new file mode 100644 index 0000000000..899f611a27 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -0,0 +1,106 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehiclegression; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehiclegression.*; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: scm(scm)
+ * File: ScmVehicleGressionService.java
+ * Class: scm.biz.scmvehiclegression.ScmVehicleGressionService
+ * Description: 移位单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmVehicleGressionService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmVehicleGressionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmVehicleGressionQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmVehicleGressionDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehicleGressionDto dto){ + ScmVehicleGression entity = new ScmVehicleGression(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehicleGressionDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmVehicleGression entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehicleGressionDetailsVo fetchDetailsVoBySid(String sid){ + ScmVehicleGression entity = fetchBySid(sid); + ScmVehicleGressionDetailsVo vo = new ScmVehicleGressionDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index 2942f58b3f..a8dc0fbc85 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -71,11 +71,11 @@ public class ScmWarehouseService extends MybatisBaseService { - sids.push(row.sid) - }) - const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - req - .delBySids(sids) - .then(resp => { - loading.close() - if (resp.success) { - _this.$message({ type: 'success', message: resp.msg, showClose: true }) - _this.loadList() - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(e => { - loading.close() - }) - }) - .catch(() => {}) + this.multipleSelection.forEach(row => { + if(row.nodeState==''||(row.nodeState!=''&&row.nodeState=='外采申请')){ + sids.push(row.sid) + }else{ + alert('已经发起的审批业务数据不能进行删除。'); + sids = []; + } + }) + const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + .then(() => { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req + .delBySids(sids) + .then(resp => { + loading.close() + if (resp.success) { + _this.$message({ type: 'success', message: resp.msg, showClose: true }) + this.queryParams.current = 1 + _this.loadList() + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(e => { + loading.close() + }) + }) + .catch(() => {}) }, doImport(row) { // 导入的代码 diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue index ba44cf3dca..e2d351fd8a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue @@ -362,8 +362,11 @@ export default { .doSubmit(this.formobj) .then(resp => { this.submitdisabled = false + console.log(resp); if (resp.success) { // 加提交后的逻辑 + this.$message({ showClose: true, type: 'success', message: resp.msg }) + this.handleReturn('true') } else { // 根据resp.code进行异常情况处理 } diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue index 59f091cc2e..be91c42562 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue @@ -249,7 +249,9 @@ export default { }, /** 同意任务 */ handleAgree() { - this.agreeList.comment = "同意"; this.comment + console.log(this) + console.log(parent.parent) + /* this.agreeList.comment = "同意"; this.comment req.agreeTask(this.agreeList).then((response) => { if (response.code === '200') { this.$notify({ @@ -267,7 +269,7 @@ export default { duration: 2000 }) } - }) + })*/ }, /** 驳回任务 */ handleReject() { 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 cc4a53a182..3f3cc7273e 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 @@ -29,8 +29,11 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; @@ -158,4 +161,24 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean savePriceInfo(@RequestBody PriceDto dto); + /*-----------------------------------------保险信息------------------------------------------*/ + + @ApiOperation("保存保险信息") + @PostMapping("/save/InsuranceInfo") + @ResponseBody + ResultBean saveInsurance(@RequestBody InsuranceInfoDto dto); + + @ApiOperation("初始化保险信息") + @GetMapping("/init/InsuranceInfo/{saleOrderSid}") + @ResponseBody + ResultBean getInsurance(@PathVariable(value = "saleOrderSid") String sid); + + /*-----------------------------------------订金信息------------------------------------------*/ + + @ApiOperation("初始化订金信息") + @GetMapping("/init/depositInfo/{saleOrderSid}") + @ResponseBody + ResultBean getDeposit(@PathVariable(value = "saleOrderSid") String sid); + + } \ 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 80ef24f772..941175a725 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 @@ -28,8 +28,11 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; @@ -135,4 +138,19 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean savePriceInfo(PriceDto dto) { return null; } + + @Override + public ResultBean saveInsurance(InsuranceInfoDto dto) { + return null; + } + + @Override + public ResultBean getInsurance(String sid) { + return null; + } + + @Override + public ResultBean getDeposit(String sid) { + 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/depositinfo/DepositInfoListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java new file mode 100644 index 0000000000..691ed3a4a5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/7 11:56 + * @Description + */ +@Data +public class DepositInfoListVo implements Vo { + private static final long serialVersionUID = 2325430180382750489L; + + @ApiModelProperty(value = "虚拟订单sid") + private String virtualOrderSid; + @ApiModelProperty(value = "虚拟订单编号") + private String virtualOrderId; + @ApiModelProperty(value = "剩余金额") + private String remainderMoney; + @ApiModelProperty(value = "结转金额") + private String payMoney; + @ApiModelProperty(value = "款项支付委托书:销售订单与客户为同一人时，list为空") + private List entrustImage = new ArrayList<>(); + + private Boolean showImage; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java new file mode 100644 index 0000000000..27d88a0c47 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/7 11:51 + * @Description + */ +@Data +public class DepositInfoVo implements Vo { + private static final long serialVersionUID = -536852435105189707L; + @ApiModelProperty(value = "销售订单sid") + private String saleOrderSid; + @ApiModelProperty(value = "车辆数量") + private String carNumber; + @ApiModelProperty(value = "订金合计") + private String depositTotal; + @ApiModelProperty(value = "订金缴纳方式") + private String payType; + @ApiModelProperty(value = "订金缴纳方式key") + private String payTypeKey; + + private List virtualOrderList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java new file mode 100644 index 0000000000..16a25f0bab --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/6 17:22 + * @Description + */ +@Data +public class InsuranceInfoDto implements Dto { + private static final long serialVersionUID = -6297567954335504232L; + @ApiModelProperty(value = "是否在公司投保：1是，0否") + private String isInsureType; + @ApiModelProperty(value = "保险公司名称") + @JsonProperty(value = "name") + private String insuranceName; + @ApiModelProperty(value = "单台车保费预估金额") + @JsonProperty(value = "price") + private String insuranceCarMoney; + @ApiModelProperty(value = "公司入保期数") + @JsonProperty(value = "number") + private String insuranceNum; + + @ApiModelProperty(value = "备注") + private String remarks; + @ApiModelProperty(value = "销售订单sid") + @JsonProperty(value = "saleOrderSid") + private String salesOrderSid; + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java new file mode 100644 index 0000000000..b92e929a7f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/6 17:20 + * @Description + */ +@Data +public class InsuranceInfoVo implements Vo { + private static final long serialVersionUID = -1420649401828439807L; + + @ApiModelProperty(value = "销售订单sid") + private String saleOrderSid; + + @ApiModelProperty(value = "是否在公司投保") + private String isInsureType; + + @ApiModelProperty(value = "是否投保") + private String isInsureValue; + + @ApiModelProperty(value = "保险公司名称") + private String name; + + @ApiModelProperty(value = "单台保费") + private String price; + + @ApiModelProperty(value = "入保期数") + private String number; + + @ApiModelProperty(value = "备注") + private String remarks; +} 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 cd8d3513ef..8715ab71f6 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 @@ -29,8 +29,11 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.*; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; @@ -111,49 +114,125 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery); } + /** + * 获取意向车型分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ @Override public ResultBean> getWantCarList(PagerQuery pagerQuery) { return appBusSalesOrderService.getWantCarList(pagerQuery); } + /** + * 保存车型信息 + * + * @param dto 数据传输对象 + * @return + */ @Override public ResultBean saveModelInfo(ModelDto dto) { return appBusSalesOrderService.saveModelInfo(dto); } + /** + * 保存上装信息 + * + * @param dto 数据传输对象 + * @return + */ @Override public ResultBean saveTopInfo(TopDto dto) { return appBusSalesOrderService.saveTopInfo(dto); } + /** + * 初始化上装信息 + * + * @param sid 销售订单sid + * @return + */ @Override public ResultBean getTopInfo(String sid) { return appBusSalesOrderService.getTopInfo(sid); } + /** + * 主车优惠列表 + * + * @param sid + * @return + */ @Override public ResultBean getDiscountList(String sid) { return appBusSalesOrderService.getDiscountList(sid); } + /** + * 保存主车优惠 + * + * @param dto 数据传输对象 + * @return + */ @Override public ResultBean saveDiscount(DiscountDto dto) { return appBusSalesOrderService.saveDiscount(dto); } + /** + * 删除主车优惠 + * + * @param orderSid 销售订单sid + * @param sid 主车优惠sid + * @return + */ @Override public ResultBean deleteDiscount(String orderSid, String sid) { return appBusSalesOrderService.deleteDiscount(orderSid, sid); } + /** + * 初始化价格信息 + * + * @param sid 销售订单sid + * @return + */ @Override public ResultBean getPriceInfo(String sid) { return appBusSalesOrderService.getPriceInfo(sid); } + /** + * 保存价格信息 + * + * @param dto 数据传输对象 + * @return + */ @Override public ResultBean savePriceInfo(PriceDto dto) { return appBusSalesOrderService.savePriceInfo(dto); } + /** + * 保存保险信息 + * + * @param dto 数据传输对象 + * @return + */ + @Override + public ResultBean saveInsurance(InsuranceInfoDto dto) { + return appBusSalesOrderService.saveInsurance(dto); + } + + @Override + public ResultBean getInsurance(String sid) { + return appBusSalesOrderService.getInsurance(sid); + } + + @Override + public ResultBean getDeposit(String sid) { + return appBusSalesOrderService.getDeposit(sid); + } + } 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 0683d48f7b..71376d33c8 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 @@ -28,9 +28,14 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountFeign; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceFeign; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign; import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto; import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo; @@ -42,9 +47,12 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceV import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; @@ -90,6 +98,10 @@ public class AppBusSalesOrderService { private BusSalesOrderDiscountFeign busSalesOrderDiscountFeign; @Autowired private BusSalesOrderPriceFeign busSalesOrderPriceFeign; + @Autowired + private BusSalesOrderInsuranceFeign busSalesOrderInsuranceFeign; + @Autowired + private BusSalesOrderDepositFeign busSalesOrderDepositFeign; /************************************* 销售订单接口 *********************************************/ @@ -250,12 +262,12 @@ public class AppBusSalesOrderService { public ResultBean getPriceInfo(String sid) { ResultBean rb = ResultBean.fireFail(); ResultBean resultBean = busSalesOrderPriceFeign.getPriceInfo(sid); - if(resultBean.getSuccess()){ + if (resultBean.getSuccess()) { PriceVo priceVo = new PriceVo(); AppBusSalesOrderPriceVo appBusSalesOrderPriceVo = resultBean.getData(); BeanUtil.copyProperties(appBusSalesOrderPriceVo, priceVo); return rb.success().setData(priceVo); - }else{ + } else { return rb.setMsg(resultBean.getMsg()); } @@ -267,4 +279,34 @@ public class AppBusSalesOrderService { ResultBean resultBean = busSalesOrderPriceFeign.savePriceInfo(appBusSalesOrderPriceDto); return resultBean; } + + public ResultBean saveInsurance(InsuranceInfoDto dto) { + AppBusSalesOrderInsuranceDto appBusSalesOrderInsuranceDto = new AppBusSalesOrderInsuranceDto(); + BeanUtil.copyProperties(dto, appBusSalesOrderInsuranceDto); + ResultBean resultBean = busSalesOrderInsuranceFeign.save(appBusSalesOrderInsuranceDto); + return resultBean; + } + + public ResultBean getInsurance(String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = busSalesOrderInsuranceFeign.getInsurance(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + InsuranceInfoVo insuranceInfoVo = new InsuranceInfoVo(); + BeanUtil.copyProperties(resultBean.getData(), insuranceInfoVo); + return rb.success().setData(insuranceInfoVo); + } + + public ResultBean getDeposit(String sid) { + ResultBean rb = ResultBean.fireFail(); + DepositInfoVo vo = new DepositInfoVo(); + ResultBean resultBean = busSalesOrderDepositFeign.getDepositInfo(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppBusSalesOrderDepositVo appBusSalesOrderDepositVo = resultBean.getData(); + BeanUtil.copyProperties(appBusSalesOrderDepositVo, vo); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/doc/databases/scm_tables_vehicle.sql b/doc/databases/scm_tables_vehicle.sql index b5c5c9f20d..fbeb566fa8 100644 --- a/doc/databases/scm_tables_vehicle.sql +++ b/doc/databases/scm_tables_vehicle.sql @@ -32,8 +32,46 @@ CREATE TABLE `scm_vehicle_examine` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='验车单'; +-- 2、入库单 +DROP TABLE IF EXISTS `scm_vehicle_enterlibrary`; +CREATE TABLE `scm_vehicle_enterlibrary` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `modelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', + `modelName` varchar(64) DEFAULT NULL COMMENT '车型别名', + `configSid` varchar(64) DEFAULT NULL COMMENT '常用配置sid', + `configName` varchar(64) DEFAULT NULL COMMENT '常用配置', + `purchaseType` varchar(64) DEFAULT NULL COMMENT '采购订单类型（外采，内购，排产）', + `purchaseTypeKey` varchar(14) DEFAULT NULL COMMENT '采购订单类型（ 01 外采，02 内购，03 排产）', + `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', + `vehicleSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', + `departureDate` varchar(64) DEFAULT NULL COMMENT '发车日期', + `inspectionDate` varchar(64) DEFAULT NULL COMMENT '验车日期', + `inspection` varchar(64) DEFAULT NULL COMMENT '验车人', + `inboundDate` varchar(64) DEFAULT NULL COMMENT '入库日期', + `inbound` varchar(64) DEFAULT NULL COMMENT '入库人', + `location` varchar(64) DEFAULT NULL COMMENT '存放地点', + `storekeeper` varchar(64) DEFAULT NULL COMMENT '仓库管理员', + `address` varchar(64) DEFAULT NULL COMMENT '地址', + `addressCode` varchar(64) DEFAULT NULL COMMENT '地址经纬度', + `inboundState` varchar(64) DEFAULT NULL COMMENT '入库状态（已入库，未入库）', + + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='入库单'; --- 2、移位单 +-- 3、移位单 DROP TABLE IF EXISTS `scm_vehicle_gression`; CREATE TABLE `scm_vehicle_gression` ( @@ -64,7 +102,7 @@ CREATE TABLE `scm_vehicle_gression` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='移位单'; --- 3、供应链附件表 +-- 4、供应链附件表 DROP TABLE IF EXISTS `scm_file`; CREATE TABLE `scm_file` ( diff --git a/pom.xml b/pom.xml index 8695ab88c4..a849b1f4cb 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ anrui-base anrui-scm anrui-management + anrui-fin pom