验车，入库 推送台账数据，修改验车检查表图标问题

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItem.java

@@ -58,5 +58,7 @@ public class ScmVehinspectItem extends BaseEntity {
     private Integer sortNo;
     @ApiModelProperty("检查结果：1是，0否，2无结果，默认2")
     private Integer result;
+    @ApiModelProperty("图标地址")
+    private String iconUrl;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgVo.java

@@ -64,5 +64,7 @@ public class ScmVehinspectItemimgVo implements Vo {
     private List<String> imgUrlList;
     @ApiModelProperty("照片模板路径")
     private String imgPath;
+    @ApiModelProperty("照片路径集合")
+    private List<String> imgPathList;
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -105,7 +105,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<ScmApplyInbound> qw = new QueryWrapper<>();
 
-        qw.eq("useOrgSid", query.getCreateOrgSid());
         if (StringUtils.isNotBlank(query.getPurchaseOrderNo())) {
             qw.like("purchaseOrderNo", query.getPurchaseOrderNo());
         }
@@ -447,18 +446,18 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     baseVehicleDto.setConfigName(booad.getConfigName());
                     baseVehicleDto.setInsideCode(booad.getInsideCode());
                     baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
-                    baseVehicleDto.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
-                    baseVehicleDto.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
-                    baseVehicleDto.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
-                    baseVehicleDto.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
-                    baseVehicleDto.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
-                    baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
+                    baseVehicleDto.setSettlementStatus("0");
+                    baseVehicleDto.setSettlementStatusValue("未买断");
+                    baseVehicleDto.setLockedState("0");
+                    baseVehicleDto.setLockedStateValue("未锁定");
+                    baseVehicleDto.setVehicleState("0003");
+                    baseVehicleDto.setVehicleStateValue("在途");
                     baseVehicleDto.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
                     baseVehicleDto.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
                     baseVehicleDto.setManPurOrderTypeKey("001");
                     baseVehicleDto.setManPurOrderTypeValue("排产订单");
                     baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
-                    baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
+                    baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().subtract(booad.getSecondaryFreight()).toString()));
                     baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
                     baseVehicleDto.setPriceDate(booad.getPriceDate());
                     baseVehicleDto.setDepartureDate(booad.getDepartureDate());

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

@@ -308,18 +308,19 @@ 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("待转");
-                }
+//                if ("01".equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
+//                    baseVehicleDto.setCertificateState("0003");
+//                    baseVehicleDto.setCertificateStateValue("待转");
+//                }
                 baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
                 baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
-                baseVehicleDto.setLocation(dto.getWarehouseKey());
-                baseVehicleDto.setLocationName(dto.getWarehouse());
-                baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());
-                baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());
-                baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());
-                baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());
+                baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid
+                baseVehicleDto.setLocationName(dto.getWarehouse());//库存地点
+                baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid
+                baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称
+                baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());//配置名称
+                baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
+                baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate()); //入库日期
                 baseVehicleFeign.save(baseVehicleDto);
                 return rb.success().setMsg("操作成功！");
             } else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) {

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

@@ -26,8 +26,11 @@
 package com.yxt.anrui.scm.biz.scmvehicleexamine;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
@@ -89,6 +92,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Autowired
     FileUploadComponent fileUploadComponent;
 
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+
     @Autowired
     ScmVehicleEnterlibraryService scmVehicleEnterlibraryService;
 
@@ -258,7 +264,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             inspectionItemVos.add(appScmInspectionItemVo);
         }
         vo.setInspectList(inspectionItemVos);
-        if(vo.getPrice() == null){
+        if (vo.getPrice() == null) {
             vo.setPrice(0);
         }
         vo.setUserSid(userSid);
@@ -473,6 +479,34 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     carWarehousingDto.setUseOrgName(data1.getName());
                     scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto);
 
+                    //车辆台账推送数据
+                    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.setSettlementStatus("0");
+                    baseVehicleDto.setLockedState("0");
+                    baseVehicleDto.setLockedStateValue("未锁定");
+                    baseVehicleDto.setVehicleState("0001");
+                    baseVehicleDto.setVehicleStateValue("库存");
+                    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.setPriceDate(DateUtil.today());//dto.getPriceDate()
+                    baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
+                    baseVehicleDto.setModelSid(scmVehicleExamine.getModelSid()); //车型sid
+                    baseVehicleDto.setModelName(scmVehicleExamine.getModelName());//车型名称
+                    baseVehicleDto.setConfigName(scmVehicleExamine.getConfigName());//配置名称
+                    baseVehicleDto.setModelConfigSid(scmVehicleExamine.getConfigSid());//配置sid
+                    baseVehicleDto.setWarrantyCardNo(scmVehicleExamine.getGuaranteeCardNo());//保修卡卡号
+                    baseVehicleDto.setSpecialInstructions(scmVehicleExamine.getModelDifferenceExplain());//特殊配置差异说明
+                    baseVehicleFeign.save(baseVehicleDto);
+
                     scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1);
                     List<String> factoryImage = dto.getFactoryImage();
                     for (String s : factoryImage) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml

