diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index eafbbec01f..135d393575 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -84,6 +84,8 @@ public class BaseVehicleOutApplyVoNew implements Vo { private String materialName; @ApiModelProperty("物料编码") private String materialCode; + @ApiModelProperty("物料sid") + private String materialSid; @ApiModelProperty("赠品价值") private String giftsDescription; @ApiModelProperty("销售折让") @@ -98,7 +100,12 @@ public class BaseVehicleOutApplyVoNew implements Vo { private String rebateMoneyTwo; @ApiModelProperty("内部引荐人姓名") private String innerName; - - - + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String modelConfigSid; + @ApiModelProperty("车型与配置关联sid") + private String vehModelConfigSid; + @ApiModelProperty("车型配置简称") + private String modelName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java index 76d1f5b353..3ad0c035c6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java @@ -76,23 +76,18 @@ public class BaseVehinstallmodelDto implements Dto { @ApiModelProperty("颜色value") private String colorValue; // 颜色value @ApiModelProperty("外廓尺寸_长") - @NotBlank(message = "外廓尺寸长不能为空") private String wk_long; // 外廓尺寸_长 @ApiModelProperty("外廓尺寸_宽") - @NotBlank(message = "外廓尺寸宽不能为空") private String wk_wide; // 外廓尺寸_宽 @ApiModelProperty("外廓尺寸_高") - @NotBlank(message = "外廓尺寸高不能为空") private String wk_high; // 外廓尺寸_高 @ApiModelProperty("板材材质key") private String plateMaterialKey; // 板材材质key @ApiModelProperty("板材材质value") private String plateMaterialValue; // 板材材质value @ApiModelProperty("板材厚度_底") - @NotBlank(message = "板材厚度底不能为空") private String plateThicknessBottom; // 板材厚度_底 @ApiModelProperty("板材厚度_边") - @NotBlank(message = "板材厚度边不能为空") private String plateThicknessEdge; // 板材厚度_边 @ApiModelProperty("篷布滑道key") private String tarpaulinSlideKey; // 篷布滑道key diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java index eba8c1f88f..13e8c928b4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java @@ -55,6 +55,8 @@ public class BaseVehinstallmodelVo implements Vo { @ApiModelProperty("车辆功能value") private String vehicleTypeValue; // 车辆功能value + @ApiModelProperty("上装名称key") + private String installNameKey; // 上装名称key @ApiModelProperty("上装名称value") private String installNameValue; // 上装名称value @ApiModelProperty("委改方式value") @@ -91,4 +93,8 @@ public class BaseVehinstallmodelVo implements Vo { private String floorHeating; // 底板加热 @ApiModelProperty("更多配置") private String moreConfig; // 更多配置 + @ApiModelProperty("冷机品牌") + private String coolerBrand; + @ApiModelProperty("冷机型号") + private String coolerModel; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index 09d18b2094..fb3b8507a5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -119,7 +119,9 @@ public class BaseVehicleOutApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java index 3fab2652e5..8ce146c4c5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java @@ -78,20 +78,22 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign { String wk_high = dto.getWk_high(); String plateThicknessBottom = dto.getPlateThicknessBottom(); String plateThicknessEdge = dto.getPlateThicknessEdge(); - if (StringUtils.isBlank(wk_long)){ - return rb.setMsg("外廓尺寸长不能为空"); - } - if (StringUtils.isBlank(wk_wide)){ - return rb.setMsg("外廓尺寸宽不能为空"); - } - if (StringUtils.isBlank(wk_high)){ - return rb.setMsg("外廓尺寸高不能为空"); - } - if (StringUtils.isBlank(plateThicknessBottom)){ - return rb.setMsg("板材厚度底不能为空"); - } - if (StringUtils.isBlank(plateThicknessEdge)){ - return rb.setMsg("板材厚度边不能为空"); + if (!"08".equals(dto.getInstallNameKey())){ + if (StringUtils.isBlank(wk_long)){ + return rb.setMsg("外廓尺寸长不能为空"); + } + if (StringUtils.isBlank(wk_wide)){ + return rb.setMsg("外廓尺寸宽不能为空"); + } + if (StringUtils.isBlank(wk_high)){ + return rb.setMsg("外廓尺寸高不能为空"); + } + if (StringUtils.isBlank(plateThicknessBottom)){ + return rb.setMsg("板材厚度底不能为空"); + } + if (StringUtils.isBlank(plateThicknessEdge)){ + return rb.setMsg("板材厚度边不能为空"); + } } baseVehinstallmodelService.saveOrUpdateDto(dto); return rb.success(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java index 27f2b972be..38a7809498 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java @@ -85,13 +85,16 @@ public class BaseVehinstallmodelService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); List records = pagging.getRecords(); for (BaseVehinstallmodelVo record : records) { - String wk_long = record.getWk_long(); - String wk_wide = record.getWk_wide(); - String wk_high = record.getWk_high(); - record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm"); - String plateThicknessBottom = record.getPlateThicknessBottom(); - String plateThicknessEdge = record.getPlateThicknessEdge(); - record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm"); + String installNameKey = record.getInstallNameKey(); + if (!"08".equals(installNameKey)){ + String wk_long = record.getWk_long(); + String wk_wide = record.getWk_wide(); + String wk_high = record.getWk_high(); + record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm"); + String plateThicknessBottom = record.getPlateThicknessBottom(); + String plateThicknessEdge = record.getPlateThicknessEdge(); + record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm"); + } } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index 6a671dc9a1..805fa62282 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -151,4 +151,11 @@ public class SolutionsDetailsssVo { @ApiModelProperty("名义留购价") private String nominalPrice; + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + } 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 b854904fca..76f922df04 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 @@ -306,6 +306,8 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } List stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw); stringList.removeAll(Collections.singleton(null)); return rb.success().setData(stringList); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index dd7aeec720..1de2e7f802 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -93,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { if (list.size() > 0) { @@ -287,8 +290,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService trailerVos = traliveredVo.getList(); if (trailerVos != null && trailerVos.size() > 0) { @@ -329,6 +334,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } List list = baseMapper.getCanUseCars(qw); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -388,6 +399,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List list = pagging.getRecords(); diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/shangzhuangInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/shangzhuangInfo.vue index 2452a435d7..fe085d17eb 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/shangzhuangInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/shangzhuangInfo.vue @@ -47,63 +47,75 @@ {{ item.refitFactory }} - - -
货箱内部尺寸
- -
- 长{{ item.wk_long }}mm, - 宽{{ item.wk_wide }}mm, - 高{{ item.wk_high }}mm -
-
-
- -
颜色
- {{ item.colorValue }} -
-
- - -
板材材质
- {{ item.plateMaterialValue }} -
+ -
板材厚度
- -
- 底{{ item.plateThicknessBottom }}mm, - 边{{ item.plateThicknessEdge }}mm -
-
+
冷机品牌
+ {{ item.coolerBrand }}
-
- -
篷布滑道
- {{ item.tarpaulinSlide }} -
- -
冷藏冷机
- {{ item.refrigerator }} -
-
- - -
自卸液压盖板
- {{ item.selfUnHyCoPl }} -
- -
底板加热
- {{ item.floorHeating }} -
-
- - -
更多配置
- {{ item.moreConfig }} +
冷机型号
+ {{ item.coolerModel }}
+
+ + +
货箱内部尺寸
+ +
+ 长{{ item.wk_long }}mm, + 宽{{ item.wk_wide }}mm, + 高{{ item.wk_high }}mm +
+
+
+ +
颜色
+ {{ item.colorValue }} +
+
+ + +
板材材质
+ {{ item.plateMaterialValue }} +
+ +
板材厚度
+ +
+ 底{{ item.plateThicknessBottom }}mm, + 边{{ item.plateThicknessEdge }}mm +
+
+
+
+ + +
篷布滑道
+ {{ item.tarpaulinSlide }} +
+ +
冷藏冷机
+ {{ item.refrigerator }} +
+
+ + +
自卸液压盖板
+ {{ item.selfUnHyCoPl }} +
+ +
底板加热
+ {{ item.floorHeating }} +
+
+ + +
更多配置
+ {{ item.moreConfig }} +
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/shangzhuangInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/shangzhuangInfo.vue index 9c1a9c6d96..63848f9e51 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/shangzhuangInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/shangzhuangInfo.vue @@ -47,63 +47,75 @@ {{ item.refitFactory }}
- - -
货箱内部尺寸
- -
- 长{{ item.wk_long }}mm, - 宽{{ item.wk_wide }}mm, - 高{{ item.wk_high }}mm -
-
-
- -
颜色
- {{ item.colorValue }} -
-
- - -
板材材质
- {{ item.plateMaterialValue }} -
+ -
板材厚度
- -
- 底{{ item.plateThicknessBottom }}mm, - 边{{ item.plateThicknessEdge }}mm -
-
+
冷机品牌
+ {{ item.coolerBrand }}
-
- -
篷布滑道
- {{ item.tarpaulinSlide }} -
- -
冷藏冷机
- {{ item.refrigerator }} -
-
- - -
自卸液压盖板
- {{ item.selfUnHyCoPl }} -
- -
底板加热
- {{ item.floorHeating }} -
-
- - -
更多配置
- {{ item.moreConfig }} +
冷机型号
+ {{ item.coolerModel }}
+
+ + +
货箱内部尺寸
+ +
+ 长{{ item.wk_long }}mm, + 宽{{ item.wk_wide }}mm, + 高{{ item.wk_high }}mm +
+
+
+ +
颜色
+ {{ item.colorValue }} +
+
+ + +
板材材质
+ {{ item.plateMaterialValue }} +
+ +
板材厚度
+ +
+ 底{{ item.plateThicknessBottom }}mm, + 边{{ item.plateThicknessEdge }}mm +
+
+
+
+ + +
篷布滑道
+ {{ item.tarpaulinSlide }} +
+ +
冷藏冷机
+ {{ item.refrigerator }} +
+
+ + +
自卸液压盖板
+ {{ item.selfUnHyCoPl }} +
+ +
底板加热
+ {{ item.floorHeating }} +
+
+ + +
更多配置
+ {{ item.moreConfig }} +
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue index d00b487324..a91db864e2 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue @@ -8,8 +8,22 @@
+ + +
单车主车销售合同价
+ {{ formobj.finalPrice }} +
+ +
单车挂车销售合同价
+ {{ formobj.gcPrice }} +
+ +
单车上装销售合同价
+ {{ formobj.szPrice }} +
+
- +
是否打包
{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue index 72dd90e63f..1f39905614 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue @@ -9,8 +9,22 @@
+ + +
单车主车销售合同价
+ {{ formobj.finalPrice }} +
+ +
单车挂车销售合同价
+ {{ formobj.gcPrice }} +
+ +
单车上装销售合同价
+ {{ formobj.szPrice }} +
+
- +
是否打包
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue index 398d15fb25..7f1328c7dd 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue @@ -8,8 +8,22 @@
+ + +
单车主车销售合同价
+ {{ formobj.finalPrice }} +
+ +
单车挂车销售合同价
+ {{ formobj.gcPrice }} +
+ +
单车上装销售合同价
+ {{ formobj.szPrice }} +
+
- +
是否打包
{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue index 94322550b1..7c40f58262 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue @@ -147,10 +147,10 @@ - + - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue index 85bb32c643..53e37d1e8d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue @@ -91,6 +91,11 @@
+ + +