diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java index 537074a5..c63f833d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java @@ -9,8 +9,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.owner.vo.*; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainRespVO; import com.win.module.wms.convert.owner.OwnerConvert; +import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert; import com.win.module.wms.dal.dataobject.owner.OwnerDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.owner.OwnerService; import io.swagger.v3.oas.annotations.Operation; @@ -92,6 +95,13 @@ public class OwnerController { } return success(result); } + @GetMapping("/list") + @Operation(summary = "获得货主列表") + @PreAuthorize("@ss.hasPermission('wms:owner:query')") + public CommonResult> getOwnerList() { + List list = ownerService.getOwnerList(); + return success(OwnerConvert.INSTANCE.convertList(list)); + } @PostMapping("/senior") @Operation(summary = "高级搜索获得货主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index 712362d2..0ae07541 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -98,8 +98,8 @@ public class SupplierController { @GetMapping("/list") @Operation(summary = "获得供应商列表") @PreAuthorize("@ss.hasPermission('wms:supplier:query')") - public CommonResult> getSupplierList(@Valid SupplierExportReqVO exportReqVO) { - List list = supplierService.getSupplierList(exportReqVO); + public CommonResult> getSupplierList() { + List list = supplierService.getSupplierList(); return success(SupplierConvert.INSTANCE.convertList(list)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java index aca48ab5..b2ff12a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.mysql.owner; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; @@ -77,4 +78,9 @@ public interface OwnerMapper extends BaseMapperX { default List selectSeniorList(CustomConditions conditions) { return selectList(QueryWrapperUtils.structure(conditions)); } + default List selectAllList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); + return selectList(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java index 790d22ba..c24fabe8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java @@ -2,6 +2,7 @@ package com.win.module.wms.dal.mysql.supplier; import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; @@ -10,6 +11,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.supplier.vo.SupplierExportReqVO; import com.win.module.wms.controller.supplier.vo.SupplierPageReqVO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import org.apache.ibatis.annotations.Mapper; @@ -78,5 +80,10 @@ public interface SupplierMapper extends BaseMapperX { default List selectSeniorList(CustomConditions conditions) { return selectList(QueryWrapperUtils.structure(conditions)); } + default List selectAllList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); + return selectList(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java index e68ec09b..6a581170 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java @@ -45,7 +45,13 @@ public interface OwnerService { * @return 货主 */ OwnerDO getOwner(Long id); - + /** + * 获得货主列表 + * + * @param ids 编号 + * @return 货主列表 + */ + List getOwnerList(); /** * 获得货主列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java index 11a63c29..0890c4ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java @@ -16,6 +16,7 @@ import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.bom.BomDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; import com.win.module.wms.dal.mysql.owner.OwnerMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -73,6 +74,10 @@ public class OwnerServiceImpl implements OwnerService { return ownerMapper.selectById(id); } + @Override + public List getOwnerList() { + return ownerMapper.selectAllList(); + } @Override public List getOwnerList(CustomConditions conditions) { return ownerMapper.selectSeniorList(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 10b5c947..10ce355c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -58,6 +58,12 @@ public interface SupplierService { * @return 供应商列表 */ List getSupplierList(CustomConditions conditions); + /** + * 获得供应商列表 + * + * @return 供应商列表 + */ + List getSupplierList(); /** * 获得供应商分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index e8a8036e..83824f91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java @@ -75,7 +75,10 @@ public class SupplierServiceImpl implements SupplierService { public List getSupplierList(CustomConditions conditions) { return supplierMapper.selectSeniorList(conditions); } - + @Override + public List getSupplierList() { + return supplierMapper.selectAllList(); + } @Override public PageResult getSupplierPage(SupplierPageReqVO pageReqVO) { return supplierMapper.selectPage(pageReqVO);