优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyPushDto.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.base.api.busvehicleapply;
+
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusApplyDetailsPushDto;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/3
+ **/
+@Data
+public class BusApplyPushDto implements Dto {
+    private static final long serialVersionUID = -2239338527888329767L;
+
+    @ApiModelProperty("申请人sid")
+    private String createBySid;
+    @ApiModelProperty("申请日期")
+    private String applicationDate;
+    @ApiModelProperty("申请人姓名")
+    private String createByName;
+    @ApiModelProperty("采购原因:储备/临时/厂家任务")
+    private String schedulingType;
+    @ApiModelProperty(value = "采购原因key")
+    private String schedulingTypeKey;
+    @ApiModelProperty("车辆排产申请详情")
+    private List<BusApplyDetailsPushDto> busVehicleApplyDetailList;
+
+    @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有")
+    private String salesSid;
+
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
+    @ApiModelProperty(value = "分公司名称")
+    private String createOrgName;
+
+    @ApiModelProperty("采购类型key")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
+
+    @ApiModelProperty("采购部门名称")
+    private String orgDeptName;
+    @ApiModelProperty("采购部门sid")
+    private String orgDeptSid;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
+
+    @ApiModelProperty("全组织路径sid")
+    private String orgSidPath;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusApplyDetailsPushDto.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.base.api.busvehicleapplydetail;
+
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzDto;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzPushDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/3
+ **/
+@Data
+public class BusApplyDetailsPushDto implements Dto {
+    private static final long serialVersionUID = 6075692277267735345L;
+
+    @ApiModelProperty("车型sid")
+    private String vehicleSid;
+    @ApiModelProperty("车型名称")
+    private String vehicleName;
+    @ApiModelProperty("排产数量")
+    private String quantity;
+
+    @ApiModelProperty("常用配置sid")
+    private String configSid;
+    @ApiModelProperty("常用配置名称")
+    private String configName;
+
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+
+    private BusVehicleApplySzPushDto busVehicleApplySzPushDto;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzPushDto.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.base.api.busvehicleapplysz;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/3
+ **/
+@Data
+public class BusVehicleApplySzPushDto implements Dto {
+
+    private static final long serialVersionUID = 3768658685711571725L;
+    @ApiModelProperty(value = "上装配置sid")
+    private String szSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.common.core.vo.Vo;
@@ -19,4 +20,6 @@ public class BusSalesOrdersVo implements Vo {
     private BusSalesOrderModel busSalesOrderModel;
 
     private BusSalesOrderPrice busSalesOrderPrice;
+
+    private BusSalesOrderMakeup busSalesOrderMakeup;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java

@@ -111,4 +111,6 @@ public class BusSalesOrderMakeup extends BaseEntity {
     @ApiModelProperty("0主车带，1不是主车带")
     private int isMain;
 
+    private String topSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java

@@ -74,4 +74,6 @@ public class AppBusSalesOrderMakeUpDto implements Dto {
     private String buyTypeKey;
     private String buyTypeValue;
 
+    private String topSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java

@@ -77,4 +77,6 @@ public class AppBusSalesOrderMakeUpVo implements Vo {
 
     private String buyTypeKey;
     private String buyTypeValue;
+
+    private String topSid;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -88,4 +88,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
     BusSalesOrderMakeup detailsss(String sid);
 
     List<BusSalesOrderMakeup> selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid);
+
+    BusSalesOrderMakeup selectBySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -55,7 +55,8 @@
                bm.thicknessBottom,
                bm.thicknessEdge,
                bm.buyTypeKey,
-               bm.buyTypeValue
+               bm.buyTypeValue,
+               bm.topSid
         from bus_sales_order_makeup bm
                  left join bus_sales_order b on bm.salesOrderSid = b.sid
         where salesOrderSid = #{sid}
@@ -104,4 +105,8 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
         select * from bus_sales_order_makeup where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectBySid" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
+        select * from bus_sales_order_makeup where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -130,6 +130,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             if("02".equals(busSalesOrderMakeup.getBuyTypeKey())){
                 //如果为客户自购，将上装价格设置为0
                 busSalesOrderMakeup.setTopPrice(BigDecimal.ZERO);
+            }else{
+                busSalesOrderMakeup.setTopSid(dto.getTopSid());
             }
             if (!dto.getContractImages().isEmpty()) {
                 List<String> imgList = new ArrayList<>();
@@ -263,4 +265,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public List<BusSalesOrderMakeup> selectListByOrderSid(String saleOrderSid) {
         return baseMapper.selectListByOrderSid(saleOrderSid);
     }
+
+    public BusSalesOrderMakeup selectBySid(String sid) {
+        return baseMapper.selectBySid(sid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java

@@ -87,4 +87,7 @@ public class TopDto implements Dto {
     @JsonProperty("payType")
     private String buyTypeValue;
 
+    @ApiModelProperty("上装sid")
+    private String topSid;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java

@@ -75,4 +75,6 @@ public class TopVo implements Vo {
     private String buyTypeKey;
     @JsonProperty("payType")
     private String buyTypeValue;
+
+    private String topSid;
 }