出库

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -204,7 +204,7 @@
             resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo">
         select *
         from base_vehicle_certificate
-        where vehicleSid = #{sid}
+        where vehicleSid = #{sid} limit 1
     </select>
 
     <select id="selectByVinNoAndOrgSid"

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -74,6 +74,12 @@ public class AppDeliveredDetailsVo implements Vo {
     @ApiModelProperty("车辆集合")
     private List<AppCarListVo> carList;
 
+    @ApiModelProperty(value = "实例id")
+    private String procInstId;
+
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+
 
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyCompleteDto.java

@@ -15,7 +15,7 @@ public class BusDeliveredApplyCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -193,7 +194,8 @@ public interface BusDeliveredApplyFeign {
     @ApiOperation("手机端-初始化 出库申请")
     @GetMapping("/getRetrievalApplyInfoBySid")
     @ResponseBody
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
+//    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
 
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -146,7 +147,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(String sid) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -214,9 +215,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean<AppDeliveredApplyInfoVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
+        ResultBean<AppDeliveredDetailsVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
         return rb.success().setData(retrievalApplyInfo.getData());
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -30,10 +30,16 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
+import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
+import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
@@ -41,7 +47,6 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo;
 import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
 import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountsVo;
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoVo;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessagesVo;
@@ -54,12 +59,19 @@ import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessage
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -126,6 +138,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusDeliveredDetailsDiscountService busDeliveredDetailsDiscountService;
     @Autowired
     private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BaseTrailerFeign baseTrailerFeign;
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private FinBillApplicationFeign finBillApplicationFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -455,18 +477,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath = dto.getOrgPath();
-        /*//根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }*/
-        //用户的组织全路径
-//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, busDeliveredApply);
         if (r == 3) {
@@ -575,6 +585,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(busDeliveredApply.getOrgSidPath());
         if (bv.getTaskId().equals(busDeliveredApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -583,7 +594,61 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 baseMapper.updateStateBySid(3, bv.getBusinessSid());
                 //推送开票申请
+                List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());
+                FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
+                finBillApplicationDto.setUseOrgSid(busDeliveredApply.getUseOrgSid());
+                finBillApplicationDto.setCreateBySid(busDeliveredApply.getApplySid());
+                finBillApplicationDto.setCreateByName(busDeliveredApply.getApplyName());
+                finBillApplicationDto.setContractNo(busDeliveredApply.getContractNo());
+                //根据合同编号查询销售订单的信息
+                ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
+                if (!resultBean.getSuccess()) {
+                    log.error("获取销售订单详情出错啦！！！");
+                    return rb;
+                }
+                AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData();
+                finBillApplicationDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                finBillApplicationDto.setCustomerName(busDeliveredApply.getName());
+                finBillApplicationDto.setDeptSid(busDeliveredApply.getApplyDeptSid());
+                finBillApplicationDto.setDeptName(busDeliveredApply.getApplyDept());
+                //根据用户sid查询staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                finBillApplicationDto.setStaffSid(userVoResultBean.getData().getStaffSid());
+                finBillApplicationDto.setStaffName(busDeliveredApply.getStaffName());
+                finBillApplicationDto.setSaleDeptSid(busDeliveredApply.getStaffDeptSid());
+                finBillApplicationDto.setSaleDeptName(busDeliveredApply.getStaffDeptName());
+                finBillApplicationDto.setSaleTypeKey(busDeliveredApply.getPaymentMethodKey());
+                finBillApplicationDto.setSaleTypeValue(busDeliveredApply.getPaymentMethod());
+                //开票单位
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        finBillApplicationDto.setOpenTickUnitName(invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+                finBillApplicationDto.setBillStateKey(VehicleStateTempOrLast.PaymentEnum.NORMAL_INVOICING.getCode());
+                finBillApplicationDto.setBillStateValue(VehicleStateTempOrLast.PaymentEnum.NORMAL_INVOICING.getRemarks());
+                List<FinBillVehicleDto> finBillVehicles = new ArrayList<>();
+                for (int i = 0; i < detailsList.size(); i++) {
+                    FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
+                    BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+                    finBillVehicleDto.setVinNo(busDeliveredApplyDetails.getVinNo());
+                    finBillVehicleDto.setVehSid(busDeliveredApplyDetails.getVinSid());
+                    //合格证状态
+                    BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetails.getVinSid()).getData();
+                    if (baseVehicleCertificate == null) {
+                        finBillVehicleDto.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
+                        finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateSituationValue());
 
+                    }
+                    finBillVehicles.add(finBillVehicleDto);
+                }
+                finBillApplicationDto.setFinBillVehicles(finBillVehicles);
+                finBillApplicationDto.setArrearsMoney("0");
+                ResultBean finBillResult = finBillApplicationFeign.save(finBillApplicationDto);
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             return rb.success().setData(resultBean.getData());
@@ -730,7 +795,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param pagerQuery
      * @return
      */
-    public IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
+    public IPage<AppDeliveredApplyPageVo> getRetrievalApplyList
+    (PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
         QueryWrapper<AppDeliveredApplyPageQuery> qw = new QueryWrapper<>();
         String orgPath = pagerQuery.getParams().getOrgPath();
         String orgSid = "";
@@ -1051,9 +1117,71 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setData(sid);
     }
 
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
-        ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
-        AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
+    public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfoBySid(String sid) {
+        ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
+        AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();
+        //根据sid获取出库申请
+        BusDeliveredApply busDeliveredApply = fetchBySid(sid);
+        if (busDeliveredApply == null) {
+            return rb.setMsg("该出库申请不存在");
+        }
+        appDeliveredDetailsVo.setOrgPath(busDeliveredApply.getOrgSidPath());
+        appDeliveredDetailsVo.setSid(sid);
+        BeanUtil.copyProperties(busDeliveredApply, appDeliveredDetailsVo, "sid");
+        appDeliveredDetailsVo.setContractId(busDeliveredApply.getContractNo());
+        appDeliveredDetailsVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
+        appDeliveredDetailsVo.setCreateTime(DateUtil.format(busDeliveredApply.getCreateTime(), "yyyy-MM-dd"));
+        if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) {
+            appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费：" + busDeliveredApply.getDistributorPrice() + "元");
+        }
+        if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) {
+            appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费：" + busDeliveredApply.getDistributorPriceTwo() + "元");
+        }
+        List<AppCarListVo> carList = new ArrayList<>();
+        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
+        for (int i = 0; i < detailsList.size(); i++) {
+            BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+            AppCarListVo appCarListVo = new AppCarListVo();
+            appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
+            appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
+            //查询该车辆是否有挂车
+            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid());
+            if (trailerList.getData().getList().isEmpty()) {
+                appCarListVo.setShowHandCarBtn(false);
+            } else {
+                appCarListVo.setShowHandCarBtn(true);
+            }
+            //优惠包使用情况
+            List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
+            List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
+            for (int j = 0; j < discountsList.size(); j++) {
+                BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
+                BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
+                busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
+                busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
+                busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
+                busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
+                busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
+                busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
+                discountUse.add(busDeliveredDetailsDiscountsVo);
+            }
+            appCarListVo.setDiscountUse(discountUse);
+            //使用人信息
+            BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
+            BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+            BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
+            realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
+            appCarListVo.setRealBuyer(realBuyer);
+            carList.add(appCarListVo);
+        }
+        appDeliveredDetailsVo.setCarList(carList);
+        //获取实际购车人的数据
+        ResultBean<List<DictCommonVo>> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0");
+        List<DictCommonVo> dictCommonVoList = listResultBean.getData();
+        List<DeliveredDictVo> voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList());
+        appDeliveredDetailsVo.setBuyerType(voList);
+
+       /* AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
         BeanUtil.copyProperties(busDeliveredApply, vo);
 
@@ -1075,7 +1203,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             //根据出库申请单的sid查询需要出库的车辆信息
             List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(sid);
             for (int i = 0; i < voList.size(); i++) {
-              /* BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
+               BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
                 AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
                 appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
                 appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
@@ -1084,12 +1212,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 appUseInfoVo.setProvince(busDeliveredUseMessage.getProvince());
                 appUseInfoVo.setCity(busDeliveredUseMessage.getCity());
                 appUseInfoVo.setCounty(busDeliveredUseMessage.getCounty());
-                voList.get(i).setUseInfo(appUseInfoVo);*/
+                voList.get(i).setUseInfo(appUseInfoVo);
             }
             vo.setCarList(voList);
         }
