优化

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

@@ -4461,6 +4461,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<BusSalesOrderDetailsVo> resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid());
         BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData();
         billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
+        if("1".equals(busSalesOrder.getPayTypeKey())){
+            billApplicationIInfoVoss.setIsCanEdit(true);
+        }else{
+            billApplicationIInfoVoss.setIsCanEdit(false);
+        }
         //开票单位
         if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
             ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());

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

@@ -189,10 +189,9 @@ public class InvoicedService {
             String userSid = query.getUserSid();
             String orgPath = query.getOrgPath();
             List<String> vins = query.getVins();
-            /*if(vins.size() == 0){
+            if(vins.size() == 0){
                 return rb.setMsg("请选择车辆");
-            }*/
-            vins.add("84c5dfbd-935b-45a2-a7da-7aa3ff30e408");
+            }
             ResultBean<BillApplicationIInfoVoss> billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins);
             if(billApplicationIInfoVoResultBean.getData() != null){
                 BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData();
@@ -231,6 +230,9 @@ public class InvoicedService {
         vo.setContractId(finBillApplicationDetailsVo.getContractNo());
         vo.setDate(finBillApplicationDetailsVo.getApplyDate());
         vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        if("1".equals(finBillApplicationDetailsVo.getShowBtnStr())){
+            vo.setShowBtn(true);
+        }
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
         //根据合同查询销售订单
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();