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 f86d554703..2550f353eb 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 @@ -2039,9 +2039,9 @@ public class BaseVehicleService extends MybatisBaseService stringList = baseVehinstallService.selectListVo(createOrgSid); QueryWrapper qw = new QueryWrapper<>(); qw.eq("bv.createOrgSid", createOrgSid); + qw.eq("bv.vehicleState", "0001"); if (stringList.size() > 0) { qw.notIn("bv.vinNo", stringList); } @@ -3551,7 +3552,7 @@ public class BaseVehicleService extends MybatisBaseService getSystem(String sid) { ResultBean rb = ResultBean.fireFail(); BaseVehicle baseVehicle = fetchBySid(sid); - BasePurchSystemVo basePurchSystemVo = baseMapper.getSystem(baseVehicle.getUseOrgSid(),baseVehicle.getPurchaseSystemSid()); + BasePurchSystemVo basePurchSystemVo = baseMapper.getSystem(baseVehicle.getUseOrgSid(), baseVehicle.getPurchaseSystemSid()); return rb.success().setData(basePurchSystemVo); } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 7fd4527855..54e3b29720 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -258,8 +258,7 @@ public class BaseVehicleOutService extends MybatisBaseService fEntityList = new ArrayList<>(); SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); //单价 - BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailerDetailsVo.getTrailerModelSid()); - fEntity.setFPrice(baseTrailerModel.getSaleGuidancePrice()); + fEntity.setFPrice(dto.getTrailerOrInstallDealPrice()); //物料编码 fEntity.setFMaterialID(baseTrailerDetailsVo.getVinNo().substring(baseTrailerDetailsVo.getVinNo().length() - 8) + "G"); //仓库id