diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index 457b91f709..9aaf8857f6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -25,16 +25,14 @@ *********************************************************/ package com.yxt.anrui.base.api.basevehicletempstate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: comc(comc)
* File: BaseVehicleTempstateFeign.java
@@ -79,5 +77,5 @@ public interface BaseVehicleTempstateFeign { @ApiOperation("根据业务sid删除记录") @DeleteMapping("/delByBusSid") @ResponseBody - public ResultBean delByBusSid(String businessSid); + public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 122a9b28fe..6b4d8fb584 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -543,8 +543,8 @@ public class ScmApplyInboundService extends MybatisBaseService bdMaterials= createBdMaterialList(scmApplyInbound,scmApplyInboundVehicleDtos); ResultBean r = finKingDeeFeign.draftBdMaterialList(bdMaterials);*/ - StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos); - ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock); + /*StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos); + ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);*/ } catch (Exception e) { //return rb.setMsg("入账推送金蝶系统的应付单接口报错,主数据sid:" + scmApplyInbound.getSid()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index fac3cd4cbb..90913744b8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -850,6 +850,7 @@ public class ScmVehicleGressionService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); @@ -872,7 +873,6 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + + }else{ //推送车辆台账数据 VehicleGression vehicleGression = new VehicleGression(); List list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid()); @@ -926,6 +928,8 @@ public class ScmVehicleGressionService extends MybatisBaseService