From cef8d6c252cadc189dbf2ff235f1fc071757b0bd Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 2 Aug 2022 10:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=BD=A6=E5=92=8C?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=8E=A8=E9=80=81=E8=BD=A6=E8=BE=86=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=8E=A5=E5=8F=A3,=E9=AA=8C=E8=BD=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInternalPurchaseService.java | 1 + .../BaseOutsourcingApplicationService.java | 2 ++ ...mVehicleEnterlibraryCarWarehousingDto.java | 9 +++++++ .../ScmVehicleEnterlibrary.java | 8 ++++++ .../ScmEntryVehicleExamineDto.java | 2 ++ .../scmvehicleexamine/ScmVehicleExamine.java | 2 ++ .../ScmApplyInboundService.java | 1 + .../ScmVehicleEnterlibraryService.java | 25 ++++++++++++------- .../ScmVehicleExamineService.java | 4 +++ .../ScmVehinspectItemService.java | 24 ++++++++++-------- 10 files changed, 58 insertions(+), 20 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 1ba41cca3b..7f6c729f64 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -405,6 +405,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(bv.getBusinessSid()); for (BaseInternalPurchaseVehicleVo booad : baseInternalPurchaseVehicleVos) { ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto(); + scmEntryVehicleExamineDto.setBusinessSid(booad.getMainSid()); //配置的名称 scmEntryVehicleExamineDto.setConfigName(booad.getConfigName()); scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 7b2a5e49f5..f8bd827fad 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -451,6 +451,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(bv.getBusinessSid()); for (BaseOutsourcingApplicationVehicleVo baseOutsourcingApplicationVehicleVo : baseOutsourcingApplicationVehicleVos) { ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto(); + //外采sid + scmEntryVehicleExamineDto.setBusinessSid(baseOutsourcingApplicationVehicleVo.getOutAppSid()); //配置的名称 scmEntryVehicleExamineDto.setConfigName(booad.getConfigName()); scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid()); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java index 88eacdc94a..6c196c5647 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java @@ -92,4 +92,13 @@ public class AppScmVehicleEnterlibraryCarWarehousingDto implements Dto { @ApiModelProperty("分公司名称") private String useOrgName; + + @ApiModelProperty("业务sid") + private String businessSid; + + @ApiModelProperty("保修卡号") + private String warrantyCardNo; + + @ApiModelProperty("特殊或差异说明") + private String specialInstructions; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java index 006ca54df6..3f8652001f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java @@ -78,6 +78,8 @@ public class ScmVehicleEnterlibrary extends BaseEntity { private String inbound; // 入库人 @ApiModelProperty("存放地点") private String location; // 存放地点 + @ApiModelProperty("存放地点") + private String locationSid ; @ApiModelProperty("仓库管理员") private String storekeeper; // 仓库管理员 @ApiModelProperty("地址") @@ -90,5 +92,11 @@ public class ScmVehicleEnterlibrary extends BaseEntity { private String useOrgSid; @ApiModelProperty("分公司名称") private String useOrgName; + @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("保修卡号") + private String warrantyCardNo; + @ApiModelProperty("特殊或差异说明") + private String specialInstructions; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java index 8fd8f639d1..d41ab8d52d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java @@ -38,4 +38,6 @@ public class ScmEntryVehicleExamineDto implements Dto { @ApiModelProperty("验车状态（已验车，未验车）") private String inspectionResult; // 验车状态（已验车，未验车） + @ApiModelProperty("外采 排产 调车 sid") + private String businessSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java index 985542bca1..2af2b5e37f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java @@ -96,5 +96,7 @@ public class ScmVehicleExamine extends BaseEntity { private String guaranteeCardNo; // 保修卡卡号 @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）") private int saveStatus; + @ApiModelProperty("外采 排产 调车 sid") + private String businessSid; } 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 e7f71aa6e9..68727c5ee1 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 @@ -421,6 +421,7 @@ public class ScmApplyInboundService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -273,6 +278,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService list = new ArrayList<>(); list.add(baseVehicleDto); baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode()); } - if (ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())){ + if (ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) { BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin()); baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 573d7afff0..90ab044ce0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -476,6 +476,10 @@ public class ScmVehicleExamineService extends MybatisBaseService scmResultImageDtos = dto.getScmResultImageDtos(); for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) { - result = scmResultImageDto.getResult(); - baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult()); - + Integer result = scmResultImageDto.getResult(); + if (result == 0) { + if (StringUtils.isBlank(scmResultImageDto.getRemarks())) { + return rb.setMsg("备注不能为空"); + } + } List itemImgVoList = scmResultImageDto.getItemImgVoList(); - for (ScmVehinspectItemimgDto scmVehinspectItemimgDto : itemImgVoList) { String mainSid = scmVehinspectItemimgDto.getMainSid(); if (result == 0) { ScmVehinspectItemimg scmVehinspectItemimg = scmVehinspectItemimgService.fetchBySid(mainSid); - if (StringUtils.isBlank(scmResultImageDto.getRemarks())) { - return rb.setMsg("备注不能为空哦"); - } if (scmVehinspectItemimg != null) { List imgUrlList = scmVehinspectItemimgDto.getImgUrlList(); - if (imgUrlList.size() <= 0) { - return rb.setMsg("图片不能为空哦"); + if (imgUrlList.size() == 0) { + return rb.setMsg("图片不能为空"); } } } @@ -137,6 +136,7 @@ public class ScmVehinspectItemService extends MybatisBaseService