diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java index 6c375289ee..14891ca9ae 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java @@ -89,7 +89,7 @@ public interface ScmVehInventorymonthFeign { public ResultBean> getCarInventoryReportList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-获取盘库报告") - @GetMapping("/getCarInventoryReport/{sid}") + @GetMapping("/getCarInventoryReport/{sid}/{userSid}") @ResponseBody - public ResultBean getCarInventoryReport(@PathVariable("sid") String sid); + public ResultBean getCarInventoryReport(@PathVariable("sid") String sid,@PathVariable("userSid")String userSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java index 1c53a5f3d1..8630b202df 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java @@ -29,6 +29,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -81,7 +82,7 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe } @Override - public ResultBean getCarInventoryReport(String sid) { + public ResultBean getCarInventoryReport(String sid,String userSid) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java index 9c2e69d87f..b75907c0c6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java @@ -91,8 +91,8 @@ public interface ScmVehPatrolinspectionmonthFeign { public ResultBean> getCarInspectionReportList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-获取巡检报告") - @GetMapping("/getCarInspectionReport/{sid}") + @GetMapping("/getCarInspectionReport/{sid}/{userSid}") @ResponseBody - public ResultBean getCarInspectionReport(@PathVariable("sid") String sid); + public ResultBean getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java index 5f3a092a9e..c7115c89fb 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java @@ -81,7 +81,7 @@ public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolins } @Override - public ResultBean getCarInspectionReport(String sid) { + public ResultBean getCarInspectionReport(String sid,String userSid) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java index 0240c5437d..6e88f934f5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java @@ -115,7 +115,7 @@ public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign { } @Override - public ResultBean getCarInventoryReport(String sid) { - return scmVehInventorymonthService.getCarInventoryReport(sid); + public ResultBean getCarInventoryReport(String sid,String userSid) { + return scmVehInventorymonthService.getCarInventoryReport(sid,userSid); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index 4693e52bcf..89ec59bc96 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -281,11 +281,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService getCarInventoryReport(String sid) { + public ResultBean getCarInventoryReport(String sid,String userSid) { ResultBean rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo(); AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid); - List recipientListVos = scmVehInventoryreportService.selectByMainSid(); + List recipientListVos = scmVehInventoryreportService.selectByMainSid(userSid); if (recipientListVos.size() > 0) { if (StringUtils.isNotBlank(recipientListVos.get(0).getName())) { List list = new ArrayList<>(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java index ac16b969d2..bb6759712d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java @@ -64,6 +64,6 @@ public interface ScmVehInventoryreportMapper extends BaseMapper selectListVo(); - @Select("select receiverSids as sid, receiverNames as name from scm_veh_inventoryreport order by id desc") - List selectByMainSid(); + @Select("select receiverSids as sid, receiverNames as name from scm_veh_inventoryreport where createBySid=#{userSid} order by id desc") + List selectByMainSid(String userSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java index 35ada0caad..9d3219bcf9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java @@ -144,7 +144,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService recipientList = dto.getRecipientList(); @@ -156,6 +156,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService receiveIdList = new ArrayList<>(); for (RecipientListDto recipientListDto : recipientList) { @@ -241,7 +242,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService selectByMainSid() { - return baseMapper.selectByMainSid(); + public List selectByMainSid(String userSid) { + return baseMapper.selectByMainSid(userSid); } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java index e883d1dc9c..675aec5e00 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthRest.java @@ -114,7 +114,7 @@ public class ScmVehPatrolinspectionmonthRest implements ScmVehPatrolinspectionmo } @Override - public ResultBean getCarInspectionReport(String sid) { - return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid); + public ResultBean getCarInspectionReport(String sid,String userSid) { + return scmVehPatrolinspectionmonthService.getCarInspectionReport(sid,userSid); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java index fc0ba1c3a6..f07aaf326b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java @@ -364,15 +364,16 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService getCarInspectionReport(String sid) { + public ResultBean getCarInspectionReport(String sid,String userSid) { ResultBean rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo(); AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid); if (appScmVehInventorymonthInfoVo != null) { vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient()); vo.setDate(appScmVehInventorymonthInfoVo.getDate()); } - List appLiableListVos = scmVehPatrolinspectionreportService.selectByMainSid(); + List appLiableListVos = scmVehPatrolinspectionreportService.selectByMainSid(userSid); if (appLiableListVos.size() > 0) { if (StringUtils.isNotBlank(appLiableListVos.get(0).getLiableName())) { List list = new ArrayList<>(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java index 9b965d99d3..2868446086 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java @@ -64,6 +64,6 @@ public interface ScmVehPatrolinspectionreportMapper extends BaseMapper selectListVo(); - @Select("select receiverSids as liableSid, receiverNames as liableName from scm_veh_patrolinspectionreport order by id desc") - List selectByMainSid(); + @Select("select receiverSids as liableSid, receiverNames as liableName from scm_veh_patrolinspectionreport where createBySid = #{userSid} order by id desc") + List selectByMainSid(@Param("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java index fb3599d1a2..33c15774dd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java @@ -181,6 +181,7 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService selectByMainSid() { - return baseMapper.selectByMainSid(); + public List selectByMainSid(String userSid) { + return baseMapper.selectByMainSid(userSid); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java index b58aae1904..e59451252a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java @@ -67,9 +67,9 @@ public interface AppScmVehiclePatrolinspectionFeign { public ResultBean> getCarInspectionReportList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-获取巡检报告") - @GetMapping("/getCarInspectionReport/{sid}") + @GetMapping("/getCarInspectionReport/{sid}/{userSid}") @ResponseBody - public ResultBean getCarInspectionReport(@PathVariable("sid") String sid); + public ResultBean getCarInspectionReport(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid); @ApiOperation("发送报告") @PostMapping("/sendReport") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java index cd55071bed..388b3450ab 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java @@ -58,7 +58,7 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle } @Override - public ResultBean getCarInspectionReport(String sid) { + public ResultBean getCarInspectionReport(String sid,String userSid) { return null; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java index c20c39ceb3..07ad82e6e4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java @@ -100,9 +100,9 @@ public interface AppScmVehicleInventoryFeign { public ResultBean> getCarInventoryReportList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-获取盘库报告") - @GetMapping("/getCarInventoryReport/{sid}") + @GetMapping("/getCarInventoryReport/{sid}/{userSid}") @ResponseBody - public ResultBean getCarInventoryReport(@PathVariable("sid") String sid); + public ResultBean getCarInventoryReport(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); @ApiOperation("发送报告") @PostMapping("/sendReport") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java index a9e337da50..6d4584c781 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java @@ -46,58 +46,58 @@ import org.springframework.stereotype.Component; @Component public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInventoryFeign { - @Override - public ResultBean getInventoryRecords(String userSid) { - return null; - } + @Override + public ResultBean getInventoryRecords(String userSid) { + return null; + } - @Override - public ResultBean> getInventoryList(PagerQuery pagerQuery) { - return null; - } + @Override + public ResultBean> getInventoryList(PagerQuery pagerQuery) { + return null; + } - @Override - public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { - return null; - } + @Override + public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { + return null; + } - @Override - public ResultBean getInventory(String recordSid) { - return null; - } + @Override + public ResultBean getInventory(String recordSid) { + return null; + } - @Override - public ResultBean getInventoryByRecordSid(String recordSid) { - return null; - } + @Override + public ResultBean getInventoryByRecordSid(String recordSid) { + return null; + } - @Override - public ResultBean saveInventory (StayInventoryDto dto) { - return null; - } + @Override + public ResultBean saveInventory(StayInventoryDto dto) { + return null; + } - @Override - public ResultBean saveInventoryByRecordSid(StayInventoryDto dto) { - return null; - } + @Override + public ResultBean saveInventoryByRecordSid(StayInventoryDto dto) { + return null; + } - @Override - public ResultBean getInventoryInfo(String recordSid) { - return null; - } + @Override + public ResultBean getInventoryInfo(String recordSid) { + return null; + } - @Override - public ResultBean> getCarInventoryReportList(PagerQuery pagerQuery) { - return null; - } + @Override + public ResultBean> getCarInventoryReportList(PagerQuery pagerQuery) { + return null; + } - @Override - public ResultBean getCarInventoryReport(String sid) { - return null; - } + @Override + public ResultBean getCarInventoryReport(String sid, String userSid) { + return null; + } - @Override - public ResultBean sendReport(VehInventoryreportDto dto) { - return null; - } + @Override + public ResultBean sendReport(VehInventoryreportDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java index 79c93cca6f..1285089ff4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java @@ -67,8 +67,8 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins } @Override - public ResultBean getCarInspectionReport(String sid) { - return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid); + public ResultBean getCarInspectionReport(String sid,String userSid) { + return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid,userSid); } @Override diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java index 4f6d44093f..549b8cad4a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java @@ -155,10 +155,10 @@ public class AppScmVehiclePatrolinspectionService { return rb.success().setData(vo); } - public ResultBean getCarInspectionReport(String sid) { + public ResultBean getCarInspectionReport(String sid, String userSid) { ResultBean rb = ResultBean.fireFail(); VehPatrolinspectionmonthInfoVo vo = new VehPatrolinspectionmonthInfoVo(); - ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid); + ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getCarInspectionReport(sid, userSid); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java index df2efab410..7bf784eabc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java @@ -108,8 +108,8 @@ public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign { } @Override - public ResultBean getCarInventoryReport(String sid) { - return appScmVehicleInventoryService.getCarInventoryReport(sid); + public ResultBean getCarInventoryReport(String sid,String userSid) { + return appScmVehicleInventoryService.getCarInventoryReport(sid,userSid); } @Override diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java index 6a43ca848d..8d6577ac34 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java @@ -215,10 +215,10 @@ public class AppScmVehicleInventoryService { * @param sid * @return */ - public ResultBean getCarInventoryReport(String sid) { + public ResultBean getCarInventoryReport(String sid,String userSid) { ResultBean rb = ResultBean.fireFail(); VehInventorymonthInfoVo vo = new VehInventorymonthInfoVo(); - ResultBean resultBean = scmVehInventorymonthFeign.getCarInventoryReport(sid); + ResultBean resultBean = scmVehInventorymonthFeign.getCarInventoryReport(sid,userSid); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); }