排产上装

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;

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(进销存) <br/>
  * File: BusVehicleApplyDetailDto.java <br/>
@@ -51,4 +50,6 @@ public class BusVehicleApplyDetailDto implements Dto {
     private String insideCode;
     @ApiModelProperty(value = "厂家合同价")
     private String contractPrice;
+
+    private BusVehicleApplySzDto busVehicleApplySz;
 }

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;
 }

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;
+}

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;
+}

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;
+
+
+}

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<BusVehicleApplyMa
     private BaseVehicleModelService baseVehicleModelService;
     @Autowired
     private BaseManufacturerBankService baseManufacturerBankService;
+    @Autowired
+    private BusVehicleApplySzService busVehicleApplySzService;
 
     /**
      * 分页列表
@@ -188,7 +192,15 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     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(entity.getSid());
+                    busVehicleApplySzService.insert(busVehicleApplySz);
+                }
             }
+
             if (i != Integer.valueOf(dto.getCurrentAmount()).intValue()) {
                 return rb.setMsg("申请订金合计计算错误");
             }
@@ -202,18 +214,24 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             BeanUtil.copyProperties(dto, busVehicleApply);
             busVehicleApplyDetailService.delByApplySid(dto.getSid());
+            busVehicleApplySzService.deleteByApplySid(dto.getSid());
             int i = 0;
             List<BusVehicleApplyDetailDto> 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<BusVehicleApplyMa
                 //根据车型sid查询账户名称和银行账号
                 List<BusApplyVo> 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());
                 }

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<BusVehicleApplyDetailMapper, BusVehicleApplyDetail> {
+
+    @Autowired
+    private BusVehicleApplySzService busVehicleApplySzService;
+
     public PagerVo<BusVehicleApplyDetail> listPage(PagerQuery<BusVehicleApplyDetailQuery> pq) {
         BusVehicleApplyDetailQuery query = pq.getParams();
         QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
@@ -133,7 +140,8 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
 //                    vo.setContractPrice(DecimalFormat.getNumberInstance().format(Integer.valueOf(vo.getContractPrice()).intValue()));
                     vo.setContractPrice(vo.getContractPrice());
                 }
-
+                BusVehicleApplySzVo busVehicleApplySz = busVehicleApplySzService.selectByDetails(vo.getSid());
+                vo.setBusVehicleApplySz(busVehicleApplySz);
             }
         }
         return busVehicleApplyDetailVos;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.biz.busvehicleapplysz;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/25 9:19
+ * @Description
+ */
+@Mapper
+public interface BusVehicleApplySzMapper extends BaseMapper<BusVehicleApplySz> {
+
+    void deleteByApplySid(String applyModelSid);
+
+    BusVehicleApplySzVo selectByDetails(String sid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzMapper">
+    <delete id="deleteByApplySid">
+        delete
+        from bus_vehicle_apply_sz
+        where applySid = #{applyModelSid}
+    </delete>
+
+    <select id="selectByDetails" resultType="com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzVo">
+        select sz.vehicleFunction,
+               sz.topName,
+               sz.refitMethod,
+               sz.refitFactory,
+               sz.overallDimension,
+               sz.plateMaterial,
+               sz.plateThickness,
+               sz.otherConfig,
+               bva.guidePrice,
+               bva.costPrice
+        from bus_vehicle_apply_sz bva
+                 left join base_model_szconfig sz on sz.sid = bva.szSid
+        where bva.detailsSid = #{sid}
+    </select>
+</mapper>

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<BusVehicleApplySzMapper, BusVehicleApplySz> {
+
+
+    public void deleteByApplySid(String applyModelSid) {
+        baseMapper.deleteByApplySid(applyModelSid);
+    }
+
+    public BusVehicleApplySzVo selectByDetails(String sid) {
+        return baseMapper.selectByDetails(sid);
+    }
+}

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 ='排产上装';
+