问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@@ -86,4 +86,9 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
     private String isInvoicing; // 是否开票（0未开票，1已开票）
     @ApiModelProperty("销售指导价")
     private BigDecimal guidedPrice; // 销售指导价
+    @ApiModelProperty("调回状态key")
+    private String recallStateKey; // 调回状态key
+    @ApiModelProperty("调回状态value")
+    private String recallStateValue; // 调回状态value
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -99,4 +99,8 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String guidedPrice; // 销售指导价
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("调回状态key")
+    private String recallStateKey; // 调回状态key
+    @ApiModelProperty("调回状态value")
+    private String recallStateValue; // 调回状态value
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -87,4 +87,8 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String isInvoicing; // 是否开票（0未开票，1已开票）
     @ApiModelProperty("销售指导价")
     private String guidedPrice; // 销售指导价
+    @ApiModelProperty("调回状态key")
+    private String recallStateKey; // 调回状态key
+    @ApiModelProperty("调回状态value")
+    private String recallStateValue; // 调回状态value
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java

@@ -89,4 +89,8 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String isInvoicing; // 是否开票（0未开票，1已开票）
     @ApiModelProperty("销售指导价")
     private String guidedPrice; // 销售指导价
+    @ApiModelProperty("调回状态key")
+    private String recallStateKey; // 调回状态key
+    @ApiModelProperty("调回状态value")
+    private String recallStateValue; // 调回状态value
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -113,4 +113,6 @@ public class BaseOutsourcingApplication extends BaseEntity {
     private String remarks; // 备注
     @ApiModelProperty("内部编码")
     private String insideCode; // 内部编码
+    @ApiModelProperty("是否先付款")
+    private String isBeforePayment; // 是否先付款
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -112,6 +112,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("内部编码")
     private String insideCode; // 内部编码
+    @ApiModelProperty("是否先付款")
+    private String isBeforePayment; // 是否先付款
     @ApiModelProperty("合同附件")
     private CommonAppendixVo contract; // 备注
     @ApiModelProperty("外采车辆列表")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -124,6 +124,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	private String remarks; // 备注
 	@ApiModelProperty("内部编码")
 	private String insideCode; // 内部编码
+	@ApiModelProperty("是否先付款")
+	private String isBeforePayment; // 是否先付款
 	@ApiModelProperty("外采车辆列表")
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 	@ApiModelProperty("合同附件信息")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/ManPurOrderType.java

@@ -80,4 +80,39 @@ public class ManPurOrderType {
             this.remarks = remarks;
         }
     }
