Merge remote-tracking branch 'origin/master'

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStock.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.report.biz.prodstock;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-09-14:18
+ */
+@Data
+@TableName("prod_stock")
+public class ProdStock {
+    private Integer id;
+    private String sid;
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String brandInfoName;//品牌名称
+    private String brandInfoKey;//品牌名称
+    private String productTypeName;//分类名称
+    private String productTypeKey;//分类key
+    private String locationId;//货位号id
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockMapper.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.report.biz.prodstock;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author feikefei
+ * @create 2023-08-09-14:23
+ */
+@Mapper
+@DS("warehouse")
+public interface ProdStockMapper extends BaseMapper<ProdStock> {
+    IPage<ProdStockVo> selectPageVo(IPage<ProdStock> page, @Param(Constants.WRAPPER) Wrapper<ProdStock> qw);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.report.biz.prodstock.ProdStockMapper">
+    <select id="selectPageVo" resultType="com.yxt.supervise.report.biz.prodstock.ProdStockVo">
+        select * from prod_stock
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockQuery.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.report.biz.prodstock;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-09-14:19
+ */
+@Data
+public class ProdStockQuery implements Query {
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String brandInfoName;//品牌名称
+    private String brandInfoKey;//品牌名称
+    private String productTypeName;//分类名称
+    private String productTypeKey;//分类key
+    private String locationId;//货位号id
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockRest.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.report.biz.prodstock;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author feikefei
+ * @create 2023-08-09-14:20
+ */
+@RestController
+@RequestMapping("/prodStock")
+public class ProdStockRest {
+
+    @Autowired
+    private ProdStockService prodStockService;
+
+    @ApiOperation("查询库存数据")
+    @PostMapping("/selectListPage")
+    public ResultBean selectListPage(@RequestBody PagerQuery<ProdStockQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProdStockVo> prodStockPager = prodStockService.selectListPage(pq);
+        return rb.success().setData(prodStockPager);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockService.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.report.biz.prodstock;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author feikefei
+ * @create 2023-08-09-14:23
+ */
+@Service
+public class ProdStockService extends MybatisBaseService<ProdStockMapper, ProdStock> {
+
+    public PagerVo<ProdStockVo> selectListPage(PagerQuery<ProdStockQuery> pq){
+        ProdStockQuery params = pq.getParams();
+        QueryWrapper<ProdStock> wq = new QueryWrapper<>();
+        if (params != null){
+
+        }
+        IPage<ProdStock> page = PagerUtil.queryToPage(pq);
+        IPage<ProdStockVo> prodStockIPage = baseMapper.selectPageVo(page, wq);
+        PagerVo<ProdStockVo> objectPagerVo = PagerUtil.pageToVo(prodStockIPage, null);
+        return objectPagerVo;
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockVo.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.report.biz.prodstock;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-09-14:43
+ */
+@Data
+public class ProdStockVo implements Vo {
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String locationId;//货位号id
+}