From 1668732eafe6d45ab8e7426fe4a82d5fc07a227a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 15 Feb 2023 16:18:14 +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 --- .../base/api/baseaccadjapply/BaseAccadjApplyDto.java | 2 ++ .../BaseInternalPurchaseDto.java | 2 ++ .../BaseShuntingInvoicingApplyDto.java | 2 ++ .../anrui/base/api/basevehicle/BaseVehicleDto.java | 3 +++ .../biz/baseaccadjapply/BaseAccadjApplyService.java | 12 ++++++------ .../BaseInternalPurchaseService.java | 12 ++++++------ .../BaseShuntingInvoicingApplyService.java | 12 ++++++------ .../base/biz/basevehicle/BaseVehicleMapper.java | 4 ++-- .../anrui/base/biz/basevehicle/BaseVehicleRest.java | 2 +- .../base/biz/basevehicle/BaseVehicleService.java | 4 ++-- .../ScmVehicleEnterlibraryService.java | 2 ++ 11 files changed, 34 insertions(+), 23 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java index 136c379762..597df1b909 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java @@ -77,6 +77,8 @@ public class BaseAccadjApplyDto implements Dto { private String nodeState; // 流程状态 @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; @ApiModelProperty("申请编号") private String applyNo; // 申请编号 @ApiModelProperty("调账车辆类型sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java index d613d2f60c..93c46c60c6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java @@ -88,6 +88,8 @@ public class BaseInternalPurchaseDto implements Dto { private String callInBuyerOrgName; // 调入方采购部门名称 @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; @ApiModelProperty("内购车辆列表") private List baseInternalPurchaseVehicles; // 内购车辆列表 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java index 89af973cea..49f680f815 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java @@ -79,6 +79,8 @@ public class BaseShuntingInvoicingApplyDto implements Dto { @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; @ApiModelProperty("调车开票车辆列表") private List baseShuntingInvoicinApplyeVehs; // 调车开票车辆列表 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index cf65f4e059..050e44fb82 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -156,4 +156,7 @@ public class BaseVehicleDto implements Dto { private String inBoundSid; @ApiModelProperty(value = "外采sid") private String outSourcSid; + + @ApiModelProperty("调出分公司sid") + private String callOutOrgSid; // 调出分公司sid } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index c8631fdcfc..ff4dc94d7f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -193,9 +193,9 @@ public class BaseAccadjApplyService extends MybatisBaseService saveOrUpdateDto(BaseAccadjApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - String orgPath = ""; - if (StringUtils.isNotBlank(dto.getOrgSidPath())) { - orgPath = dto.getOrgSidPath(); + String orgSidPath = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())) { + orgSidPath = dto.getOrgPath(); } else { //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); @@ -208,13 +208,13 @@ public class BaseAccadjApplyService extends MybatisBaseService accSids = dto.getAccSids(); if (StringUtils.isBlank(dtoSid)) {//新增 dto.setApplyDate(DateUtil.today()); dto.setNodeState("待提交"); - dto.setOrgSidPath(orgPath); + dto.setOrgSidPath(orgSidPath); ResultBean resultBean = this.insertByDto(dto); String sid = (String) resultBean.getData(); for (String accSid : accSids) { @@ -229,7 +229,7 @@ public class BaseAccadjApplyService extends MybatisBaseService saveAll(BaseInternalPurchaseDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - String orgPath = ""; - if (StringUtils.isNotBlank(dto.getOrgSidPath())) { - orgPath = dto.getOrgSidPath(); + String orgSidPath = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())) { + orgSidPath = dto.getOrgPath(); } else { //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); @@ -220,7 +220,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles(); if (baseInternalPurchaseVehicles.size() < 1) { @@ -245,7 +245,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) { ResultBean rb = ResultBean.fireFail(); - String orgPath = ""; - if (StringUtils.isNotBlank(dto.getOrgSidPath())){ - orgPath = dto.getOrgSidPath(); + String orgSidPath = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())){ + orgSidPath = dto.getOrgPath(); }else { //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); @@ -147,14 +147,14 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) {//新增 dto.setApplyDate(DateUtil.today()); dto.setNodeState("待提交"); - dto.setOrgSidPath(orgPath); + dto.setOrgSidPath(orgSidPath); String s = this.insertByDto(dto); for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) { baseShuntingInvoicinApplyeVeh.setMainSid(s); @@ -166,7 +166,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService { IPage vehicleRebatePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice},salesDate = NOW() where vinNo = #{vinNo}") - void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo); + @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice},salesDate = NOW() where vinNo = #{vinNo} and createOrgSid = #{callOutOrgSid} and vehicleState != '0004'") + void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid); @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}") void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 4fdc4014ab..63e2ce25fe 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -431,7 +431,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } //调车入库生成台账 if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode())) - baseVehicleService.saveVeh_tc(baseVehicle); + baseVehicleService.saveVeh_tc(baseVehicle,baseVehicleDto.getCallOutOrgSid()); } String cgrkdSid = ""; if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 318e2bd555..767335503d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2505,14 +2505,14 @@ public class BaseVehicleService extends MybatisBaseService