修改问题

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java

@@ -40,4 +40,7 @@ public class AppBusSalesOrderDepositVo implements Vo {
     private String payDepositDaysValue;
     @ApiModelProperty("是否支持期限的功能：true是支持，false不支持")
     private boolean supportPayDepositDays;
+
+    @ApiModelProperty("模板下载")
+    private String downLoadUrl;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppDepositListVo.java

@@ -35,4 +35,7 @@ public class AppDepositListVo implements Vo {
     private String usePeposit;
     @ApiModelProperty(value = "剩余金额")
     private String remainderMoney;
+
+    @ApiModelProperty("下载模板")
+    private String downLoadUrl;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1532,10 +1532,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ResultBean<CommonContract> commonContractResultBean = commonContractFeign.getContractByBusSid(record.getSaleOrderSid());
                 if (commonContractResultBean.getSuccess()) {
                     CommonContract commonContract = commonContractResultBean.getData();
-                    if ("已办结".equals(commonContract.getNodeState())) {
+                   /* if ("已办结".equals(commonContract.getNodeState())) {
                         record.setShowInputBtn(true);
                     } else {
                         record.setShowInputBtn(false);
+                    }*/
+                    if(commonContract == null){
+                        record.setShowInputBtn(false);
+                    }else{
+                        record.setShowInputBtn(true);
                     }
                 }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -197,6 +197,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         }else{
             vo.setSupportPayDepositDays(true);
         }
+        String fils = fileUploadComponent.getUrlPrefix()+"款项确认书.docx";
+        vo.setDownLoadUrl(fils);
         return rb.success().setData(vo);
     }
 
@@ -251,11 +253,9 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     }
                     //查询付款人是否和客户一样
                     BusDeposit busDeposit = busDepositService.selectByBillSid(listDto.getDepositBillSid());
-                    if (!busSalesOrder.getCustomerName().equals(busDeposit.getDraweeName())) {
-                        if(busSalesOrder.getMobile().equals(busDeposit.getDraweeMobile())){
-                            if (listDto.getEntrustImage().isEmpty()) {
-                                return rb.setMsg("选择的虚拟订金单中有付款人与该客户不一致，请上传款项支付委托书");
-                            }
+                    if (!busSalesOrder.getCustomerName().equals(busDeposit.getDraweeName()) && !busSalesOrder.getMobile().equals(busDeposit.getDraweeMobile())) {
+                        if (listDto.getEntrustImage().isEmpty()) {
+                            return rb.setMsg("选择的虚拟订金单中有付款人与该客户不一致，请上传款项支付委托书");
                         }
                     }
                     makeUpDecimal = makeUpDecimal.add(new BigDecimal(listDto.getPrice()));
@@ -376,6 +376,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                         vo.setUsePeposit("0");
                     }
                 }
+                String downUrl = fileUploadComponent.getUrlPrefix()+"款项确认书.docx";
+                vo.setDownLoadUrl(downUrl);
             }
         }
         PagerVo<AppDepositListVo> p = PagerUtil.pageToVo(pagging, null);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -873,6 +873,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         vo.setPayFiles(payFiles);
         vo.setUserSid(query.getUserSid());
+        String fils = fileUploadComponent.getUrlPrefix()+"款项确认书.docx";
+        vo.setDownLoadUrl(fils);
         return rb.success().setData(vo);
     }
 

anrui-fin/anrui-fin-biz/src/main/resources/file/款项确认书.docx

@@ -0,0 +1,12 @@
+                                款项确认书
+_________________公司：
+  本司（本人）_________________________于___年___月___日汇
+入贵公司或或贵公司授权的微信/支付宝/账户的款项_________元，大写:_____________________,该款项是代___________身份证号：垫
+付的______款，车架号是___________________,现进行确认，由此引起的经济纠纷由本司（本人）全权负责。
+
+
+            本司（本人）签章：
+            
+                      年   月   日
+
+个人身份证号：

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
@@ -34,7 +33,6 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
@@ -46,12 +44,9 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
-import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.enums.VehicleState;
@@ -62,11 +57,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
-import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
-import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
@@ -526,7 +517,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     // 判断是否是调入 调出
                     if (internalPurchaseDetailsVo.getBuyerOrgSid().equals(vehicleDetailsVo.getFreightUndertakerSid())) {
                         // 是 获取运费
-                        baseVehicleDto.setFreight(Integer.valueOf(vehicleDetailsVo.getFreight()));
+                        if(StringUtils.isNotBlank(vehicleDetailsVo.getFreight())){
+                            baseVehicleDto.setFreight(Integer.valueOf(vehicleDetailsVo.getFreight()));
+                        }
                     } else {
                         // 否 运费默认为 0
                         baseVehicleDto.setFreight(0);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java

@@ -37,5 +37,7 @@ public class DepositInfoVo implements Vo {
     private String payDepositDaysValue;
     @ApiModelProperty("是否支持期限的功能：true是支持，false不支持")
     private boolean supportPayDepositDays;
+    @ApiModelProperty("模板下载")
+    private String downLoadUrl;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositListVo.java

@@ -31,6 +31,8 @@ public class DepositListVo implements Vo {
     private String usePeposit;
     @ApiModelProperty(value = "剩余金额")
     private String remainderMoney;
+    @ApiModelProperty("下载模板")
+    private String downLoadUrl;
 
 
 }