diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index 51b3f91b69..b9b4248be9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.busvehicleapply; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto; +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java index 4e5eac91bd..eda3859918 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java @@ -1,13 +1,12 @@ package com.yxt.anrui.base.api.busvehicleapplydetail; +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Pattern; - /** * Project: anrui-scm(进销存)
* File: BusVehicleApplyDetailDto.java
@@ -51,4 +50,6 @@ public class BusVehicleApplyDetailDto implements Dto { private String insideCode; @ApiModelProperty(value = "厂家合同价") private String contractPrice; + + private BusVehicleApplySzDto busVehicleApplySz; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java index 5392e968ee..b3a591f270 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.busvehicleapplydetail; +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -48,4 +49,7 @@ public class BusVehicleApplyDetailVo implements Vo { private String insideCode; @ApiModelProperty(value = "厂家合同价") private String contractPrice; + + @ApiModelProperty + private BusVehicleApplySzVo busVehicleApplySz; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySz.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySz.java new file mode 100644 index 0000000000..b60ae9e83e --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySz.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.base.api.busvehicleapplysz; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/25 9:06 + * @Description + */ +@Data +public class BusVehicleApplySz extends BaseEntity { + private static final long serialVersionUID = -7587424900247339685L; + @ApiModelProperty(value = "上装sid") + private String szSid; + @ApiModelProperty(value = "排产车型sid") + private String detailsSid; + @ApiModelProperty(value = "厂家结算价") + private Integer costPrice; + + @ApiModelProperty(value = "销售指导价") + private String guidePrice; + + @ApiModelProperty(value = "排产申请sid") + private String applySid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzDto.java new file mode 100644 index 0000000000..02598cc21d --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzDto.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.busvehicleapplysz; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/25 9:15 + * @Description + */ +@Data +public class BusVehicleApplySzDto implements Dto { + private static final long serialVersionUID = 6049062827845457997L; + @ApiModelProperty(value = "上装配置sid") + private String szSid; + @ApiModelProperty(value = "厂家结算价") + private Integer costPrice; + @ApiModelProperty(value = "销售指导价") + private Integer guidePrice; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java new file mode 100644 index 0000000000..9027a2d955 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.base.api.busvehicleapplysz; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/25 9:53 + * @Description + */ +@Data +public class BusVehicleApplySzVo implements Vo { + private static final long serialVersionUID = 8279766010467092112L; + @ApiModelProperty(value = "车辆功能") + private String vehicleFunction; + @ApiModelProperty(value = "上装名称") + private String topName; + @ApiModelProperty(value = "委改方式") + private String refitMethod; + @ApiModelProperty(value = "委改厂") + private String refitFactory; + @ApiModelProperty(value = "外廓尺寸") + private String overallDimension; + // @ApiModelProperty(value = "颜色") + @ApiModelProperty(value = "板材材质") + private String plateMaterial; + @ApiModelProperty(value = "板材厚度") + private String plateThickness; + // @ApiModelProperty(value = "篷布滑道") +// @ApiModelProperty(value = "冷藏冷机") +// @ApiModelProperty(value = "自卸液压盖板") +// @ApiModelProperty(value = "底板加热") + @ApiModelProperty(value = "更多配置") + private String otherConfig; + + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 46ef86cf88..d88a468149 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -15,10 +15,12 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.SubmitBusVehicleApplyDto; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; +import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; @@ -87,6 +89,8 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList(); for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) { BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail(); BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid"); busVehicleApplyDetail.setApplySid(dto.getSid()); -// NumberFormat numberFormat2 = NumberFormat.getNumberInstance(); -// numberFormat2.setGroupingUsed(false); if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) { i = i + Integer.valueOf(busVehicleApplyDetailDto.getApplyForDeposit()).intValue(); } busVehicleApplyDetailService.insert(busVehicleApplyDetail); + if (busVehicleApplyDetailDto.getBusVehicleApplySz() != null) { + BusVehicleApplySz busVehicleApplySz = new BusVehicleApplySz(); + BeanUtil.copyProperties(busVehicleApplyDetailDto.getBusVehicleApplySz(), busVehicleApplySz); + busVehicleApplySz.setDetailsSid(busVehicleApplyDetail.getSid()); + busVehicleApplySz.setApplySid(dto.getSid()); + busVehicleApplySzService.insert(busVehicleApplySz); + } } if (i != Integer.valueOf(dto.getCurrentAmount()).intValue()) { return rb.setMsg("申请订金合计计算错误"); @@ -436,7 +454,7 @@ public class BusVehicleApplyService extends MybatisBaseService busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid); busApplyVo.removeAll(Collections.singleton(null)); - if(!busApplyVo.isEmpty()){ + if (!busApplyVo.isEmpty()) { finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum()); finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName()); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java index 41a03257ef..27be7323b1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java @@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BusVehicleOrderCountQuery; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleapplydetail.*; +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzVo; import com.yxt.anrui.base.api.busvehicleorder.OrderListVo; +import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService; 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.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -35,6 +38,10 @@ import java.util.List; */ @Service public class BusVehicleApplyDetailService extends MybatisBaseService { + + @Autowired + private BusVehicleApplySzService busVehicleApplySzService; + public PagerVo listPage(PagerQuery pq) { BusVehicleApplyDetailQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -133,7 +140,8 @@ public class BusVehicleApplyDetailService extends MybatisBaseService { + + void deleteByApplySid(String applyModelSid); + + BusVehicleApplySzVo selectByDetails(String sid); +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml new file mode 100644 index 0000000000..6c855b0b39 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml @@ -0,0 +1,25 @@ + + + + + delete + from bus_vehicle_apply_sz + where applySid = #{applyModelSid} + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzService.java new file mode 100644 index 0000000000..e208ac54b7 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzService.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.biz.busvehicleapplysz; + +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz; +import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzVo; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @Author dimengzhe + * @Date 2022/7/25 9:19 + * @Description + */ +@Service +public class BusVehicleApplySzService extends MybatisBaseService { + + + public void deleteByApplySid(String applyModelSid) { + baseMapper.deleteByApplySid(applyModelSid); + } + + public BusVehicleApplySzVo selectByDetails(String sid) { + return baseMapper.selectByDetails(sid); + } +} diff --git a/doc/databases/base_tables.sql b/doc/databases/base_tables.sql index 436c452259..926cd3aa23 100644 --- a/doc/databases/base_tables.sql +++ b/doc/databases/base_tables.sql @@ -841,6 +841,30 @@ CREATE TABLE `base_middleman` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='中介人员'; +-- 排产上装 +DROP TABLE IF EXISTS `bus_vehicle_apply_sz`; +CREATE TABLE `bus_vehicle_apply_sz` +( + `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', + `szSid` varchar(64) DEFAULT NULL COMMENT '上装sid', + `detailsSid` varchar(64) DEFAULT NULL COMMENT '排产车型sid', + `costPrice` int(64) DEFAULT NULL COMMENT '厂家结算价', + `guidePrice` int(64) DEFAULT NULL COMMENT '销售指导价', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='排产上装'; +