问题修改

3 years ago · 2d0e8544f6
7 changed files with 136 additions and 5 deletions
--- 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("更多配置分页列表(非本公司的)")
--- 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;
--- 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 != ""
    </select>

    <select id="fetchByManBankSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
@ -109,7 +109,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
        //删除厂商基础信息
        int count = baseManufacturerService.updateBySidIsDelete(sidList);
        //删除厂商开户行信息
-        int i = baseManufacturerBankService.updateBySidIsDelete(sidList);
+        int i = baseManufacturerBankService.deleteBySids(sidList);
        //删除厂商财务信息
        int x = baseManufacturerFinanceService.updateBySidIsDelete(sidList);
        if (count == 0) {
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@ -774,6 +774,6 @@
        SELECT CONCAT(configName, otherConfig) configNameOther
        FROM base_model_config
        WHERE isDelete = 0
-          AND createOrg = #{createOrgSid}
+          AND createOrgSId = #{createOrgSid}
    </select>
 </mapper>
--- 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<String> 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();
--- 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<ScmApplyInboundMa
            }
            if (scmApplyInboundVehicleDtos1.size() > 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<ScmApplyInboundMa
        bv.setInstanceId(entity.getProcInsId());
        if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
            dto.setVehicleList(scmApplyInboundVehicleDtos2);
+            dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
            saveOrUpdateApplyInBound(dto);
            ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
            UpdateFlowFieldVo uff = resultBean1.getData();
@ -434,6 +437,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
            return resultBean1;
        } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
            dto.setVehicleList(scmApplyInboundVehicleDtos2);
+            dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
            saveOrUpdateApplyInBound(dto);
            bv.setTaskDefKey(entity.getTaskDefKey());
            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");