-        vo.setSid(sid);
-        return rb.success().setData(vo);
+        vo.setSid(sid);*/
+        return rb.success().setData(appDeliveredDetailsVo);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -1160,13 +1288,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
-        appMap.put("outboundSid", businessSid);
+        appMap.put("sid", businessSid);
         appMap.put("contractId", busDeliveredApply.getContractNo());
         variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if(!voResultBean.getSuccess()){
+                return rb.setMsg(voResultBean.getMsg());
+            }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -1194,6 +1325,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
         }
+
         return rb;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -85,7 +85,8 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("手机端-出库申请 详情")
     @GetMapping("/getRetrievalDetail")
     @ResponseBody
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
+//    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
 
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -74,7 +74,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     }*/
 
     @Override
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(String sid) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@@ -88,4 +88,11 @@ public class DeliveredDetailsVo implements Vo {
     private List<CarListVo> carList = new ArrayList<>();
     @ApiModelProperty("剩余")
     private List<DeliveredLeaveVo> discountLeave = new ArrayList<>();
+
+    @ApiModelProperty(value = "实例id")
+    @JsonProperty("procInsId")
+    private String procInstId;
+
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -82,7 +82,7 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     }*/
 
     @Override
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(String sid) {
         return appBusDeliveredApplyService.getRetrievalDetail(sid);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -150,14 +150,14 @@ public class AppBusDeliveredApplyService {
         return rb.success().setData(voList);
     }
 
-    public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {
-        ResultBean<DeliveredApplyDetailsVo> rb = ResultBean.fireFail();
-        DeliveredApplyDetailsVo vo = new DeliveredApplyDetailsVo();
-        ResultBean<AppDeliveredApplyInfoVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
+    public ResultBean<DeliveredDetailsVo> getRetrievalDetail(String sid) {
+        ResultBean<DeliveredDetailsVo> rb = ResultBean.fireFail();
+        DeliveredDetailsVo vo = new DeliveredDetailsVo();
+        ResultBean<AppDeliveredDetailsVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
-        AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData();
+        AppDeliveredDetailsVo appDeliveredApplyInfoVo = resultBean.getData();
         BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
         return rb.success().setData(vo);
     }
@@ -277,20 +277,14 @@ public class AppBusDeliveredApplyService {
         List<ConfigVo> modelInfo = new ArrayList<>();
         List<List<ConfigVo>> handCarInfo = new ArrayList<>();
         String vinNo = traliveredVo.getVinNo();
-        if (StringUtils.isNotBlank(vinNo)) {
-            modelInfo.add(getConfigValueSpanSize("车型信息", "", 2));
-            modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 1));
-        }
+        modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 1));
         String modelName = traliveredVo.getModelName();