+
+    /**
+     * 款项名称枚举
+     */
+    @Getter
+    public static enum CostTitle {
+        /**
+         * 车款
+         */
+        CK_COSTTITLE("001", "车款"),
+        /**
+         * 订金
+         */
+        DJ_COSTTITLE("002", "订金");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private CostTitle(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java

@@ -189,4 +189,40 @@ public class VehicleState {
         }
 
     }
+
+    @Getter
+    public static enum RecallState {
+        /**
+         * 未调回
+         */
+        UN_RECALL("001", "未调回"),
+        /**
+         * 调出中
+         */
+        DCZ_RECALL("002", "调出中"),
+        /**
+         * 已调回
+         */
+        RECALL("003", "已调回");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private RecallState(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@@ -31,8 +31,6 @@
         base_internal_purchase_vehicle bipv
         LEFT JOIN base_internal_purchase bip
         ON bipv.`mainSid` = bip.`sid`
-        LEFT JOIN base_vehicle bv
-        ON bv.`vinNo` = bipv.`vinNo` AND bip.`createOrgSid` = bv.`createOrgSid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -228,7 +228,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             qw.notIn("bipv.sid", query.getSids());
         }
         qw.eq("bip.nodeState","已办结");
-        qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.DH_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()));
+        qw.and(wrapper -> wrapper.ne("bipv.recallStateKey", VehicleState.RecallState.RECALL.getCode()).or().ne("bipv.recallStateKey", VehicleState.RecallState.DCZ_RECALL.getCode()));
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
         IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
         PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);
@@ -251,6 +251,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
 
     public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        List<String> purchaseSids = dto.getAccSids();
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
         if (!userVoResultBean.getSuccess()) {
@@ -299,6 +300,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            for (String purchaseSid : purchaseSids) {
+                baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid,"2");
+            }
             return voResultBean;
         }
         if (r == 2) {
@@ -356,12 +360,18 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
+        List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (String purchaseSid : purchaseSids) {
+                    baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid,"1");
+                }
+            }
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
@@ -547,6 +557,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             return rb.setMsg("参数错误：userSid");
         }
         BaseAccadjApply baseAccadjApply = fetchBySid(query.getBusinessSid());
+        List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
         String businessTaskId = baseAccadjApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (businessTaskId.equals(query.getTaskId())) {
@@ -558,6 +569,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                for (String purchaseSid : purchaseSids) {
+                    baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid,"0");
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }

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

@@ -232,6 +232,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 baseInternalPurchaseVehicle1.setSid(sid1);
                 baseInternalPurchaseVehicle1.setMainSid(sid);
                 baseInternalPurchaseVehicle1.setModelSid(baseInternalPurchaseVehicle.getVehicleSid());
+                baseInternalPurchaseVehicle1.setRecallStateKey(VehicleState.RecallState.UN_RECALL.getCode());
+                baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
                 baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
             }
             return rb.success().setMsg("保存成功").setData(baseInternalPurchase.getSid());
@@ -337,8 +339,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicleDto : baseInternalPurchaseVehicles) {
                     BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleDto.getVinNo());
                     baseVehicle.setVinNo(baseInternalPurchaseVehicleDto.getVinNo());
-                    baseVehicle.setWitPinState(VehicleState.ShuntingEnum.IN_SHUNTING.getCode());
-                    baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.IN_SHUNTING.getRemarks());
+                    baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
+                    baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
                     baseVehicleService.updateVeh(baseVehicle);
                 }
             }
@@ -703,8 +705,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
                         BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseInternalPurchaseVehicleVo.getVinNo());
                         baseVehicle.setVinNo(baseInternalPurchaseVehicleVo.getVinNo());
-                        baseVehicle.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
-                        baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
+                        baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
+                        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
                         baseVehicleService.updateVeh(baseVehicle);
                     }
                 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java

@@ -72,4 +72,7 @@ public interface BaseInternalPurchaseVehicleMapper extends BaseMapper<BaseIntern
 
 	@Update("update base_internal_purchase_vehicle set guidedPrice = #{guidedPrice} where sid = #{sid}")
     int updateGuidedPriceBySid(@Param("sid") String sid,@Param("guidedPrice") String guidedPrice);
+
+	@Update("update base_internal_purchase_vehicle set isAccadj = #{isAccadj} where sid = #{purchaseSid}")
+    void updateIsAccadj(@Param("isAccadj") String isAccadj,@Param("purchaseSid") String purchaseSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java

@@ -123,4 +123,8 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService<BaseI
 	public int updateGuidedPriceBySid(String sid, String guidedPrice) {
 		return baseMapper.updateGuidedPriceBySid(sid,guidedPrice);
 	}
+
+	public void updateIsAccadj(String purchaseSid,String isAccadj) {
+		baseMapper.updateIsAccadj(purchaseSid,isAccadj);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -445,10 +445,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(stringObjectMap);
             if ("Event_end".equals(taskDefKey)) {
                 BigDecimal deposit = booad.getDeposit();
-                if (deposit != null) {
-                    if (deposit.doubleValue() > 0) {
-                        // 推送 传达款的数据
-                        ThreadUtil.execute(() -> sendFinPaymentrecord(bv, booad));
+                if (booad.getIsBeforePayment().equals("是")) {
+                    ThreadUtil.execute(() -> sendFinPaymentrecord(bv, booad, ManPurOrderType.CostTitle.CK_COSTTITLE.getCode(), ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks()));
+                } else {
+                    if (deposit != null) {
+                        if (deposit.doubleValue() > 0) {
+                            // 推送 传达款的数据
+                            ThreadUtil.execute(() -> sendFinPaymentrecord(bv, booad, ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode(), ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks()));
+                        }
                     }
                 }
                 for (int i = 0; i < booad.getNum(); i++) {
@@ -515,7 +519,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
      * @param bv
      * @param booad
      */
-    public void sendFinPaymentrecord(BusinessVariables bv, BaseOutsourcingApplication booad) {
+    public void sendFinPaymentrecord(BusinessVariables bv, BaseOutsourcingApplication booad, String costTitleKey, String costTitleValue) {
         FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
         finPaymentrecordDto.setApplySid(bv.getBusinessSid());
         //付款单位sid
@@ -525,9 +529,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         finPaymentrecordDto.setCreateOrgSid(booad.getUseOrgSid());
         finPaymentrecordDto.setUseOrgSid(booad.getUseOrgSid());
         //款项名称，数据字典
-        finPaymentrecordDto.setCostTitleKey("2");
+        finPaymentrecordDto.setCostTitleKey(costTitleKey);
         //款项名称，数据字典
-        finPaymentrecordDto.setCostTitleValue("订金");
+        finPaymentrecordDto.setCostTitleValue(costTitleValue);
         //款项类别  外采
         finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());
         //款项类别
@@ -537,9 +541,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         //收款银行账号
         finPaymentrecordDto.setReceiveBankAccount(booad.getBankAccount());
         //金额
-        finPaymentrecordDto.setCost(booad.getDeposit().intValue());
-        //业务编号
-        finPaymentrecordDto.setBusSid("");
+        if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
+            finPaymentrecordDto.setCost(booad.getPurchasePrice().intValue());
+        } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
+            finPaymentrecordDto.setCost(booad.getDeposit().intValue());
+        }
         finPaymentrecordFeign.save(finPaymentrecordDto);
     }
 

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

@@ -25,8 +25,6 @@
 		base_internal_purchase_vehicle bipv
 		LEFT JOIN base_internal_purchase bip
 		ON bipv.`mainSid` = bip.`sid`
-		LEFT JOIN base_vehicle bv
-		ON bv.`vinNo` = bipv.`vinNo` AND bip.`createOrgSid` = bv.`createOrgSid`
 		<where> ${ew.sqlSegment} </where>
 	</select>
 

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

@@ -210,7 +210,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
             qw.notIn("bipv.sid", query.getSids());
         }
         qw.eq("bip.nodeState", "已办结");
-        qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.DH_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()));
+        qw.and(wrapper -> wrapper.ne("bipv.recallStateKey", VehicleState.RecallState.RECALL.getCode()).or().ne("bipv.recallStateKey", VehicleState.RecallState.DCZ_RECALL.getCode()));
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
         IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
         PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);

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

@@ -430,4 +430,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     List<Map<String,String>> purSellVinNoAndLoc(@Param(Constants.WRAPPER) QueryWrapper<Object> qw);
 
     BaseVehicle selVehicleByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
+
+    BaseVehicle selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("useOrgSid") String useOrgSid);
 }

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

@@ -1020,4 +1020,10 @@
         WHERE vinNo = #{vinNo}
           AND createOrgSid = #{createOrgSid}
     </select>
+
+    <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        SELECT *
+        FROM base_vehicle
+        WHERE vinNo = #{vinNo} AND useOrgSid = #{useOrgSid}
+    </select>
 </mapper>

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

@@ -156,7 +156,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         }
 
         for (BaseVehicleDto baseVehicleDto : dto) {
-            BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseVehicleDto.getVinNo());
+            BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseVehicleDto.getVinNo(),baseVehicleDto.getUseOrgSid());
             if (null == baseVehicle)
                 baseVehicle = new BaseVehicle();
 

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

@@ -251,6 +251,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return baseMapper.selectByVinNo(temp);
     }
 
+    /**
+     * @description: 根据车架号和分公司sid查询车辆信息
+     */
+    public BaseVehicle selectByVinNoAndOrgSid(String vinNo, String useOrgSid) {
+        return baseMapper.selectByVinNoAndOrgSid(vinNo,useOrgSid);
+    }
+
     /**
      * 根据车架号模糊搜索下拉框
      *
@@ -1858,10 +1865,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
         baseVehicle.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
-        baseVehicle.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
-        baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
-        baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
-        baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
+        //baseVehicle.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
+        //baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
         if (save(baseVehicle)) {
             BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
             baseVehicleCertificate.setVinNo(baseVehicle.getVinNo());
@@ -2170,4 +2175,5 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public BaseVehicle selVehicleByVinNoAndOrgSid(String vinNo, String createOrgSid) {
         return baseMapper.selVehicleByVinNoAndOrgSid(vinNo, createOrgSid);
     }
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -486,7 +486,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 }
                 baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode());
                 // 入账审批通关修改采购订单状态 state = 1
-                busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
+                if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())){
+                    busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
+                }
                 try {
                  /*  APPayable apPayable=new APPayable();
                    BeanUtil.copyProperties(scmApplyInbound,apPayable);