问题修改

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<BaseVehicleMapper, Ba
             if (baseVehicleCertificate == null) {
                 orderVoList.get(i).setCertificate(false);
             } else {
-                if("004".equals(baseVehicleCertificate.getCertificateState())||"002".equals(baseVehicleCertificate.getCertificateState())){
+                if ("004".equals(baseVehicleCertificate.getCertificateState()) || "002".equals(baseVehicleCertificate.getCertificateState())) {
                     orderVoList.get(i).setCertificate(true);
-                }else{
+                } else {
                     orderVoList.get(i).setCertificate(false);
                 }
 
@@ -2150,6 +2150,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         List<String> stringList = baseVehinstallService.selectListVo(createOrgSid);
         QueryWrapper<BaseVehicle> 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<BaseVehicleMapper, Ba
     public ResultBean<BasePurchSystemVo> getSystem(String sid) {
         ResultBean<BasePurchSystemVo> 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);
     }
 }

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<BaseVehicleOutMapp
             List<SalOutStock.FEntity> 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