-        if (StringUtils.isNotBlank(modelName)) {
-            modelInfo.add(getConfigValueSpanSize("车型", modelName, 1));
-        }
+        modelInfo.add(getConfigValueSpanSize("车型", modelName, 1));
         deliveredTralierVo.setModelInfo(modelInfo);
         List<TrailerVo> list = traliveredVo.getList();
         for (int i = 0; i < list.size(); i++) {
             TrailerVo trailerVo = list.get(i);
             List<ConfigVo> configVoList = new ArrayList<>();
-            configVoList.add(getConfigValueSpanSize("挂车" + i + 1, "", 2));
             //挂车车架号
             String trailerVinNo = trailerVo.getTrailerVinNo();
             configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1));
@@ -315,20 +309,28 @@ public class AppBusDeliveredApplyService {
             String appearanceSizeLong = trailerVo.getAppearanceSizeLong();
             if (StringUtils.isNotBlank(appearanceSizeLong)) {
                 appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "长      mm,";
             }
             String appearanceSizeWide = trailerVo.getAppearanceSizeWide();
             if (StringUtils.isNotBlank(appearanceSizeWide)) {
                 appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "宽      mm,";
             }
             //高
             String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh();
             if (StringUtils.isNotBlank(appearanceSizeHigh)) {
                 appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "高      mm,";
             }
             //总高
             String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh();
             if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) {
-                appearanceSizeAll = appearanceSizeAll + "总高 " + "mm";
+                appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh+"mm";
+            }else{
+                appearanceSizeAll = appearanceSizeAll + "总高     mm";
             }
             //外观尺寸
             configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2));
