diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java index febedd5..b04e12f 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java @@ -21,8 +21,6 @@ import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.emis.domain.EmisDestination; import com.xdadan.erp.emis.domain.EmisSite; import com.xdadan.erp.emis.service.IEmisSiteService; -import com.xdadan.erp.wms.domain.WmsWarehouse; -import com.xdadan.erp.wms.service.IWmsWarehouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -41,8 +39,6 @@ import java.util.Map; @RequestMapping("/apiweb/wmsWarehouse") public class WmsWarehouseController extends BaseController { - @Autowired - private IWmsWarehouseService wmsWarehouseService; @Autowired private IEmisSiteService emisSiteService; @@ -54,8 +50,8 @@ public class WmsWarehouseController extends BaseController @JacksonFilter(include= { "code","name","contact", "tel","address", - },value= WmsWarehouse.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - public TableDataInfo listWmsWarehouse(WmsWarehouse wmsWarehouse) + },value= Map.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + public TableDataInfo listWmsWarehouse(EmisSite emisSite) { // "code": "仓库编码", @@ -66,15 +62,6 @@ public class WmsWarehouseController extends BaseController startPage(); - // 使用网点作为仓库 - EmisSite emisSite = new EmisSite(); - emisSite.setSearchValue(wmsWarehouse.getSearchValue()); - -// String transLine= MapUtil.getStr(wmsWarehouse.getParams(),"transLine"); -// emisSite.setTransTypeId(transLine); - - emisSite.setParams(wmsWarehouse.getParams()); - List list = emisSiteService.selectEmisSiteListAsWarehouse(emisSite); return getDataTable(list);