@@ -26,7 +26,7 @@
     </select>
 
     <select id="selectListOne" resultMap="voMap">
-        select si.sid, si.item, si.sortNo
+        select si.sid, si.item, si.sortNo,si.iconUrl
         from scm_vehicle_inspectitem si
     </select>
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@@ -239,6 +239,9 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
                 String sid = scmVehinspectItem.getSid();
                 BeanUtil.copyProperties(item, scmVehinspectItem);
                 scmVehinspectItem.setVehInspectSid(vehInspectSid);
+                if (!scmVehinspectItem.getIconUrl().contains(fileUploadComponent.getUrlPrefix())){
+                    scmVehinspectItem.setIconUrl(fileUploadComponent.getUrlPrefix()+scmVehinspectItem.getIconUrl());
+                }
                 baseMapper.insert(scmVehinspectItem);
                 List<ScmItemDetailVo> detailsList = item.getDetails();
                 detailsList.removeAll(Collections.singleton(null));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgService.java

@@ -74,18 +74,49 @@ public class ScmVehinspectItemimgService extends MybatisBaseService<ScmVehinspec
      */
     public List<ScmVehinspectItemimgVo> getInfoByMainSid(String sid) {
         List<ScmVehinspectItemimgVo> itemImgVos = baseMapper.getInfoByMainSid(sid);
-        for (ScmVehinspectItemimgVo itemImgVo : itemImgVos) {
-            String imgUrl = null;
-            List<String> imgUrlList = new ArrayList<>();
-            List<String> list = Arrays.asList(itemImgVo.getImgUrl().split(","));
-            for (String s : list) {
-                imgUrl = fileUploadComponent.getUrlPrefix() + s;
-                imgUrlList.add(imgUrl);
+
+        for (int i = 0; i < itemImgVos.size(); i++) {
+
+            List<String> imgUrlFiles = new ArrayList<>();
+            List<String> imgPathFiles = new ArrayList<>();
+
+            String imgUrl = itemImgVos.get(i).getImgUrl();
+            if (StringUtils.isNotBlank(imgUrl)){
+                String[] split = imgUrl.split(",");
+                for (String s : split) {
+                    String imgUrls = fileUploadComponent.getUrlPrefix() + s;
+                    imgUrlFiles.add(imgUrls);
+                }
+                itemImgVos.get(i).setImgUrlList(imgUrlFiles);
+            }else {
+                itemImgVos.get(i).setImgUrlList(imgUrlFiles);
+            }
+
+            String imgPath = itemImgVos.get(i).getImgPath();
+            if (StringUtils.isNotBlank(imgPath)){
+                String[] split = imgPath.split(",");
+                for (String s : split) {
+                    String imgUrls = fileUploadComponent.getUrlPrefix() + s;
+                    imgPathFiles.add(imgUrls);
+                }
+                itemImgVos.get(i).setImgPathList(imgPathFiles);
+            }else {
+                itemImgVos.get(i).setImgPathList(imgPathFiles);
             }
-            itemImgVo.setImgUrlList(imgUrlList);
-            String imgPath = fileUploadComponent.getUrlPrefix() + itemImgVo.getImgPath();
-            itemImgVo.setImgPath(imgPath);
         }
+
+//        for (ScmVehinspectItemimgVo itemImgVo : itemImgVos) {
+//            String imgUrl = "";
+//
+//            List<String> list = Arrays.asList(itemImgVo.getImgUrl().split(","));
+//            for (String s : list) {
+//                imgUrl = fileUploadComponent.getUrlPrefix() + s;
+//                imgUrlList.add(imgUrl);
+//            }
+//            itemImgVo.setImgUrlList(imgUrlList);
+//            String imgPath = fileUploadComponent.getUrlPrefix() + itemImgVo.getImgPath();
+//            itemImgVo.setImgPath(imgPath);
+//        }
         return itemImgVos;
     }