diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index d848f9f8c..23d50ccd0 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -147,11 +147,12 @@ public class EmisTmsScanRecordController extends EmisBaseController @GetMapping("/getNextStationList") @JacksonFilter(include= {"startSite","destSite","startSiteName","destSiteName"},value= EmisTmsTransPlanDtl.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - public TableDataInfo getNextStationList(String searchValue) + public TableDataInfo getNextStationList(String searchValue,String transType) { startPage(); EmisTmsTransPlanDtl queryObj = new EmisTmsTransPlanDtl(); queryObj.setStartSite(getLoginUser().getUser().getOwnerSiteCode()); + queryObj.setTransType(transType); queryObj.getParams().put("searchValue",searchValue); List list = emisTmsTransPlanDtlService.selectPreOrNextSiteList(queryObj); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml index f9217e2d7..c3924114f 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml @@ -58,7 +58,7 @@ and step_name like concat('%', #{stepName}, '%') and FIND_IN_SET( #{startSite}, start_site ) and FIND_IN_SET( #{destSite}, dest_site ) - and trans_type=#{transType} + and FIND_IN_SET(trans_type,#{transType} ) and est_cost_day like concat('%', #{estCostDay}, '%') and order_num = #{orderNum} and status=#{status}