Browse Source

修改出库提交时非担保的去掉限制

master
dimengzhe 3 months ago
parent
commit
ee399ccee6
  1. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -300,6 +300,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private BusSalesOrderMakeupService busSalesOrderMakeupService; private BusSalesOrderMakeupService busSalesOrderMakeupService;
@Autowired @Autowired
private FinKingDeeFeign finKingDeeFeign; private FinKingDeeFeign finKingDeeFeign;
/** /**
* 构造出库申请的查询条件 * 构造出库申请的查询条件
* *
@ -3433,6 +3434,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg("请选择要出库的车辆"); return rb.setMsg("请选择要出库的车辆");
} }
if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款 if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
if ("01".equals(busSalesOrder.getFinancePlan())) {
//先查询该订单下是否有挂车,如果有的话,再根据该订单及车辆查询挂车是否都已入库,若没有全部入库,则提示 //先查询该订单下是否有挂车,如果有的话,再根据该订单及车辆查询挂车是否都已入库,若没有全部入库,则提示
boolean isHave = false; boolean isHave = false;
List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId()); List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
@ -3486,6 +3488,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} }
} }
}
} else { } else {
boolean issHave = false; boolean issHave = false;
List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId()); List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId());
@ -4424,6 +4428,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} }
//===================== //=====================
if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款 if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
if ("01".equals(busSalesOrder.getFinancePlan())) {
//先查询该订单下是否有挂车,如果有的话,再根据该订单及车辆查询挂车是否都已入库,若没有全部入库,则提示 //先查询该订单下是否有挂车,如果有的话,再根据该订单及车辆查询挂车是否都已入库,若没有全部入库,则提示
boolean isHave = false; boolean isHave = false;
List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId()); List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
@ -4477,6 +4482,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} }
} }
}
} else { } else {
boolean issHave = false; boolean issHave = false;
List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId()); List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId());

Loading…
Cancel
Save