Merge remote-tracking branch 'origin/master'

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")

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<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles; // 内购车辆列表
 

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<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs; // 调车开票车辆列表

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
 }

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<BaseAccadjApplyMa
     public ResultBean<String> 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<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
@@ -208,13 +208,13 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 return rb.setMsg(staffOrgResultBean.getMsg());
             }
             //用户的组织全路径
-            orgPath = staffOrgResultBean.getData().getOrgSidPath();
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
         List<String> 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<BaseAccadjApplyMa
         if (baseAccadjApply == null) {
             rb.setMsg("该调账申请不存在");
         }
-        dto.setOrgSidPath(orgPath);
+        dto.setOrgSidPath(orgSidPath);
         this.updateByDto(dto);
         baseAccadjApplyeVehService.delByMainSid(dtoSid);
         for (String accSid : accSids) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -205,9 +205,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     public ResultBean<String> 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<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
@@ -220,7 +220,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 return rb.setMsg(orgByStaffSid.getMsg());
             }
             //用户的组织全路径
-            orgPath = orgByStaffSid.getData().getOrgSidPath();
+            orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         }
         List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
         if (baseInternalPurchaseVehicles.size() < 1) {
@@ -245,7 +245,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             String billNo = getApplyCode(dto.getCreateBySid());
             baseInternalPurchase.setNodeState("待提交");
             baseInternalPurchase.setApplyNo(billNo);
-            baseInternalPurchase.setOrgSidPath(orgPath);
+            baseInternalPurchase.setOrgSidPath(orgSidPath);
             save(baseInternalPurchase);
             for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = new BaseInternalPurchaseVehicle();
@@ -269,7 +269,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         if (baseInternalPurchase == null) {
             return rb.setMsg("该内购申请单不存在");
         }
-        dto.setOrgSidPath(orgPath);
+        dto.setOrgSidPath(orgSidPath);
         updateBySid(dto.toMap(), dtoSid);
         baseInternalPurchaseVehicleService.delByMainSid(dtoSid);
         for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -132,9 +132,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
 
     public ResultBean<String> 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<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
@@ -147,14 +147,14 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
                 return rb.setMsg(staffOrgResultBean.getMsg());
             }
             //用户的组织全路径
-            orgPath = staffOrgResultBean.getData().getOrgSidPath();
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
         List<BaseShuntingInvoicinApplyeVehDto> 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<BaseSh
         if (baseShuntingInvoicingApply == null) {
             return rb.setMsg("该调车申请单不存在");
         }
-        dto.setOrgSidPath(orgPath);
+        dto.setOrgSidPath(orgSidPath);
         this.updateByDto(dto);
         baseShuntingInvoicinApplyeVehService.delByMainSid(dtoSid);
             for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -447,8 +447,8 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> 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);

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())) {

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<BaseVehicleMapper, Ba
     }
 
     //调车入库生成台账
-    public ResultBean saveVeh_tc(BaseVehicle baseVehicle) {
+    public ResultBean saveVeh_tc(BaseVehicle baseVehicle, String callOutOrgSid) {
         ResultBean rb = ResultBean.fireFail();
         if (null == baseVehicle) {
             return rb.setMsg("参数错误");
         }
 
         //调出分公司车辆台账更新库存状态和销售成交价
-        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(), VehicleState.StockEnum.DC_STOCK.getRemarks(), baseVehicle.getSalePrice(), baseVehicle.getVinNo());
+        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(), VehicleState.StockEnum.DC_STOCK.getRemarks(), baseVehicle.getSalePrice(), baseVehicle.getVinNo(), callOutOrgSid);
 
         //新建调入分公司车辆台账，设置调入分公司sid
         BaseVehicle new_baseVehicle = new BaseVehicle();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -531,6 +531,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         // 否 运费默认为 0
                         baseVehicleDto.setFreight(0);
                     }
+                    //传参调出分公司sid
+                    baseVehicleDto.setCallOutOrgSid(internalPurchaseDetailsVo.getSellerOrgSid());
                     //分公司code
                     SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(scmVehicleEnterlibrary.getUseOrgSid()).getData();
                     baseVehicleDto.setOrgCode(sysOrganizationVo1.getOrgCode());