入库出库代码提交7-12

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/instock/InStockQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.gf.api.instock;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-8:58
+ */
+@Data
+@ApiModel(value = "货物入库明细表 分页查询参数")
+public class InStockQuery implements Query {
+}

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/instock/InStockVo.java

@@ -0,0 +1,57 @@
+package com.yxt.supervise.gf.api.instock;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-8:58
+ */
+@Data
+@ApiModel(value = "货物入库明细表 返回视图")
+public class InStockVo implements Vo {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("物料名称")
+    private String materiel_name;
+    @ApiModelProperty("品牌")
+    private String brand_name;
+    @ApiModelProperty("物料编号")
+    private String materiel_no;
+    @ApiModelProperty("批次号")
+    private String batch_number;
+    @ApiModelProperty("物料组")
+    private String materiel_group_text;
+    @ApiModelProperty("本次操作数量")
+    private Integer num;
+    @ApiModelProperty("单价")
+    private Double price;
+    @ApiModelProperty("批次总金额")
+    private Double actual_price;
+    @ApiModelProperty("物料单位")
+    private String unit;
+    @ApiModelProperty("经办人")
+    private String admin_name;
+    @ApiModelProperty("仓库名称")
+    private String storehouse_name;
+    @ApiModelProperty("申请时间")
+    private String happen_time;
+    @ApiModelProperty("类型")
+    private String type;
+    @ApiModelProperty("类型明文")
+    private String type_text;
+    @ApiModelProperty("审核状态")
+    private String status;
+    @ApiModelProperty("原数量")
+    private Integer orig_num;
+    @ApiModelProperty("更新后的数量")
+    private Integer new_num;
+    @ApiModelProperty("创建时间")
+    private String create_time;
+    @ApiModelProperty("来源名称")
+    private String source_name;
+    @ApiModelProperty("来源类型")
+    private String source_type;
+}

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/inventory/Inventory.java

@@ -0,0 +1,41 @@
+package com.yxt.supervise.gf.api.inventory;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-15:33
+ */
+@Data
+@ApiModel(value = "库存列表")
+@TableName("inventory")
+public class Inventory {
+    private Integer id;
+    @ApiModelProperty("库存数量")
+    private Integer num;//268
+    @ApiModelProperty("仓库名称")
+    private String storehouse_name;//"藁城荣名库"
+    @ApiModelProperty("仓库编号")
+    private String storehouse_code;//"031102"
+    @ApiModelProperty("物料id")
+    private String materiel_id;//19428
+    @ApiModelProperty("物料编号")
+    private String materiel_no;//"9001000037"
+    @ApiModelProperty("物料组id")
+    private Integer materiel_group;//7
+    @ApiModelProperty("物料品牌")
+    private String brand_name;//"山海新能"
+    @ApiModelProperty("物料名称")
+    private String materiel_name;//"铝线3*95＋1-50mm"
+    @ApiModelProperty("物料单价（成本价）")
+    private Double price;//"0.00"
+    @ApiModelProperty("最后更新时间")
+    private String update_time;//1684723525
+    @ApiModelProperty("物料组明文")
+    private String materiel_group_text;//"线缆"
+    @ApiModelProperty("最后更新时间明文")
+    private String update_time_text;//"2023-05-22 10:45:25"
+}

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/inventory/InventoryQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.gf.api.inventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-15:36
+ */
+@Data
+@ApiModel(value = "库存列表 分页查询字段")
+public class InventoryQuery implements Query {
+}

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/inventory/InventoryVo.java

@@ -0,0 +1,39 @@
+package com.yxt.supervise.gf.api.inventory;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-15:41
+ */
+@Data
+@ApiModel(value = "库存列表 返回对象")
+public class InventoryVo {
+    private Integer id;
+    @ApiModelProperty("库存数量")
+    private Integer num;//268
+    @ApiModelProperty("仓库名称")
+    private String storehouse_name;//"藁城荣名库"
+    @ApiModelProperty("仓库编号")
+    private String storehouse_code;//"031102"
+    @ApiModelProperty("物料id")
+    private String materiel_id;//19428
+    @ApiModelProperty("物料编号")
+    private String materiel_no;//"9001000037"
+    @ApiModelProperty("物料组id")
+    private Integer materiel_group;//7
+    @ApiModelProperty("物料品牌")
+    private String brand_name;//"山海新能"
+    @ApiModelProperty("物料名称")
+    private String materiel_name;//"铝线3*95＋1-50mm"
+    @ApiModelProperty("物料单价（成本价）")
+    private Double price;//"0.00"
+    @ApiModelProperty("最后更新时间")
+    private String update_time;//1684723525
+    @ApiModelProperty("物料组明文")
+    private String materiel_group_text;//"线缆"
+    @ApiModelProperty("最后更新时间明文")
+    private String update_time_text;//"2023-05-22 10:45:25"
+}

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/outstock/OutStock.java

