diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 63b71f5..3dcc922 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -209,4 +209,23 @@ public class InvSubWarehouseController { return ResultVOUtils.success(); } + //------------------------------------------UDIMS接口----------------------------------------------------------- + + /** + * UDIMS查询分仓接口 + * + * @param invCode + * @return + */ + @GetMapping("/spms/sub/inv/warehouse/getSubInvForUdims") + public BaseResponse getSubInvForUdims(String invCode) { + if (StrUtil.isBlank(invCode)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + filterInvSubWarehouseRequest.setParentId(invCode); + List invSubWarehouseEntities = invSubWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); + return ResultVOUtils.success(invSubWarehouseEntities); + } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index b50a6c8..aed770d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -1,6 +1,5 @@ package com.glxp.sale.admin.controller.inventory; -import cn.hutool.Hutool; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ReflectUtil; @@ -10,11 +9,8 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; -import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; -import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; @@ -22,14 +18,11 @@ import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.ThrSubInvWarehouseEntity; import com.glxp.sale.admin.req.basic.BasicExportStatusRequest; -import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.sale.admin.req.basic.UdimsFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse; @@ -510,4 +503,18 @@ public class InvWarehouseController { } + //------------------------------------------UDIMS接口----------------------------------------------------------- + + /** + * 查询供应商使用的仓库 + * + * @return + */ + @GetMapping("/spms/inv/warehouse/filterInv/forUdims") + public BaseResponse getInvWarehouseForUdims() { + List invWarehouseEntities = invWarehouseService.getInvWarehouseForUdims(); + return ResultVOUtils.success(invWarehouseEntities); + } + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java index 8a157f4..4bd6ad6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java @@ -69,4 +69,12 @@ public interface InvWarehouseService { * @return */ String getInvName(String code); + + /** + * UDIMS查询仓库接口 + * + * @return + */ + List getInvWarehouseForUdims(); + } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java index 9bc8ea1..a060d4c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java @@ -235,4 +235,13 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { } return invWarehouseDao.getNameByCode(code); } + + @Override + public List getInvWarehouseForUdims() { + //查询供应商可使用的仓库 + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setSpUse(true); + List invWarehouseEntities = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest); + return invWarehouseEntities; + } }