物料出库列表、入库实体类字段更改，部分第三方接口返回值修改

2 years ago · 3a20adafa4
7 changed files with 228 additions and 43 deletions
--- a/yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/instock/InStock.java
+++ b/yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/instock/InStock.java
@ -1,5 +1,6 @@
 package com.yxt.supervise.gf.api.instock;

+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@ -10,28 +11,48 @@ import lombok.Data;
 */
@Data
@ApiModel(value = "货物入库明细表")
+@TableName("in_stock")
 public class InStock {
    @ApiModelProperty("id")
    private Integer id;
-    @ApiModelProperty("产品名称")
-    private String materiel_group_text;
-    @ApiModelProperty("规格")
+    @ApiModelProperty("物料名称")
    private String materiel_name;
-    @ApiModelProperty("数量")
-    private String 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 Integer 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 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;
 }
--- a/yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/outstock/OutStock.java
+++ b/yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/outstock/OutStock.java
@ -0,0 +1,43 @@
+package com.yxt.supervise.gf.api.outstock;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-07-11-16:03
+ */
+@Data
+@ApiModel(value = "货物出库明细表")
+@TableName("out_stock")
+public class OutStock {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("名称")
+    private String materiel_group_text;
+    @ApiModelProperty("产品名称")
+    private String materiel_name;
+    @ApiModelProperty("规格")
+    private String specification;
+    @ApiModelProperty("数量")
+    private Integer num;
+    @ApiModelProperty("单价/元")
+    private Double price;
+    @ApiModelProperty("金额/元")
+    private Double actual_price;
+    @ApiModelProperty("产品厂家")
+    private String product_manufacturer;
+    @ApiModelProperty("仓库地点")
+    private String storehouse_name;
+    @ApiModelProperty("到达地点")
+    private String place;
+    @ApiModelProperty("出库车牌号")
+    private String plate_number;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("时间")
+    private String time;
+
+}
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java
@ -31,20 +31,7 @@ public class InStockService extends ServiceImpl<InStockMapper, InStock> {
        for (InStockGetRecordMaterielList inStockGetRecordMaterielList : list) {
            InStock inStock = new InStock();
            BeanUtil.copyProperties(inStockGetRecordMaterielList,inStock);
-
-            inStock.setMateriel_group_text(inStockGetRecordMaterielList.getMateriel_group_text());
-            inStock.setMateriel_name(inStockGetRecordMaterielList.getMateriel_name());
-            inStock.setNum(inStockGetRecordMaterielList.getNum());
-            inStock.setPrice(Double.parseDouble(inStockGetRecordMaterielList.getPrice()));
-            inStock.setActual_price(Double.parseDouble(inStockGetRecordMaterielList.getActual_price()));
-            //厂家暂时没有字段
-            inStock.setProduct_manufacturer(null);
-            inStock.setStorehouse_name(inStockGetRecordMaterielList.getStorehouse_name());
-            //入库车牌号暂时没有字段
-            inStock.setPlate_number(null);
-            inStock.setRemark(null);
-            inStock.setTime(inStockGetRecordMaterielList.getHappen_time());
-//            baseMapper.insert(inStock);
+            baseMapper.insert(inStock);
        }
        return rb.success().setMsg("新增成功");
    }
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockMapper.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockMapper.java
@ -0,0 +1,13 @@
+package com.yxt.supervise.gf.biz.outstock;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.gf.api.outstock.OutStock;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author feikefei
+ * @create 2023-07-11-16:44
+ */
+@Mapper
+public interface OutStockMapper extends BaseMapper<OutStock> {
+}
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java
@ -0,0 +1,28 @@
+package com.yxt.supervise.gf.biz.outstock;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.gf.shanhai.req.Out_stockGetRecordMaterielList;
+import io.swagger.annotations.Api;
+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-07-11-16:08
+ */
+@Api(value = "货物出库库明细表")
+@RestController
+@RequestMapping("gf/outStock")
+public class OutStockRest {
+
+    @Autowired
+    private OutStockService outStockService;
+
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody Out_stockGetRecordMaterielList reqParams){
+        return outStockService.save(reqParams);
+    }
+}
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java
@ -0,0 +1,39 @@
+package com.yxt.supervise.gf.biz.outstock;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.gf.api.outstock.OutStock;
+import com.yxt.supervise.gf.shanhai.ShRequester;
+import com.yxt.supervise.gf.shanhai.req.Out_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 com.yxt.supervise.gf.shanhai.resp.RecordMaterielList;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-07-11-16:44
+ */
+@Service
+public class OutStockService extends ServiceImpl<OutStockMapper, OutStock> {
+
+    public ResultBean save(Out_stockGetRecordMaterielList reqParams){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse<BaseResponseListObj<RecordMaterielList>> api$system$out_stock$get_record_materiel_list = ShRequester.getApi$system$out_stock$get_record_materiel_list(reqParams);
+        List<RecordMaterielList> list = api$system$out_stock$get_record_materiel_list.getData().getList();
+        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("添加成功");
+    }
+}
--- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java
+++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java
@ -238,8 +238,17 @@ public class ShRequester {
        if (reqParams != null)
            param = BeanUtil.beanToMap(reqParams);
        String s = ShHttp.doGet(out_stock$index, param);
-        BaseResponse<BaseResponseListObj<OutStock>> baseResponse = toBean(s, resp, respObj);
-        return baseResponse;
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
+        BeanUtil.copyProperties(baseResponse,resp);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<OutStock> outStocks = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            OutStock outStock = JSONUtil.toBean(jsonObject, OutStock.class);
+            outStocks.add(outStock);
+        }
+        respObj.setList(outStocks);
+        resp.setData(respObj);
+        return resp;
    }
    
    /**
@ -254,8 +263,17 @@ public class ShRequester {
        if (reqParams != null)
            param = BeanUtil.beanToMap(reqParams);
        String s = ShHttp.doGet(out_stock$get_record_materiel_list, param);
-        BaseResponse<BaseResponseListObj<RecordMaterielList>> baseResponse = toBean(s, req, reqObj);
-        return baseResponse;
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
+        BeanUtil.copyProperties(baseResponse,req);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<RecordMaterielList> recordMaterielLists = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            RecordMaterielList recordMaterielList = JSONUtil.toBean(jsonObject, RecordMaterielList.class);
+            recordMaterielLists.add(recordMaterielList);
+        }
+        reqObj.setList(recordMaterielLists);
+        req.setData(reqObj);
+        return req;
    }

    /**
@ -316,8 +334,17 @@ public class ShRequester {
        if (reqParams != null)
            param = BeanUtil.beanToMap(reqParams);
        String s = ShHttp.doGet(in_stock$index, param);
-        BaseResponse<BaseResponseListObj<InStockIndex>> baseResponse = toBean(s, req, reqObj);
-        return baseResponse;
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
+        BeanUtil.copyProperties(baseResponse,req);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<InStockIndex> inStockIndices = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            InStockIndex inStockIndex = JSONUtil.toBean(jsonObject, InStockIndex.class);
+            inStockIndices.add(inStockIndex);
+        }
+        reqObj.setList(inStockIndices);
+        req.setData(reqObj);
+        return req;
    }

    /**
@ -372,8 +399,17 @@ public class ShRequester {
        Map<String, Object> params = new HashMap<>();
        params.put("record_type", record_type);
        String s = ShHttp.doGet(stock_record$index, params);
-        BaseResponse<BaseResponseListObj<StockRecordIndex>> baseResponse = toBean(s, req, reqObj);
-        return baseResponse;
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
+        BeanUtil.copyProperties(baseResponse,req);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<StockRecordIndex> stockRecordIndices = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            StockRecordIndex stockRecordIndex = JSONUtil.toBean(jsonObject, StockRecordIndex.class);
+            stockRecordIndices.add(stockRecordIndex);
+        }
+        reqObj.setList(stockRecordIndices);
+        req.setData(reqObj);
+        return req;
    }

    /**
@ -416,8 +452,17 @@ public class ShRequester {
        params.put("storehouse_code", storehouse_code);
        params.put("storehouse_name", storehouse_name);
        String s = ShHttp.doGet(storehouse$index, params);
-        BaseResponse<BaseResponseListObj<StorehouseIndex>> baseResponse = toBean(s, req, reqObj);
-        return baseResponse;
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
+        BeanUtil.copyProperties(baseResponse,req);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<StorehouseIndex> storehouseIndices = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            StorehouseIndex storehouseIndex = JSONUtil.toBean(jsonObject, StorehouseIndex.class);
+            storehouseIndices.add(storehouseIndex);
+        }
+        reqObj.setList(storehouseIndices);
+        req.setData(reqObj);
+        return req;
    }

    /**
@ -429,8 +474,17 @@ public class ShRequester {
        BaseResponse<BaseResponseListObj<SupplierIndex>> req = new BaseResponse<>();
        BaseResponseListObj<SupplierIndex> reqObj = new BaseResponseListObj<>();
        String s = ShHttp.doGet(supplier$index, null);
-        BaseResponse<BaseResponseListObj<SupplierIndex>> baseResponse = toBean(s, req, reqObj);
-        return baseResponse;
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
+        BeanUtil.copyProperties(baseResponse,req);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<SupplierIndex> supplierIndices = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            SupplierIndex supplierIndex = JSONUtil.toBean(jsonObject, SupplierIndex.class);
+            supplierIndices.add(supplierIndex);
+        }
+        reqObj.setList(supplierIndices);
+        req.setData(reqObj);
+        return req;
    }

    /**