@@ -336,21 +338,21 @@ public class AppBusDeliveredApplyService {
             String insideSizeAll = "";
             String insideSizeLong = trailerVo.getInsideSizeLong();
             if (StringUtils.isNotBlank(insideSizeLong)) {
-                insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm";
+                insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,";
             } else {
-                insideSizeAll = insideSizeAll + "长  mm";
+                insideSizeAll = insideSizeAll + "长      mm,";
             }
             String insideSizeWide = trailerVo.getInsideSizeWide();
             if (StringUtils.isNotBlank(insideSizeWide)) {
-                insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm";
+                insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,";
             } else {
-                insideSizeAll = insideSizeAll + "宽  mm";
+                insideSizeAll = insideSizeAll + "宽      mm,";
             }
             String insideSizeHigh = trailerVo.getInsideSizeHigh();
             if (StringUtils.isNotBlank(insideSizeHigh)) {
                 insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm";
             } else {
-                insideSizeAll = insideSizeAll + "高  mm";
+                insideSizeAll = insideSizeAll + "高      mm";
             }
             configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2));
             String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh();
@@ -359,15 +361,21 @@ public class AppBusDeliveredApplyService {
             String girderSizeAll = "";
             String girderSizeHigh = trailerVo.getGirderSizeHigh();
             if (StringUtils.isNotBlank(girderSizeHigh)) {
-                girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm";
+                girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,";
+            }else{
+                girderSizeAll = girderSizeAll + "高度     mm,";
             }
             String girderSizeWide = trailerVo.getGirderSizeWide();
             if (StringUtils.isNotBlank(girderSizeWide)) {
-                girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm";
+                girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,";
+            }else{
+                girderSizeAll = girderSizeAll + "宽度     mm,";
             }
             String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate();
             if (StringUtils.isNotBlank(girderSizeStandPlate)) {
                 girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm";
+            }else{
+                girderSizeAll = girderSizeAll + "立板     mm";
             }
             configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2));
             //牵引销
@@ -384,13 +392,18 @@ public class AppBusDeliveredApplyService {
             configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2));
             //底板
             String floorSize = trailerVo.getFloorSize();
-            configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2));
+            if(StringUtils.isNotBlank(floorSize)){
+                configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2));
+            }else{
+                configVoList.add(getConfigValueSpanSize("底板(底盘)",  "        mm", 2));
+            }
+
             //门扇要求
             String doorFanRequirement = trailerVo.getDoorFanRequirement();
             configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1));
             //箱体颜色
             String boxColor = trailerVo.getBoxColor();
-            configVoList.add(getConfigValueSpanSize("门扇要求", boxColor, 1));
+            configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1));
             //更多配置
             String moreConfig = trailerVo.getMoreConfig();
             configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2));