@@ -15,29 +15,44 @@ import lombok.Data;
 public class OutStock {
     @ApiModelProperty("id")
     private Integer id;
-    @ApiModelProperty("名称")
-    private String materiel_group_text;
-    @ApiModelProperty("产品名称")
+    @ApiModelProperty("物料名称")
     private String materiel_name;
-    @ApiModelProperty("规格")
-    private String specification;
-    @ApiModelProperty("数量")
-    private Integer num;
-    @ApiModelProperty("单价/元")
+    @ApiModelProperty("品牌")
+    private String brand_name;
+    @ApiModelProperty("物料编号")
+    private String materiel_no;
+    @ApiModelProperty("批次号")
+    private String batch_number;
+    @ApiModelProperty("物料组")
+    private String materiel_group_text;
+    @ApiModelProperty("本次操作数量")
+    private String num;
+    @ApiModelProperty("单价")
     private Double price;
-    @ApiModelProperty("金额/元")
+    @ApiModelProperty("批次总金额")
     private Double actual_price;
-    @ApiModelProperty("产品厂家")
-    private String product_manufacturer;
-    @ApiModelProperty("仓库地点")
+    @ApiModelProperty("物料单位")
+    private String unit;
+    @ApiModelProperty("经办人")
+    private String admin_name;
+    @ApiModelProperty("仓库名称")
     private String storehouse_name;
-    @ApiModelProperty("到达地点")
-    private String place;
-    @ApiModelProperty("出库车牌号")
-    private String plate_number;
-    @ApiModelProperty("备注")
-    private String remark;
-    @ApiModelProperty("时间")
-    private String time;
-
+    @ApiModelProperty("申请时间")
+    private String happen_time;
+    @ApiModelProperty("类型")
+    private String type;
+    @ApiModelProperty("类型明文")
+    private String type_text;
+    @ApiModelProperty("审核状态")
+    private String status;
+    @ApiModelProperty("原数量")
+    private Integer orig_num;
+    @ApiModelProperty("更新后的数量")
+    private Integer new_num;
+    @ApiModelProperty("创建时间")
+    private String create_time;
+    @ApiModelProperty("来源名称")
+    private String source_name;
+    @ApiModelProperty("来源类型")
+    private String source_type;
 }

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/outstock/OutStockQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.gf.api.outstock;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-15:06
+ */
+@Data
+@ApiModel(value = "货物出库明细表 分页查询字段")
+public class OutStockQuery implements Query {
+}

yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/outstock/OutStockVo.java

@@ -0,0 +1,56 @@
+package com.yxt.supervise.gf.api.outstock;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-12-15:07
+ */
+@Data
+@ApiModel(value = "货物出库明细表 返回对象")
+public class OutStockVo {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("物料名称")
+    private String materiel_name;
+    @ApiModelProperty("品牌")
+    private String brand_name;
+    @ApiModelProperty("物料编号")
+    private String materiel_no;
+    @ApiModelProperty("批次号")
+    private String batch_number;
+    @ApiModelProperty("物料组")
+    private String materiel_group_text;
+    @ApiModelProperty("本次操作数量")
+    private String num;
+    @ApiModelProperty("单价")
+    private Double price;
+    @ApiModelProperty("批次总金额")
+    private Double actual_price;
+    @ApiModelProperty("物料单位")
+    private String unit;
+    @ApiModelProperty("经办人")
+    private String admin_name;
+    @ApiModelProperty("仓库名称")
+    private String storehouse_name;
+    @ApiModelProperty("申请时间")
+    private String happen_time;
+    @ApiModelProperty("类型")
+    private String type;
+    @ApiModelProperty("类型明文")
+    private String type_text;
+    @ApiModelProperty("审核状态")
+    private String status;
+    @ApiModelProperty("原数量")
+    private Integer orig_num;
+    @ApiModelProperty("更新后的数量")
+    private Integer new_num;
+    @ApiModelProperty("创建时间")
+    private String create_time;
+    @ApiModelProperty("来源名称")
+    private String source_name;
+    @ApiModelProperty("来源类型")
+    private String source_type;
+}

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockMapper.java

@@ -1,8 +1,13 @@
 package com.yxt.supervise.gf.biz.instock;
 
