问题优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1540,6 +1540,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
             baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
             baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
+            baseVehicleOut.setCreateOrgSid(baseVehicleOutApply.getCreateOrgSid());
             //baseVehicleOut.setBillNo(billNo);
             //保存车辆出库单子表
             baseMapper.insert(baseVehicleOut);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2705,6 +2705,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
+        String contractNo = finBillApplication.getContractNo();
+        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
+        if (data != null) {
+            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
+        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java

@@ -44,4 +44,7 @@ public class InvoicedDto implements Dto {
     private List<String> registerContractImages;
     @ApiModelProperty("确认书")
     private List<String> invoiceApplyConfirmImages;
+
+    @ApiModelProperty
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -288,6 +288,7 @@ public class InvoicedService {
         ResultBean rb = ResultBean.fireFail();
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
         BeanUtil.copyProperties(dto, finBillCompleteDto);
+        finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         ResultBean resultBean = finBillApplicationFeign.complete(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -466,6 +467,7 @@ public class InvoicedService {
         ResultBean rb = ResultBean.fireFail();
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
         BeanUtil.copyProperties(dto, finBillCompleteDto);
+        finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         //附件信息
         List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书