diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index cf7187794b..4cb371e784 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -191,6 +191,17 @@ public class ScmVehicleReturnService extends MybatisBaseService> vinNoList1 = scmVehicleReturnDetailsService.selectVinNoList(businessSid); + if (vinNoList1.getSuccess() && vinNoList1.getData() != null && vinNoList1.getData().size() != 0) { + //查询车架号数组中是否有采购退库状态的车辆,若有则返回true,没有返回false + ResultBean stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData()); + if (stringResultBean.getSuccess()) { + if (stringResultBean.getData()) { + return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆"); + } + } + } Map variables = new HashMap<>(); variables.put("businessSid", businessSid); if (Integer.parseInt(scmVehicleReturnDto.getMoney()) > 0) { @@ -263,6 +274,12 @@ public class ScmVehicleReturnService extends MybatisBaseService stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData()); + if (stringResultBean.getSuccess()) { + if (stringResultBean.getData()) { + return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆"); + } + } + }