Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -742,8 +742,8 @@
         bv.locationName location,
         <!--存放地点sid-->
         bv.location locationSid,
-        <!--销售指导价-->
-        bv.salePrice as guidedPrice,
+        <!--销售指导价 取值厂家结算价 -->
+        bv.costPrice as guidedPrice,
         bmc.configName,
         bmc.sid as configSid,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@@ -55,4 +55,7 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
     @ApiModelProperty("保修卡卡号")
     private String guaranteeCardNo; // 保修卡卡号
 
+    @ApiModelProperty("检验项集合")
+    private List<AppScmInspectionItemVo> inspectList;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -53,6 +54,6 @@ public class AppScmVehicleExamineInfoVo implements Vo {
     private String guaranteeCardNo; // 保修卡卡号
 
     @ApiModelProperty("检验项集合")
-    private List<AppScmInspectionItemVo> inspectList;
+    private List<AppScmInspectionItemVo> inspectList = new ArrayList<>();
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -295,11 +295,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                 //车辆台账推送数据
                 BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
                 baseVehicleDto.setVinNo(dto.getVin());
-                String userSid = dto.getUserSid();
-                ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-                String data2 = pathSidByUserSid.getData();
-                baseVehicleDto.setCreateOrgSid(data2);
-                baseVehicleDto.setUseOrgSid(data2);
+                baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
+                baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
+                baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
                 baseVehicleDto.setSettlementStatus("0");
                 baseVehicleDto.setLockedState("0");
                 baseVehicleDto.setLockedStateValue("未锁定");
@@ -308,10 +306,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                 baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
                 baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
                 baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
-//                if ("01".equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
-//                    baseVehicleDto.setCertificateState("0003");
-//                    baseVehicleDto.setCertificateStateValue("待转");
-//                }
+                baseVehicleDto.setWitPinState("100");
+                baseVehicleDto.setWitPinStateValue("未调车");
                 baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
                 baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
                 baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -248,9 +248,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String type2 = "02"; // 验车相关照片 02
         List<String> factoryImages = new ArrayList<>();
         List<String> carInspectedImages = new ArrayList<>();
-
-        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
 
         List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
@@ -295,6 +293,19 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         List<String> carInspectedImages = new ArrayList<>();
 
         AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid);
+
+        List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
+        List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
+        for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {
+            AppScmInspectionItemVo appScmInspectionItemVo = new AppScmInspectionItemVo();
+            appScmInspectionItemVo.setItem(scmVehinspectItemVo.getItem());
+            appScmInspectionItemVo.setSid(scmVehinspectItemVo.getSid());
+            appScmInspectionItemVo.setResult(scmVehinspectItemVo.getResult());
+            appScmInspectionItemVo.setIconUrl(fileUploadComponent.getUrlPrefix() + scmVehinspectItemVo.getIconUrl());
+            inspectionItemVos.add(appScmInspectionItemVo);
+        }
+        vo.setInspectList(inspectionItemVos);
+
         if (vo.getPrice() == null || vo.getPrice().equals("")) {
             BigDecimal bigDecimal = new BigDecimal("0.00");
             vo.setPrice(bigDecimal);
@@ -495,8 +506,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
                     baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
                     baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
-//                    baseVehicleDto.setCertificateState("0003");
-//                    baseVehicleDto.setCertificateStateValue("待转");
+                    baseVehicleDto.setWitPinState("100");
+                    baseVehicleDto.setWitPinStateValue("未调车");
                     baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
                     baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
                     baseVehicleDto.setModelSid(scmVehicleExamine.getModelSid()); //车型sid

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java

@@ -55,5 +55,8 @@ public class AppExamineDetailsVo implements Vo {
 
     @ApiModelProperty("定位")
     private String location;
-    
+
+    @ApiModelProperty("项目内容")
+    private List<InspectionItemVo> inspectList;
+
 }