问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -308,14 +308,11 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             certificatePic.setAttachType("挂车合格证照片");
             commonAppendixService.saveOrUpdateDto(certificatePic);
         }
-        String cgrkdSid = pushGCRKInBoundQuery(baseTrailer);
-        scmApplyInboundQueryFeign.ctcgykd(cgrkdSid);
-        /*StkInStock stkInStock = new StkInStock();
+        pushGCRKInBoundQuery(baseTrailer);
+        StkInStock stkInStock = new StkInStock();
         stkInStock.setFBillNo(billNo);
         //入库日期:FDate  (必填项)
         stkInStock.setFDate(DateUtil.formatDate(new Date()));
-        String vehSid = dto.getVehSid();
-        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
         String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
         SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData();
         //采购部门:FPurchaseDeptId  (必填项)
@@ -355,7 +352,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             finKingDeeFeign.draftStkInStock(stkInStock);
         } catch (Exception e) {
             e.printStackTrace();
-        }*/
+        }
         return rb.success().setMsg("保存成功");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -145,14 +145,11 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
         dto.setBillNo(billNo);
         baseVehinstallService.saveOrUpdateDto(dto);
         if (StringUtils.isBlank(dto.getSid())) {
-            String cgrkdSid = pushSZRKInBoundQuery(dto);
-            scmApplyInboundQueryFeign.ctcgykd(cgrkdSid);
-            /*StkInStock stkInStock = new StkInStock();
+            pushSZRKInBoundQuery(dto);
+            StkInStock stkInStock = new StkInStock();
             stkInStock.setFBillNo(billNo);
             //入库日期:FDate  (必填项)
             stkInStock.setFDate(DateUtil.formatDate(new Date()));
-            //获取主车信息
-            BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, dto.getCreateOrg());
             //获取主车采购系统sid
             String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
             //根据采购系统sid获取部门组织信息
@@ -194,7 +191,7 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
                 finKingDeeFeign.draftStkInStock(stkInStock);
             } catch (Exception e) {
                 e.printStackTrace();
-            }*/
+            }
         }
         return rb.success();
     }

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

@@ -2035,8 +2035,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedService.fetchByCillSid(finCollectionConfirmationDetailsVo.getSid());
         Map<String, Object> dataMap = new HashMap();
         dataMap.put("collDate", finCollectionConfirmationDetailsVo.getCollectionDate());
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finCollectionConfirmationDetailsVo.getUseOrgSid()).getData();
-        dataMap.put("payee", sysOrganizationVo.getName());
+        dataMap.put("payee", finCollectionConfirmationDetailsVo.getPayerName());
         dataMap.put("billNo", finCollectionConfirmationDetailsVo.getBillNo());
         dataMap.put("settleType", finCollectionConfirmationDetailsVo.getCollectionTypeValue());
         dataMap.put("remarks", finCollectionConfirmationDetailsVo.getRemarks());