diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyPushDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyPushDto.java new file mode 100644 index 0000000000..d93c1fe861 --- /dev/null +++ b/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 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; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusApplyDetailsPushDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusApplyDetailsPushDto.java new file mode 100644 index 0000000000..97bcd4fd6a --- /dev/null +++ b/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; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzPushDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzPushDto.java new file mode 100644 index 0000000000..0b5edc8dcb --- /dev/null +++ b/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; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java index 12afaf79c0..d2994b424b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java index 2bdc0a3b0c..8813146005 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java +++ b/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; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java index 6fd3bb36a0..bdae8c0c72 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java +++ b/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; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java index ae17fd1d18..19eb0d158a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java index f5c529afb8..48f78cca12 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java +++ b/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 selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid); + + BusSalesOrderMakeup selectBySid(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index 6aab2d55bf..8056c14603 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/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} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index bc14c53ad9..1bfa7ad97b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/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 imgList = new ArrayList<>(); @@ -263,4 +265,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService selectListByOrderSid(String saleOrderSid) { return baseMapper.selectListByOrderSid(saleOrderSid); } + + public BusSalesOrderMakeup selectBySid(String sid) { + return baseMapper.selectBySid(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/topinfo/TopDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java index ca10503240..fbb018ef19 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java +++ b/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; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java index 30044830f5..98c7c2b881 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java +++ b/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; }