Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -637,12 +637,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
                         }
                         stkInStock.setFInStockEntry(fInStockEntry);
-                        //推送财务供应商信息
-                        BdSupplier bdSupplier = new BdSupplier();
-                        bdSupplier.setFName(sysOrganizationDC.getName());
-                        bdSupplier.setFLocMobile("13333333333");
-                        bdSupplier.setFNumber(otherCodeDC);
-                        bdSupplier.setFUseOrgId(orgCodeDR);
                         //推送车辆入库查询
                         ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
                         scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date()));
@@ -674,6 +668,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         if (!save.getSuccess()) {
                             return rb.setMsg("采购入库单查询推送失败");
                         }
+                        //推送财务供应商信息
+                        BdSupplier bdSupplier = new BdSupplier();
+                        bdSupplier.setFName(sysOrganizationDC.getName());
+                        bdSupplier.setFLocMobile("13333333333");
+                        bdSupplier.setFNumber(otherCodeDC);
+                        bdSupplier.setFUseOrgId(orgCodeDR);
                         finKingDeeFeign.draftBdSupplier(bdSupplier);
                         finKingDeeFeign.draftStkInStock(stkInStock);
                     }

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

@@ -45,6 +45,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
+import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
@@ -1010,7 +1011,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(appDto.getContractNo()).getData();
-        if ("2".equals(busSalesOrder.getFinancePlan())) {
+        if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(appDto.getContractNo(), baseVehicle.getSid()).getData();
             String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
             if (StringUtils.isNotBlank(otherReceivableMoney)) {
@@ -1653,6 +1654,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
                 finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
             }
+            //推送其他应收单
+            for (BaseVehicleZSOutDto zcDto : zcDtos) {
+                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto);
+                if (otherReceivable != null){
+                    finKingDeeFeign.draftOtherReceivableBill(otherReceivable);
+                }
+            }
         }
         //推送销售专员信息
         BDEmpinfo bdEmpinfo = new BDEmpinfo();
@@ -1717,6 +1725,32 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
+    private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto) {
+        OtherReceivable otherReceivableOne = new OtherReceivable();
+        otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo());
+        otherReceivableOne.setCommUnit(zcDto.getCwCustomerNo());
+        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getCreateOrgSid()).getData();
+        otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+        otherReceivableOne.setBussDate(DateUtil.formatDate(new Date()));
+        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoListOne = new ArrayList<>();
+        OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto();
+        SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData();
+        collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode());
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
+        if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
+            String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
+            if (StringUtils.isNotBlank(otherReceivableMoney)) {
+                collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
+            }else {
+                return null;
+            }
+        }
+        collectionDetailDtoListOne.add(collectionDetailDtoOne);
+        otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne);
+        return otherReceivableOne;
+    }
+
     private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
@@ -1858,7 +1892,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 }
             }
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
-            if ("2".equals(busSalesOrder.getFinancePlan())) {
+            if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicle.getSid()).getData();
                 String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
                 if (StringUtils.isNotBlank(otherReceivableMoney)) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -337,10 +337,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             } else {
                 vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
             }
-            String[] updateDates = updateDate.split("-");
+            if (StringUtils.isNotBlank(updateDate)){
-            String[] nowDates = nowDate.split("-");
+                String[] updateDates = updateDate.split("-");
-            if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])) {
+                String[] nowDates = nowDate.split("-");
-                vo.setIsNow(true);
+                if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])) {
+                    vo.setIsNow(true);
+                }
             }
         }
         List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java

@@ -11,4 +11,10 @@ public class AppLoanHomeVisitInvestigateDetailsVo implements Vo {
 
     @ApiModelProperty("用户信息")
     private List<AppFinanceForm> userInfo;
+    @ApiModelProperty("营运经历")
+    private List<AppFinanceForm> yYInfo;
+    @ApiModelProperty("运输信息")
+    private List<AppFinanceForm> transInfo;
+    @ApiModelProperty("资产情况")
+    private List<AppFinanceForm> zCInfo;
 }