产品管路，供应商，库位管理里的分页，改成和仓库管理一样的就行，库位管理的删除无法实现，这个入库的操作不知道为啥也不行。

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/LocationQuery.java

@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class LocationQuery implements Query {
+
+    private String name;            //货位名称
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String locationId;      //货位编号
+    private String type;            //货位类型
+    private String status;          //货位状态
+    private String storehouse;      //所属仓库
+    private String storehouseid;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/ProductQuery.java

@@ -0,0 +1,26 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString
+public class ProductQuery implements Query {
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String barCode;             //条码
+    private String name;                //商品名
+    private String anotherName;         //别名
+    private Double value;               //价值
+    private Double netWeight;           //净重
+    private Double roughWeight;         //毛重
+    private Integer effectiveDays;      //有效天数
+    private String warehouse;           //所属仓库
+    private String remarks;             //备注
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/SupplierQuery.java

@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class SupplierQuery implements Query {
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String name;        //供应商名称
+    private String contacts;    //联系人
+    private String number;      //电话
+    private String remarks;     //备注
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/initial/LocationController.java

@@ -1,14 +1,14 @@
 package com.wh.controller.initial;
 
-import com.wh.pojo.Location;
+import com.wh.pojo.*;
-import com.wh.pojo.LocationType;
-import com.wh.pojo.LocationVo;
-import com.wh.pojo.Storehouse;
 import com.wh.pojo.shstorehouse.ShStorehouse;
 import com.wh.service.initial.LocationService;
 import com.wh.service.shstorehouse.ShStorehouseService;
 import com.wh.vo.PageResult;
 import com.wh.vo.SysResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,10 +25,13 @@ public class LocationController {
     @Autowired
     private ShStorehouseService shStorehouseService;
 
-    @GetMapping("list")
+    @PostMapping("list")
-    public SysResult getLocationList(PageResult pageResult){
+    public ResultBean getLocationList(@RequestBody PagerQuery<LocationQuery> pq){
-        pageResult = locationService.getLocationList(pageResult);
+//        pageResult = locationService.getLocationList(pageResult);
-        return SysResult.success(pageResult);
+//        return SysResult.success(pageResult);
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<Location> pv =  locationService.getSupplierList(pq);
+        return rb.success().setData(pv);
     }
     @GetMapping("listAll")
     public SysResult listAll(PageResult pageResult){
@@ -61,6 +64,15 @@ public class LocationController {
         locationService.deleteLocation(name);
         return SysResult.success();
     }
+    @DeleteMapping("deleteById/{id}")
+    public ResultBean deleteById(@PathVariable String id){
+        ResultBean rb = ResultBean.fireFail();
+        int i = locationService.deleteById(id);
+        if(i==0){
+            return rb;
+        }
+        return rb.success();
+    }
 
     @GetMapping("getStorehouse")
     public SysResult getStorehouse(){

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/initial/ProductController.java

@@ -1,10 +1,16 @@
 package com.wh.controller.initial;
 
 import com.wh.pojo.Product;
+import com.wh.pojo.ProductQuery;
 import com.wh.pojo.Storehouse;
+import com.wh.pojo.shstorehouse.ShStorehouseQuery;
+import com.wh.pojo.shstorehouse.ShStorehouseVo;
 import com.wh.service.initial.ProductService;
 import com.wh.vo.PageResult;
 import com.wh.vo.SysResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,10 +23,11 @@ public class ProductController {
     @Autowired
     private ProductService productService;
 
-    @GetMapping("list")
+    @PostMapping("list")
-    public SysResult getProductList(PageResult pageResult){
+    public ResultBean getProductList(@RequestBody PagerQuery<ProductQuery> pq){
-        pageResult = productService.getProductList(pageResult);
+        ResultBean rb = ResultBean.fireFail();
-        return SysResult.success(pageResult);
+        PagerVo<Product> pv =  productService.getProductList(pq);
+        return rb.success().setData(pv);
     }
 
     @PostMapping("addProduct")

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/initial/SupplierController.java

@@ -1,9 +1,15 @@
 package com.wh.controller.initial;
 
+import com.wh.pojo.Product;
+import com.wh.pojo.ProductQuery;
 import com.wh.pojo.Supplier;
+import com.wh.pojo.SupplierQuery;
 import com.wh.service.initial.SupplierService;
 import com.wh.vo.PageResult;
 import com.wh.vo.SysResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,10 +21,13 @@ public class SupplierController {
     @Autowired
     private SupplierService supplierService;
 
-    @GetMapping("list")
+    @PostMapping("list")
-    public SysResult getSupplierList(PageResult pageResult){
+    public ResultBean getSupplierList(@RequestBody PagerQuery<SupplierQuery> pq){
-        pageResult = supplierService.getSupplierList(pageResult);
+//        pageResult = supplierService.getSupplierList(pageResult);
-        return SysResult.success(pageResult);
+//        return SysResult.success(pageResult);
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<Supplier> pv =  supplierService.getSupplierList(pq);
+        return rb.success().setData(pv);
     }
 
     @PostMapping("addSupplier")

warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java

@@ -70,10 +70,15 @@ public class InStorehouseMainService  extends MybatisBaseService<InStorehouseMai
         if(StringUtils.isBlank(inStoreHouseMainDto.getLocationId())){
             return r.setMsg("货位不能为空");
         }
-        Location location = locationService.getLocationById(inStoreHouseMainDto.getLocationId());
+        List<Location> locationByLocationId = locationService.getLocationByLocationId(inStoreHouseMainDto.getLocationId());
-        if(location==null){
+        if(locationByLocationId==null||locationByLocationId.size()==0){
             return r.setMsg("货位信息不存在");
         }
+        if(locationByLocationId.size()>1){
+            return r.setMsg("货位编号重复");
+        }
+        Location location =locationByLocationId.get(0) ;
+
         QueryWrapper<Purchasenew> purchasenewWrapper = new QueryWrapper<>();
         purchasenewWrapper.eq("purchase_no",inStoreHouseMainDto.getNo());
         List<Purchasenew> list1 = purchasenewService.list(purchasenewWrapper);

warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java

@@ -67,6 +67,9 @@ public class ProdStockService extends MybatisBaseService<ProdStockMapper, ProdSt
         if (StringUtils.isNotBlank(query.getLocationNumber())) {
             qw.eq("location_number", query.getLocationNumber());
         }
+        if(StringUtils.isNotBlank(query.getStoreHouseSid())){
+            qw.eq("store_house_sid",query.getStoreHouseSid());
+        }
         return qw;
     }
 

warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/LocationService.java

@@ -1,20 +1,19 @@
 package com.wh.service.initial;
 
-import com.wh.pojo.Location;
+import com.wh.pojo.*;
-import com.wh.pojo.LocationType;
-import com.wh.pojo.LocationVo;
-import com.wh.pojo.Storehouse;
 import com.wh.vo.PageResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
 
 import java.util.List;
 
 public interface LocationService {
     PageResult getLocationList(PageResult pageResult);
-
+    PagerVo<Location> getSupplierList(PagerQuery<LocationQuery> pq);
     void addLocation(Location location);
 
     void updataLocation(Location location);
-
+    int deleteById(String id);
     void deleteLocation(String name);
     Location getLocationById(String id);
     List<Storehouse> getStorehouse();
@@ -24,4 +23,7 @@ public interface LocationService {
     List<Location> getLocations();
 
     List<LocationVo> getLocationsByStoreId(String id);
+
+
+    List<Location> getLocationByLocationId(String locationId);
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/LocationServiceImpl.java

@@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wh.mapper.initial.LocationMapper;
 import com.wh.mapper.initial.LocationTypeMapper;
 import com.wh.mapper.initial.StorehouseMapper;
-import com.wh.pojo.Location;
+import com.wh.pojo.*;
-import com.wh.pojo.LocationType;
-import com.wh.pojo.LocationVo;
-import com.wh.pojo.Storehouse;
 import com.wh.vo.PageResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -40,6 +39,29 @@ public class LocationServiceImpl implements LocationService{
         return pageResult;
     }
 
+    @Override
+    public PagerVo<Location> getSupplierList(PagerQuery<LocationQuery> pq) {
+        Page<Location> locationPage = new Page<>(pq.getCurrent(),pq.getSize());
+        QueryWrapper<Location> queryWrapper = new QueryWrapper<>();
+        String name = pq.getParams().getName();
+        String storehouseid = pq.getParams().getStorehouseid();
+        if(!StringUtils.isEmpty(name)){
+            queryWrapper.like("name",name);
+        }
+        if(!StringUtils.isEmpty(storehouseid)){
+            queryWrapper.eq("storehouseid",storehouseid);
+        }
+
+        locationPage = locationMapper.selectPage(locationPage,queryWrapper);
+        Integer integer = locationMapper.selectCount(queryWrapper);
+        PagerVo<Location> pv=new PagerVo<>();
+        pv.setCurrent(pq.getCurrent());
+        pv.setTotal(integer);
+        pv.setSize(pq.getSize());
+        pv.setRecords(locationPage.getRecords());
+        return pv;
+    }
+
     @Override
     public void addLocation(Location location) {
         locationMapper.insert(location);
@@ -50,6 +72,11 @@ public class LocationServiceImpl implements LocationService{
         locationMapper.updateById(location);
     }
 
+    @Override
+    public int deleteById(String id) {
+        return locationMapper.deleteById(id);
+    }
+
     @Override
     public void deleteLocation(String name) {
         locationMapper.deleteById(name);
@@ -80,4 +107,12 @@ public class LocationServiceImpl implements LocationService{
         return locationMapper.getLocationsByStoreId(id);
     }
 
+    @Override
+    public List<Location> getLocationByLocationId(String locationId) {
+        QueryWrapper<Location> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("location_id",locationId);
+        List<Location> locations = locationMapper.selectList(queryWrapper);
+        return locations;
+    }
+
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductService.java

@@ -2,15 +2,19 @@ package com.wh.service.initial;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wh.pojo.Product;
+import com.wh.pojo.ProductQuery;
 import com.wh.pojo.Storehouse;
+import com.wh.pojo.shstorehouse.ShStorehouseVo;
 import com.wh.vo.PageResult;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
 
 public interface ProductService {
-    PageResult getProductList(PageResult pageResult);
+    PagerVo<Product> getProductList(PagerQuery<ProductQuery> pq);
 
     void addProduct(Product product);
 

warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductServiceImpl.java

@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wh.mapper.initial.ProductMapper;
 import com.wh.mapper.initial.StorehouseMapper;
 import com.wh.pojo.Product;
+import com.wh.pojo.ProductQuery;
 import com.wh.pojo.Storehouse;
+import com.wh.pojo.shstorehouse.ShStorehouseVo;
 import com.wh.vo.PageResult;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -26,17 +30,24 @@ public class ProductServiceImpl implements ProductService{
     private ProductMapper productMapper;
 
     @Override
-    public PageResult getProductList(PageResult pageResult) {
+    public PagerVo<Product> getProductList(PagerQuery<ProductQuery> pq) {
-        Page<Product> productPage = new Page<>(pageResult.getPageNum(),pageResult.getPageSize());
+        Page<Product> productPage = new Page<>(pq.getCurrent(),pq.getSize());
         QueryWrapper<Product> queryWrapper = new QueryWrapper<>();
-        boolean flag = StringUtils.hasLength(pageResult.getQuery());
+        String name = pq.getParams().getName();
-
+        if(!StringUtils.isEmpty(name)){
-        queryWrapper.like(flag,"name",pageResult.getQuery());
+            queryWrapper.like("name",name);
+        }
         productPage = productMapper.selectPage(productPage,queryWrapper);
-
+        Integer integer = productMapper.selectCount(queryWrapper);
-        pageResult.setTotal((long) productPage.getRecords().size()).setRows(productPage.getRecords());
+       // PageResult pageResult=new PageResult();
+      //  pageResult.setTotal((long) productPage.getRecords().size()).setRows(productPage.getRecords());
+        PagerVo<Product> pv=new PagerVo<>();
+        pv.setCurrent(pq.getCurrent());
+        pv.setTotal(integer);
+        pv.setSize(pq.getSize());
+        pv.setRecords(productPage.getRecords());
 //        System.out.println(productPage.getRecords().size());
-        return pageResult;
+        return pv;
     }
     public  ResultBean<List<Product>>  getProductListByNameAndCode(String name,String code) {
         ResultBean rb=ResultBean.fireFail();

warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/SupplierService.java

@@ -2,11 +2,14 @@ package com.wh.service.initial;
 
 
 import com.wh.pojo.Supplier;
+import com.wh.pojo.SupplierQuery;
 import com.wh.vo.PageResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
 
 public interface SupplierService {
     PageResult getSupplierList(PageResult pageResult);
-
+    PagerVo<Supplier> getSupplierList(PagerQuery<SupplierQuery> pq);
     void addSupplier(Supplier supplier);
 
     void updataSupplier(Supplier supplier);

warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/SupplierServiceImpl.java

@@ -3,8 +3,12 @@ package com.wh.service.initial;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wh.mapper.initial.SupplierMapper;
+import com.wh.pojo.Product;
 import com.wh.pojo.Supplier;
+import com.wh.pojo.SupplierQuery;
 import com.wh.vo.PageResult;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -27,6 +31,29 @@ public class SupplierServiceImpl implements SupplierService{
         return pageResult;
     }
 
+    @Override
+    public PagerVo<Supplier> getSupplierList(PagerQuery<SupplierQuery> pq) {
+        Page<Supplier> supplierPage = new Page<>(pq.getCurrent(),pq.getSize());
+        QueryWrapper<Supplier> queryWrapper = new QueryWrapper<>();
+        String name = pq.getParams().getName();
+        String number = pq.getParams().getNumber();
+        if(!StringUtils.isEmpty(name)){
+            queryWrapper.like("name",name);
+        }
+        if(!StringUtils.isEmpty(number)){
+            queryWrapper.like("number",number);
+        }
+        supplierPage = supplierMapper.selectPage(supplierPage,queryWrapper);
+        Integer integer = supplierMapper.selectCount(queryWrapper);
+        // pageResult.setTotal((long) supplierPage.getRecords().size()).setRows(supplierPage.getRecords());
+        PagerVo<Supplier> pv=new PagerVo<>();
+        pv.setCurrent(pq.getCurrent());
+        pv.setTotal(integer);
+        pv.setSize(pq.getSize());
+        pv.setRecords(supplierPage.getRecords());
+        return pv;
+    }
+
     @Override
     public void addSupplier(Supplier supplier) {
         supplierMapper.insert(supplier);