From a645fd4e8c1a4ff621131e336d7e1e8958ae3c42 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Tue, 9 Aug 2022 08:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmEntryVehicleExamineDto.java            |  3 +++
 .../ScmApplyInboundService.java               | 25 ++++++++++---------
 ...cmVehiclePatrolinspectionsheetService.java |  1 +
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java
index f9615f64d0..192284822d 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmEntryVehicleExamineDto.java
@@ -49,4 +49,7 @@ public class ScmEntryVehicleExamineDto implements Dto {
 
     @ApiModelProperty(value = "厂家入库日期")
     private String inboundDate;
+
+    @ApiModelProperty(value = "洗车费")
+    private String price;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index 0439d2d008..d96bede6f2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -85,8 +85,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     private BaseVehicleFeign baseVehicleFeign;
     @Autowired
     private ScmVehinspectItemService scmVehinspectItemService;
-   /* @Autowired
-    private FinKingDeeFeign finKingDeeFeign;*/
+    /* @Autowired
+     private FinKingDeeFeign finKingDeeFeign;*/
     @Autowired
     private ScmFileService scmFileService;
     @Autowired
@@ -120,7 +120,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.like("modelName", query.getModelName());
         }
-        qw.eq("useOrgSid",query.getCreateOrgSid());
+        qw.eq("useOrgSid", query.getCreateOrgSid());
         return qw;
     }
 
@@ -434,6 +434,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
                     scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
                     scmEntryVehicleExamineDto.setInspectionResult("1");
+                    scmEntryVehicleExamineDto.setPrice("");
                     scmEntryVehicleExamineDto.setDepartureDate(booad.getDepartureDate());
                     //厂家入库日期
                     scmEntryVehicleExamineDto.setInboundDate(scmApplyInbound.getPriceDate());
@@ -462,14 +463,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
                     //厂家合同价
                     baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
-                    if(booad.getOnceFreight()==null&& booad.getSecondaryFreight()==null){//一次为空  二次为空
+                    if (booad.getOnceFreight() == null && booad.getSecondaryFreight() == null) {//一次为空  二次为空
                         //运费合计
                         baseVehicleDto.setFreight(0);
-                    }else  if(booad.getOnceFreight()!=null&& booad.getSecondaryFreight()!=null){//一次不为空  二次不空
+                    } else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() != null) {//一次不为空  二次不空
                         baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
-                    }else  if(booad.getOnceFreight()!=null&& booad.getSecondaryFreight()==null){//一次不为空  二次空
+                    } else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() == null) {//一次不为空  二次空
                         baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().toString()));
-                    }else if(booad.getOnceFreight()==null&& booad.getSecondaryFreight()!=null){ //一次为空  二次不空
+                    } else if (booad.getOnceFreight() == null && booad.getSecondaryFreight() != null) { //一次为空  二次不空
                         baseVehicleDto.setFreight(Integer.parseInt(booad.getSecondaryFreight().toString()));
                     }
                     // baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
@@ -481,10 +482,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     baseVehicleDto.setInsideCode(booad.getInsideCode());
                     baseVehicleDtos.add(baseVehicleDto);
                 }
-                baseVehicleFeign.saveOrUpdate(baseVehicleDtos,OperVehicleState.EventType.RZ_SAVEVEH.getCode());
+                baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode());
                 // 入账审批通关修改采购订单状态 state = 1
                 busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
-               try{
+                try {
                  /*  APPayable apPayable=new APPayable();
                    BeanUtil.copyProperties(scmApplyInbound,apPayable);
                    List<APPayable.ScmApplyInboundVehicleDto> l=new ArrayList<>();
@@ -499,9 +500,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                        return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:"+scmApplyInbound.getSid());
                    }
                    log.error(JSON.toJSONString(resultBean1));*/
-               }catch (Exception e){
-                   return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:"+scmApplyInbound.getSid());
-               }
+                } catch (Exception e) {
+                    return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:" + scmApplyInbound.getSid());
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
index 3b6579a076..668bf22f89 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
@@ -310,6 +310,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         scmVehiclePatrolinspection.setPatrolInspectionName(dto.getUserName());
         scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
         scmVehiclePatrolinspection.setUseOrgName(data.getOrgName());
+        scmVehiclePatrolinspection.setSid(scmVehicleStayPatrolinspection.getSid());
         scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
         scmVehiclePatrolinspectionsheet.setPatrolInspectionSid(scmVehiclePatrolinspection.getSid());
         save(scmVehiclePatrolinspectionsheet);