From 2d0e8544f6d0659eb8a8019811348023936284ef Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 14 Oct 2022 17:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basemodelconfig/BaseModelConfigFeign.java | 11 +-
.../BaseModelConfigFeignFallback.java | 7 +-
.../BaseManufacturerMapper.xml | 1 +
.../BaseManufacturerRest.java | 2 +-
.../basemodelconfig/BaseModelConfigMapper.xml | 2 +-
.../basemodelconfig/BaseModelConfigRest.java | 112 ++++++++++++++++++
.../ScmApplyInboundService.java | 6 +-
7 files changed, 136 insertions(+), 5 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java
index 7566ba76f9..494c4e9d83 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java
@@ -54,6 +54,16 @@ public interface BaseModelConfigFeign {
@PostMapping("/save")
public ResultBean save(@Valid @RequestBody BaseModelConfigDto dto);
+ /**
+ * 快速新增常用配置
+ *
+ * @param dto 传输对象
+ * @return
+ */
+ @ApiOperation("快速新增常用配置")
+ @PostMapping("/fastSave")
+ public ResultBean fastSave(@Valid @RequestBody BaseModelConfigDto dto);
+
/**
* 修改保存
*
@@ -128,7 +138,6 @@ public interface BaseModelConfigFeign {
/**
* 更多配置分页列表(非本公司的)
*
- * @param pagerQuery
* @return
*/
/* @ApiOperation("更多配置分页列表(非本公司的)")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java
index ad648ddf62..10b12769df 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java
@@ -22,7 +22,7 @@ import java.util.Map;
* @since 1.0
*/
@Component
-public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
+public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
@Override
@@ -35,6 +35,11 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
return ResultBean.fireFail().setMsg("接口anrui-base/basemodelconfig/save无法访问");
}
+ @Override
+ public ResultBean fastSave(BaseModelConfigDto dto) {
+ return null;
+ }
+
@Override
public ResultBean update(BaseModelConfigDto dto, String sid) {
return null;
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
index 8fc9213100..c3f828e67d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
@@ -179,6 +179,7 @@
and bmb.dueBankValue = '回款账户'
and bmb.isDelete = 0
AND bm.isDelete = 0
+ AND bmb.actualPay != ""
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
index 82a9341705..854ac57920 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
@@ -183,6 +183,118 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
return rb.success().setMsg("保存成功");
}
+ @Override
+ public ResultBean fastSave(BaseModelConfigDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String userSid = dto.getUserSid();
+ String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+ BaseModelConfig entity = new BaseModelConfig();
+ dto.fillEntity(entity);
+ String configName = "";
+ //颜色
+ if (StringUtils.isNotBlank(dto.getCarColor())) {
+ configName += dto.getCarColor() + "/";
+ }
+ //缓速器
+ if (StringUtils.isNotBlank(dto.getSlowMachine())) {
+ configName += dto.getSlowMachine() + "/";
+ }
+ //后视镜
+ if (StringUtils.isNotBlank(dto.getRearViewMirror())) {
+ configName += dto.getRearViewMirror() + "/";
+ }
+ //轮胎
+ if (StringUtils.isNotBlank(dto.getTireSize())) {
+ configName += dto.getTireSize() + "/";
+ }
+ //驾驶室规格
+ if (StringUtils.isNotBlank(dto.getSpecification())) {
+ configName += dto.getSpecification() + "/";
+ }
+ //后桥
+ if (StringUtils.isNotBlank(dto.getRearAxleValue())) {
+ configName += dto.getRearAxleValue() + "/";
+ }
+ //后桥速比
+ if (StringUtils.isNotBlank(dto.getRearAxleRatio())) {
+ configName += dto.getRearAxleRatio() + "/";
+ }
+ //空调
+ if (StringUtils.isNotBlank(dto.getAirConditioner())) {
+ configName += dto.getAirConditioner() + "/";
+ }
+ //轮毂材质
+ if (StringUtils.isNotBlank(dto.getHubMaterial())) {
+ configName += dto.getHubMaterial() + "/";
+ }
+ //导流罩
+ if (StringUtils.isNotBlank(dto.getBaffleModel())) {
+ configName += dto.getBaffleModel() + "/";
+ }
+ //悬架
+ if (StringUtils.isNotBlank(dto.getSuspension())) {
+ configName += dto.getSuspension() + "/";
+ }
+ //座椅
+ if (StringUtils.isNotBlank(dto.getSeat())) {
+ configName += dto.getSeat() + "/";
+ }
+ //护轮罩
+ if (StringUtils.isNotBlank(dto.getTireCover())) {
+ configName += dto.getTireCover() + "/";
+ }
+ //鞍座
+ if (StringUtils.isNotBlank(dto.getSaddle())) {
+ configName += dto.getSaddle() + "/";
+ }
+ //轴距
+ if (StringUtils.isNotBlank(dto.getWheelbase())) {
+ configName += dto.getWheelbase() + "/";
+ }
+ //保险杠
+ if (StringUtils.isNotBlank(dto.getBumper())) {
+ configName += dto.getBumper() + "/";
+ }
+ //配置包
+ if (StringUtils.isNotBlank(dto.getConfiguringBao())) {
+ configName += dto.getConfiguringBao() + "/";
+ }
+ //独立热源
+ if (StringUtils.isNotBlank(dto.getIndependentSources())) {
+ configName += dto.getIndependentSources() + "/";
+ }
+ //燃料箱
+ if (StringUtils.isNotBlank(dto.getFuelTank())) {
+ configName += dto.getFuelTank() + "/";
+ }
+ //多媒体
+ if (StringUtils.isNotBlank(dto.getMultimedia())) {
+ configName += dto.getMultimedia() + "/";
+ }
+ //货箱
+ if (StringUtils.isNotBlank(dto.getPackingCase())) {
+ configName += dto.getPackingCase() + "/";
+ }
+ entity.setConfigName(configName);
+ configName += dto.getOtherConfig();
+ List stringList = baseModelConfigService.checkByConfigName(sid);
+ for (String s : stringList) {
+ if (s.equals(configName)){
+ return rb.setMsg("该常用配置已存在");
+ }
+ }
+ entity.setCreateOrgSId(sid);
+ // 配置编码
+ int i1 = baseModelConfigService.selectCount();
+ String num = String.format("%04d", i1 + 1); // 不足4位补0
+ entity.setConfigCode(num);
+ boolean isSave = baseModelConfigService.save(entity);
+ if (!isSave) {
+ return rb.setMsg("保存失败");
+ }
+ return rb.success().setMsg("保存成功");
+ }
+
@Override
public ResultBean update(BaseModelConfigDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index b77ecb9f6a..14b33e19fb 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -371,10 +371,12 @@ public class ScmApplyInboundService extends MybatisBaseService 0){
scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
+ scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size()));
+ scmApplyInboundDto.setScmFiles(dto.getScmFiles());
saveOrUpdateApplyInBound(scmApplyInboundDto);
}
int i = Integer.parseInt(num) - scmApplyInboundVehicleDtos1.size();
- baseMapper.updateNumBySid(String.valueOf(i),busSid);
+ baseMapper.updateNumBySid(String.valueOf(i),businessSid);
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setOrgSidPath(orgSidPath);
@@ -427,6 +429,7 @@ public class ScmApplyInboundService extends MybatisBaseService resultBean1 = flowableFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
@@ -434,6 +437,7 @@ public class ScmApplyInboundService extends MybatisBaseService