Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java

@@ -77,4 +77,9 @@ public class FinCompanyInvoicingVo implements Vo {
     private String orgSidPath;
     @ApiModelProperty("是否可以操作")
     private Boolean isCZ;
+
+    @ApiModelProperty("开票类型value")
+    private String invoiceType; //
+    @ApiModelProperty("开票类型key")
+    private String invoiceTypeKey;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -347,12 +347,14 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setZrrdbcns(zrrdbcns);
         vo.setZfxsjt(zfxsjt);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
-        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
+       /* if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
             vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         } else {
             vo.setIsCanEdit(true);
-        }
+        }*/
+        vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
+        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         return rb.success().setData(vo);
     }
 
@@ -474,12 +476,14 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         vo.setZfxsjt(zfxsjt);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
-        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
+        /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
             vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         } else {
             vo.setIsCanEdit(true);
-        }
+        }*/
+        vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
+        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         return rb.success().setData(vo);
     }
 

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

@@ -311,12 +311,14 @@ public class InvoicedService {
         vo.setRegisterContractImages(registerContractImages);
         vo.setIdCardImages(idCardImages);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
-        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
+       /* if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
             vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         } else {
             vo.setIsCanEdit(true);
-        }
+        }*/
+        vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
+        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         return rb.success().setData(vo);
     }
 
@@ -427,7 +429,7 @@ public class InvoicedService {
             billApplicationIInfoVo.setRegisterContractImages(registerContractImages);
             billApplicationIInfoVo.setIdCardImages(idCardImages);
             BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData();
-            if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
+           /* if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
                 billApplicationIInfoVo.setIsCanEdit(false);
                 billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
                 if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
@@ -435,7 +437,10 @@ public class InvoicedService {
                 }
             } else {
                 billApplicationIInfoVo.setIsCanEdit(true);
-            }
+            }*/
+            billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
+            billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+            billApplicationIInfoVo.setInvoiceTotal(busSalesOrderIsDTKPJVo.getOneBillMoney());
         } else {
             billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
             billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());

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

@@ -396,12 +396,14 @@ public class AppBusDeliveredApplyService {
             billApplicationIInfoVo.setRegisterContractImages(registerContractImages);
             billApplicationIInfoVo.setIdCardImages(idCardImages);
             BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData();
-            if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
+            /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
                 billApplicationIInfoVo.setIsCanEdit(false);
                 billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
             } else {
                 billApplicationIInfoVo.setIsCanEdit(true);
-            }
+            }*/
+            billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
+            billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         }
         return null;
     }