物品信息列表接口客户列表接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java

@@ -82,8 +82,8 @@ public class CustomerController {
     @GetMapping("/list")
     @Operation(summary = "获得客户列表")
     @PreAuthorize("@ss.hasPermission('wms:customer:query')")
-    public CommonResult<List<CustomerRespVO>> getCustomerList(@Valid CustomerExportReqVO exportReqVO) {
-        List<CustomerDO> list = customerService.getCustomerList(exportReqVO);
+    public CommonResult<List<CustomerRespVO>> getCustomerList() {
+        List<CustomerDO> list = customerService.getCustomerList();
         return success(CustomerConvert.INSTANCE.convertList(list));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@@ -9,7 +9,10 @@ import com.win.framework.excel.core.util.ExcelUtils;
 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.OwnerRespVO;
 import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO;
+import com.win.module.wms.convert.owner.OwnerConvert;
+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.controller.itembasic.vo.*;
@@ -107,7 +110,13 @@ public class ItembasicController {
         ItembasicDO itembasic = itembasicService.getItembasic(id);
         return success(ItembasicConvert.INSTANCE.convert(itembasic));
     }
-
+    @GetMapping("/list")
+    @Operation(summary = "获得货主列表")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<List<ItembasicRespVO>> getItembasicList() {
+        List<ItembasicDO> list =itembasicService.getItembasicList();
+        return success(ItembasicConvert.INSTANCE.convertList(list));
+    }
     @GetMapping("/page")
     @Operation(summary = "获得物品基本信息分页")
     @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customer/CustomerMapper.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.mysql.customer;
 
+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;
@@ -9,6 +10,7 @@ import com.win.module.wms.controller.customer.vo.CustomerExportReqVO;
 import com.win.module.wms.controller.customer.vo.CustomerPageReqVO;
 import com.win.module.wms.dal.dataobject.customer.CustomerDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -78,4 +80,9 @@ public interface CustomerMapper extends BaseMapperX<CustomerDO> {
     default List<CustomerDO> selectSeniorList(CustomConditions conditions) {
         return selectList(QueryWrapperUtils.structure(conditions));
     }
+    default List<CustomerDO> selectAllList() {
+        QueryWrapper<CustomerDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("available", "TRUE");
+        return selectList(queryWrapper);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.mysql.itembasic;
 
+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;
@@ -8,6 +9,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.itembasic.vo.ItembasicExportReqVO;
 import com.win.module.wms.controller.itembasic.vo.ItembasicPageReqVO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -97,5 +99,9 @@ public interface ItembasicMapper extends BaseMapperX<ItembasicDO> {
     default List<ItembasicDO> selectSeniorList(CustomConditions conditions) {
         return selectList(QueryWrapperUtils.structure(conditions));
     }
-
+    default List<ItembasicDO> selectAllList() {
+        QueryWrapper<ItembasicDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("available", "TRUE");
+        return selectList(queryWrapper);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.customer.vo.*;
 import com.win.module.wms.dal.dataobject.customer.CustomerDO;
+import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 
 import javax.validation.Valid;
 import java.util.Collection;
@@ -68,6 +69,13 @@ public interface CustomerService {
      * @return 分页列表
      */
     PageResult<CustomerDO> getCustomerSenior(CustomConditions conditions);
+    /**
+     * 获得用客户列表
+     *
+     * @param  分页、排序和自定义条件
+     * @return 分页列表
+     */
+    List<CustomerDO> getCustomerList();  /**
 
     /**
      * 获得客户列表, 用于 Excel 导出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java

@@ -14,6 +14,7 @@ import com.win.module.wms.convert.customer.CustomerConvert;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
 import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO;
 import com.win.module.wms.dal.dataobject.customer.CustomerDO;
+import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 import com.win.module.wms.dal.mysql.customer.CustomerMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -86,6 +87,10 @@ public class CustomerServiceImpl implements CustomerService {
         return customerMapper.selectSenior(conditions);
     }
     @Override
+    public List<CustomerDO> getCustomerList() {
+        return customerMapper.selectAllList();
+    }
+    @Override
     public List<CustomerDO> getCustomerList(CustomerExportReqVO exportReqVO) {
         return customerMapper.selectList(exportReqVO);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 
 import javax.validation.Valid;
 import java.util.Collection;
@@ -76,6 +77,13 @@ public interface ItembasicService {
      * @return 分页列表
      */
     PageResult<ItembasicDO> getItembasicSenior(CustomConditions conditions);
+    /**
+     * 获得货主列表
+     *
+     * @param ids 编号
+     * @return 货主列表
+     */
+    List<ItembasicDO> getItembasicList();
 
     /**
      * 获得物品基本信息列表, 用于 Excel 导出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java

@@ -13,6 +13,7 @@ import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 import com.win.module.wms.dal.mysql.itembasic.ItembasicMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -96,7 +97,10 @@ public class ItembasicServiceImpl implements ItembasicService {
     public List<ItembasicDO> getItembasicList(CustomConditions conditions) {
         return itembasicMapper.selectSeniorList(conditions);
     }
-
+    @Override
+    public List<ItembasicDO> getItembasicList() {
+        return itembasicMapper.selectAllList();
+    }
     @Override
     public PageResult<ItembasicDO> getItembasicPage(ItembasicPageReqVO pageReqVO) {
         return itembasicMapper.selectPage(pageReqVO);