+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 com.yxt.supervise.gf.api.instock.InStock;
+import com.yxt.supervise.gf.api.instock.InStockVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author feikefei
@@ -10,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface InStockMapper extends BaseMapper<InStock> {
+    IPage<InStockVo> selectPageVo(IPage<InStock> page, @Param(Constants.WRAPPER) Wrapper<InStock> qw);
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockMapper.xml

@@ -0,0 +1,14 @@
+<?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.gf.biz.instock.InStockMapper">
+    <select id="selectPageVo" resultType="com.yxt.supervise.gf.api.instock.InStockVo">
+        SELECT
+        *
+        FROM
+        in_stock
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java

@@ -1,7 +1,11 @@
 package com.yxt.supervise.gf.biz.instock;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.gf.api.instock.InStock;
+import com.yxt.supervise.gf.api.instock.InStockQuery;
+import com.yxt.supervise.gf.api.instock.InStockVo;
 import com.yxt.supervise.gf.shanhai.ShRequester;
 import com.yxt.supervise.gf.shanhai.req.In_stockGetRecordMaterielList;
 import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
@@ -31,4 +35,11 @@ public class InStockRest {
     public ResultBean save(@RequestBody In_stockGetRecordMaterielList reqParams){
         return inStockService.save(reqParams);
     }
+
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<InStockQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<InStockVo> vo = inStockService.listPage(pq);
+        return rb.success().setData(vo);
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java

@@ -3,16 +3,21 @@ package com.yxt.supervise.gf.biz.instock;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+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.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.gf.api.instock.InStock;
+import com.yxt.supervise.gf.api.instock.InStockQuery;
+import com.yxt.supervise.gf.api.instock.InStockVo;
 import com.yxt.supervise.gf.shanhai.ShRequester;
 import com.yxt.supervise.gf.shanhai.req.In_stockGetRecordMaterielList;
 import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
 import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj;
 import com.yxt.supervise.gf.shanhai.resp.InStockGetRecordMaterielList;
-import org.apache.commons.math3.stat.descriptive.summary.Product;
-import org.springframework.data.redis.core.convert.RedisData;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -35,4 +40,16 @@ public class InStockService extends ServiceImpl<InStockMapper, InStock> {
         }
         return rb.success().setMsg("新增成功");
     }
+
+    public PagerVo<InStockVo> listPage(PagerQuery<InStockQuery> pq){
+        InStockQuery params = pq.getParams();
+        QueryWrapper<InStock> wq = new QueryWrapper<>();
+        if (params != null){
+
+        }
+        IPage<InStock> page = PagerUtil.queryToPage(pq);
+        IPage<InStockVo> inStockIPage = baseMapper.selectPageVo(page, wq);
+        PagerVo<InStockVo> vo = PagerUtil.pageToVo(inStockIPage, null);
+        return vo;
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java

@@ -28,10 +28,6 @@ public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
         for (RecordMaterielList recordMaterielList : list) {
             OutStock outStock = new OutStock();
             BeanUtil.copyProperties(recordMaterielList,outStock);
-            outStock.setSpecification(recordMaterielList.getMateriel_name());
-            outStock.setProduct_manufacturer(null);
-            outStock.setTime(recordMaterielList.getHappen_time());
-            outStock.setPlate_number(null);
             baseMapper.insert(outStock);
         }
         return rb.success().setMsg("添加成功");

yxt-supervise-gf-biz/src/test/java/demo/tool/SecurTest.java

@@ -8,6 +8,7 @@ import cn.hutool.crypto.asymmetric.RSA;
 import cn.hutool.http.HttpRequest;
 import com.yxt.supervise.gf.shanhai.ShRequester;
 import com.yxt.supervise.gf.shanhai.req.In_stockExamine;
+import com.yxt.supervise.gf.shanhai.req.In_stockGetRecordMaterielList;
 import com.yxt.supervise.gf.shanhai.resp.*;
 import org.junit.Test;
 import sun.misc.BASE64Decoder;
@@ -131,6 +132,8 @@ public class SecurTest {
 //        BaseResponse<BaseResponseListObj> api$system$in_stock$examine = ShRequester.getApi$system$in_stock$examine(in_stockExamine);
 //        System.out.println(api$system$in_stock$examine);
 
+//        In_stockGetRecordMaterielList in_stockGetRecordMaterielList = new In_stockGetRecordMaterielList();
+//        in_stockGetRecordMaterielList.setStart_happen_time("2023-06-01");
 //        BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> api$system$in_stock$get_record_materiel_list = ShRequester.getApi$system$in_stock$get_record_materiel_list(null);
 //        System.out.println(api$system$in_stock$get_record_materiel_list);