aike/emis-api-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-01 18:44:40 +08:00
parent d90368f6f0
commit 0046772f96
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java
View File

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