diff --git a/yxt-as-ui/src/api/goods/brand.js b/yxt-as-ui/src/api/goods/brand.js index 1b293b6961..a7c2bd124d 100644 --- a/yxt-as-ui/src/api/goods/brand.js +++ b/yxt-as-ui/src/api/goods/brand.js @@ -18,8 +18,11 @@ export default { getAllBrand: function(params) { return request({ url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll', - method: 'get', - data: params, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/yxt-as-ui/src/api/goods/category.js b/yxt-as-ui/src/api/goods/category.js index 48e502ec03..d938333e85 100644 --- a/yxt-as-ui/src/api/goods/category.js +++ b/yxt-as-ui/src/api/goods/category.js @@ -18,8 +18,11 @@ export default { getAllType: function(params) { return request({ url: '/yxtbase/apiadmin/base/basegoodstype/listAll', - method: 'get', - data: params, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/yxt-as-ui/src/api/goods/factory.js b/yxt-as-ui/src/api/goods/factory.js index fa9bbf5d03..6f07cbee62 100644 --- a/yxt-as-ui/src/api/goods/factory.js +++ b/yxt-as-ui/src/api/goods/factory.js @@ -18,8 +18,11 @@ export default { getAllFacturer: function(params) { return request({ url: '/yxtbase/apiadmin/base/basemanufacturer/listAll', - method: 'get', - data: params, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js index eaf2a98246..70a0206e8b 100644 --- a/yxt-as-ui/src/api/goods/unit.js +++ b/yxt-as-ui/src/api/goods/unit.js @@ -18,8 +18,11 @@ export default { getAllUnit: function(params) { return request({ url: '/yxtbase/apiadmin/base/basegoodsunit/listAll', - method: 'get', - data: params, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/yxt-as-ui/src/api/warehouse/warehouse.js b/yxt-as-ui/src/api/warehouse/warehouse.js index 05dd0193ec..e04753d56c 100644 --- a/yxt-as-ui/src/api/warehouse/warehouse.js +++ b/yxt-as-ui/src/api/warehouse/warehouse.js @@ -18,8 +18,8 @@ export default { getAllWarehouse: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'get', - data: params, + method: 'post', + data: params, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-as-ui/src/api/warehouse/warehouseArea.js b/yxt-as-ui/src/api/warehouse/warehouseArea.js index 6be8630a53..a47db53428 100644 --- a/yxt-as-ui/src/api/warehouse/warehouseArea.js +++ b/yxt-as-ui/src/api/warehouse/warehouseArea.js @@ -18,11 +18,11 @@ export default { getAllWarehousearea: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehousearea/listAll', - method: 'get', - data: params, - headers: { - 'Content-Type': 'application/json' - } + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/yxt-as-ui/src/api/warehouse/warehouseAreaType.js b/yxt-as-ui/src/api/warehouse/warehouseAreaType.js index 2d017d5d4c..d54f851ba1 100644 --- a/yxt-as-ui/src/api/warehouse/warehouseAreaType.js +++ b/yxt-as-ui/src/api/warehouse/warehouseAreaType.js @@ -19,8 +19,8 @@ export default { getAllWarehouseareatype: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseareatype/listAll', - method: 'get', - data: params, + method: 'post', + data: params, headers: { 'Content-Type': 'application/json' } @@ -29,10 +29,10 @@ export default { // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/' + sid + "/" + isEnable + }); }, diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java index 978f7850d7..3c14cc30be 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java @@ -30,7 +30,7 @@ public class WmsWarehouseAreaRest { return wmsWarehouseAreaService.listPage(pq); } @ApiOperation("查询所有的库区") - @GetMapping("/listAll") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query) { return wmsWarehouseAreaService.getAllType(query); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java index 2bacc304a7..a80c119f4d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java @@ -30,7 +30,7 @@ public class WmsWarehouseAreaTypeRest { return wmsWarehouseAreaTypeService.listPage(pq); } @ApiOperation("查询所有的") - @GetMapping("/listAll") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query) { return wmsWarehouseAreaTypeService.listAll(query); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java index b49f9c59f9..7d61a900df 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java @@ -31,7 +31,7 @@ public class WmsWarehouseInfoRest { return wmsWarehouseService.listPage(pq); } @ApiOperation("查询所有的仓库") - @GetMapping("/listAll") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query) { return wmsWarehouseService.listAll(query); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java index 59355556dc..29031fcd23 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java @@ -29,6 +29,6 @@ public interface WmsWarehouseInfoMapper extends BaseMapper { WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid); - @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus '1' ") + @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ") List listAll(@Param("useOrgSid") String useOrgSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java index 17e6726d28..4e2a65dcde 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java @@ -45,6 +45,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WmsWarehouseInfoQuery query = pq.getParams(); @@ -85,22 +86,23 @@ public class WmsWarehouseInfoService extends MybatisBaseService p = new PagerVo<>(); return rb.success().setData(p); } - if(StringUtils.isNotBlank(query.getName())){ - qw.like("w.warehouseName",query.getName()); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("w.warehouseName", query.getName()); } - if(StringUtils.isNotBlank(query.getCode())){ - qw.like("w.warehouseCode",query.getCode()); + if (StringUtils.isNotBlank(query.getCode())) { + qw.like("w.warehouseCode", query.getCode()); } - if(StringUtils.isNotBlank(query.getAddress())){ - qw.like("w.address",query.getAddress()); + if (StringUtils.isNotBlank(query.getAddress())) { + qw.like("w.address", query.getAddress()); } - qw.ne("w.isDelete",1); + qw.ne("w.isDelete", 1); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); } + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = ""; @@ -129,7 +131,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); - List list1=new ArrayList<>(); + List list = wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid", vo.getSid())); + List list1 = new ArrayList<>(); for (WmsWarehouseExtend wmsWarehouseExtend : list) { - WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo(); + WmsWarehouseExtendVo vo1 = new WmsWarehouseExtendVo(); BeanUtil.copyProperties(wmsWarehouseExtend, vo1); list1.add(vo1); } @@ -209,7 +211,6 @@ public class WmsWarehouseInfoService extends MybatisBaseService