Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java

@@ -52,7 +52,7 @@ public interface BusHandoverFeign {
     @ApiOperation("办理查看回显")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
-    public ResultBean<BusHandoverDetailVo> fetchDetailsBySid(@PathVariable String sid);
+    public ResultBean<BusHandoverDetailVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("上传照片")
     @PostMapping("/uploadPicture")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java

@@ -14,7 +14,7 @@ public enum BusTransferRecordEnum {
     private final String code;
     private final String remarks;
 
-    ScmTransferRecordEnum(String code, String remarks) {
+    BusTransferRecordEnum(String code, String remarks) {
         this.code = code;
         this.remarks = remarks;
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -787,10 +787,10 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 BusHandoverPrepareVehicle prepareVehicle = busHandoverPrepareVehicleService.fetchDetailsByVinSid(handoverWait.getVinSid());
                 if (null != prepareVehicle) {
                     if (prepareVehicle.getInvoicingState() > 0) {
-                        sb.append("发票、");
+                        sb.append("发票").append("、");
                     }
                     if (prepareVehicle.getCertificateState() > 0) {
-                        sb.append("合格证、");
+                        sb.append("合格证").append("、");
                     }
                     if (prepareVehicle.getOnBoardDataState() > 0) {
                         BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
@@ -798,15 +798,11 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                             itemVo.setIsFuelVehicle(data.getIsFuelVehicle());
                             if (data.getInformations().size() > 0) {
                                 List<BusVehicleInformationVo> informations = data.getInformations();
-                                String keyNum = "";
                                 for (BusVehicleInformationVo information : informations) {
-                                    keyNum = information.getVehicleKeyNum();
-                                }
-                                if (Integer.parseInt(data.getIsFuelVehicle()) > 0) {
-                                    //0是燃气车 1不是燃气车
-                                    sb.append(keyNum + "把车钥匙、一致性证书、申请表、保修手册、说明书、环保清单、驾驶员卡、");
-                                } else {
-                                    sb.append(keyNum + "把车钥匙、一致性证书、申请表、保修手册、说明书、环保清单、驾驶员卡、气瓶产品质量证书（燃气车）、");
+                                    sb.append(information.getVehicleHandoverData());
+                                    if (StringUtils.isNotBlank(information.getVehicleHandoverData())) {
+                                        sb.append("、");
+                                    }
                                 }
                             }
                         }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -33,7 +33,7 @@ public enum ProcDefEnum {
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
-    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:6:1602504"),
+    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:9:1632516"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),