Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java

@@ -75,4 +75,9 @@ public class CommonContractVo implements Vo {
     private String address;
     @ApiModelProperty("备注")
     private String remarks;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -637,7 +637,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             //调入部门全路径
             String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
             userQuery.setRoleSid(candidateGroups.get(0));
-            if (id.equals("Activity_08r04ow")) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
+            if (("Activity_08r04ow").equals(id)) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
                 userQuery.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
             }
             //else if (id.equals("Activity_02xqz9n")) {//判断下一环节是否为事业部副总经理审批(管辖调入方)

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -477,9 +477,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo());
             scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode());
             scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName());
-            BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData();
+            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey());
-            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
+            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleDto1.getManufSaleAccessName());
-            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
             scmApplyInboundVehQueryDto.setIunit("辆");
             scmApplyInboundVehQueryDto.setNum("1");
             scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice()));

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

@@ -109,6 +109,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         String payTypeKey = dto.getTypeKey();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
+        List<BdCustomer> bdCustomers = new ArrayList<>();
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        bdCustomer.setTOrgIds(data.getOrgCode());
+        //bdCustomer.setTOrgIds(data.getOrgCode());
         //判断车辆是否存在流程中的销售订单
         /*List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData();
         for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
@@ -122,22 +126,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //出库类型是否为全款车（001全款）
         if ("001".equals(payTypeKey)) {
             Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+            bdCustomer.setFNumber(dto.getCustomerNo());
             if (!aBoolean) {
-                List<BdCustomer> bdCustomers = new ArrayList<>();
+                //List<BdCustomer> bdCustomers = new ArrayList<>();
-                BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                if (data != null) {
-                    bdCustomer.setTOrgIds(data.getOrgCode());
-                } else {
-                    bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                }
                 bdCustomer.setFName(dto.getCustomerName() + dto.getMobile());
-                bdCustomer.setFNumber(dto.getCustomerNo());
                 //bdCustomer.setFShortName(dto.getConcatNo());
-                bdCustomers.add(bdCustomer);
+                //bdCustomers.add(bdCustomer);
-                finKingDeeFeign.draftBdCustomers(bdCustomers);
+                //finKingDeeFeign.draftBdCustomers(bdCustomers);
-                dto.setCwCustomerNo(bdCustomer.getFNumber());
+                //dto.setCwCustomerNo(bdCustomer.getFNumber());
-            } else {
-                dto.setCwCustomerNo(dto.getCustomerNo());
             }
         } else {
             String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
@@ -157,13 +153,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     if (!aBoolean1) {
                         Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
                         if (!aBoolean2) {
-                            List<BdCustomer> bdCustomers = new ArrayList<>();
-                            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                            if (data != null) {
-                                bdCustomer.setTOrgIds(data.getOrgCode());
-                            } else {
-                                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                            }
                             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
                             String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
                             if (FNumber1.length() > 30) {
@@ -173,9 +162,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                                 bdCustomer.setFNumber(FNumber1);
                             }
                             bdCustomer.setFShortName(dto.getConcatNo());
-                            bdCustomers.add(bdCustomer);
+                            //bdCustomers.add(bdCustomer);
-                            finKingDeeFeign.draftBdCustomers(bdCustomers);
+                            //finKingDeeFeign.draftBdCustomers(bdCustomers);
-                            dto.setCwCustomerNo(bdCustomer.getFNumber());
+                            //dto.setCwCustomerNo(bdCustomer.getFNumber());
                         } else {
                             b = true;
                             return rb.success().setData(b);
@@ -190,13 +179,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 } else {
                     Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
                     if (!aBoolean1) {
-                        List<BdCustomer> bdCustomers = new ArrayList<>();
-                        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                        if (data != null) {
-                            bdCustomer.setTOrgIds(data.getOrgCode());
-                        } else {
-                            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                        }
                         bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
                         String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
                         if (FNumber1.length() > 30) {
@@ -206,29 +188,21 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                             bdCustomer.setFNumber(FNumber1);
                         }
                         bdCustomer.setFShortName(dto.getConcatNo());
-                        bdCustomers.add(bdCustomer);
+                        //bdCustomers.add(bdCustomer);
-                        finKingDeeFeign.draftBdCustomers(bdCustomers);
+                        //finKingDeeFeign.draftBdCustomers(bdCustomers);
-                        dto.setCwCustomerNo(bdCustomer.getFNumber());
+                        //dto.setCwCustomerNo(bdCustomer.getFNumber());
                     } else {
                         b = true;
                         return rb.success().setData(b);
                     }
                 }
-            } else {
-                dto.setCwCustomerNo(FNumber);
             }
             //修改客户简称为合同编号
-            List<BdCustomer> bdCustomers = new ArrayList<>();
+            //List<BdCustomer> bdCustomers = new ArrayList<>();
             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
             bdCustomer.setFShortName(dto.getConcatNo());
             bdCustomer.setFNumber(FNumber);
             bdCustomer.setOldFNumber(FNumber);
-            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-            if (data != null) {
-                bdCustomer.setTOrgIds(data.getOrgCode());
-            } else {
-                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-            }
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.saveBdCustomers(bdCustomers);
         }
@@ -343,6 +317,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(bdCustomer.getFNumber())) {
                 dto.setCustomerNo(bdCustomer.getFNumber());
             }
+            bdCustomers.add(bdCustomer);
+            finKingDeeFeign.draftBdCustomers(bdCustomers);
+            dto.setCwCustomerNo(bdCustomer.getFNumber());
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
             log.info("BaseVehicleOutService-vehicleOut-287:{}", JSONObject.toJSONString(salOutStock));
             finKingDeeFeign.draftSalOutStock(salOutStock);
@@ -354,14 +331,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             bdEmpinfo.setFName(dto.getStaffName());
             bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
             bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
-            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+            bdEmpinfo.setFCreateOrgId(data.getOrgCode());
-            if (data != null) {
+            bdEmpinfo.setFUseOrgId(data.getOrgCode());
-                bdEmpinfo.setFCreateOrgId(data.getOrgCode());
-                bdEmpinfo.setFUseOrgId(data.getOrgCode());
-            } else {
-                bdEmpinfo.setFCreateOrgId(sysOrganizationVo.getOrgCode());
-                bdEmpinfo.setFUseOrgId(sysOrganizationVo.getOrgCode());
-            }
             bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
             finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
         } catch (Exception e) {
@@ -523,6 +494,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             finKingDeeFeign.draftBdCustomers(bdCustomers);
         }
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(dto.getVinSid());
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
@@ -601,6 +573,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOutApply.setSaleTypeValue(dto.getType());
         baseVehicleOutApply.setCreateOrgSid(dto.getCreateOrgSid());
         baseVehicleOutApply.setCreateBySid(dto.getCreateBySid());
+        //内部引荐人、内部引荐人sid
+        baseVehicleOutApply.setInnerName(dto.getInnerName());
+        baseVehicleOutApply.setInnerUserSid(dto.getInnerUserSid());
         //保存车辆出库单主表
         baseVehicleOutApplyService.save(baseVehicleOutApply);
         //出库单子表关联主表sid
@@ -631,6 +606,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(bdCustomer.getFNumber())) {
                 dto.setCustomerNo(bdCustomer.getFNumber());
             }
+            bdCustomers.add(bdCustomer);
+            finKingDeeFeign.draftBdCustomers(bdCustomers);
+            dto.setCwCustomerNo(bdCustomer.getFNumber());
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
             log.info("BaseVehicleOutService-vehicleOut-287:{}", JSONObject.toJSONString(salOutStock));
             finKingDeeFeign.draftSalOutStock(salOutStock);
@@ -642,14 +620,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             bdEmpinfo.setFName(dto.getStaffName());
             bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
             bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
-            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+            bdEmpinfo.setFCreateOrgId(data.getOrgCode());
-            if (data != null) {
+            bdEmpinfo.setFUseOrgId(data.getOrgCode());
-                bdEmpinfo.setFCreateOrgId(data.getOrgCode());
-                bdEmpinfo.setFUseOrgId(data.getOrgCode());
-            } else {
-                bdEmpinfo.setFCreateOrgId(sysOrganizationVo.getOrgCode());
-                bdEmpinfo.setFUseOrgId(sysOrganizationVo.getOrgCode());
-            }
             bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
             finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
         } catch (Exception e) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -44,7 +44,9 @@
         DATE_FORMAT(createDate,'%Y-%m-%d') as createDate,
         address,
         remarks,
-        partyC
+        partyC,
+        procDefId,
+        procInstId
         FROM common_contract ${ew.customSqlSegment}
     </select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1452,6 +1452,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 commonContract.setIdImagesUrl(s3.substring(0, s3.length() - 1));
             }
         }
+        if(StringUtils.isNotBlank(dto.getPartyC())){
+            commonContract.setPartyC(dto.getPartyC());
+        }
+        if(StringUtils.isNotBlank(dto.getRemarks())){
+            commonContract.setRemarks(dto.getRemarks());
+        }
         baseMapper.updateById(commonContract);
         return rb.success().setData(commonContract.getSid());
     }
@@ -2488,6 +2494,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         CommonContractsVo commonContractsVo = new CommonContractsVo();
         BeanUtil.copyProperties(commonContract,commonContractsVo,"sid");
         commonContractsVo.setContractSid(commonContract.getSid());
+        commonContractsVo.setCreateDate(DateUtil.format(commonContract.getCreateDate(),"yyyy-MM-dd"));
         String urlPrefix = fileUploadComponent.getUrlPrefix();
         if (StringUtils.isNotBlank(commonContract.getAppdixUrl())) {
             String[] split1 = commonContract.getAppdixUrl().split(",");

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

@@ -166,7 +166,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                         listVo.setEntrustImage(strings);
                     }
                     //根据销售订单
-                    if (!busSalesOrder.getCustomerName().equals(listVo.getName())) {
+                    if (!busSalesOrder.getCustomerName().equals(listVo.getName()) && !busSalesOrder.getMobile().equals(listVo.getMobile())) {
                         listVo.setShowImage(true);
                     } else {
                         listVo.setShowImage(false);
@@ -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.getCustomerName().equals(busDeposit.getDraweeName()) && !busSalesOrder.getMobile().equals(busDeposit.getDraweeMobile())) {
-                        if(busSalesOrder.getMobile().equals(busDeposit.getDraweeMobile())){
+                        if (listDto.getEntrustImage().isEmpty()) {
-                            if (listDto.getEntrustImage().isEmpty()) {
+                            return rb.setMsg("选择的虚拟订金单中有付款人与该客户不一致，请上传款项支付委托书");
-                                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/scmapplyinboundquery/ScmApplyInboundQueryRest.java

@@ -71,8 +71,8 @@ public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
 	@PostMapping("/save")
 	public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto){
 		ResultBean rb = ResultBean.fireFail();
-		scmApplyInboundQueryService.saveOrUpdateDto(dto);
+		String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
-		return rb.success();
+		return rb.success().setData(sid);
 	}
 
 	@Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -284,7 +284,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
                 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey()) ||
                         ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
                     //车辆类型-厂家外采和调车
-                    sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
+                    sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeKey());
                     sf.setCllxType("sellChannel");
                     //填充直接调拨单物料列表数据
                     StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();

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;
 
 
 }