From ce234de395b854bbdd12bf29fe08abccfbd7e4d2 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Mon, 10 Jul 2023 18:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=EF=BC=8C=E6=9C=AC=E5=9C=B0=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/supervise/gf/api/instock/InStock.java | 37 ++++++++++ .../gf/biz/instock/InStockMapper.java | 13 ++++ .../supervise/gf/biz/instock/InStockRest.java | 34 +++++++++ .../gf/biz/instock/InStockService.java | 51 +++++++++++++ .../yxt/supervise/gf/shanhai/ShRequester.java | 71 ++++++++++++++++--- 5 files changed, 196 insertions(+), 10 deletions(-) create mode 100644 yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/instock/InStock.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockMapper.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java diff --git 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 new file mode 100644 index 0000000..71020e1 --- /dev/null +++ b/yxt-supervise-gf-api/src/main/java/com/yxt/supervise/gf/api/instock/InStock.java @@ -0,0 +1,37 @@ +package com.yxt.supervise.gf.api.instock; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-10-15:13 + */ +@Data +@ApiModel(value = "货物入库明细表") +public class InStock { + @ApiModelProperty("id") + private Integer id; + @ApiModelProperty("产品名称") + private String materiel_group_text; + @ApiModelProperty("规格") + private String materiel_name; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("单价/元") + private Double price; + @ApiModelProperty("金额/元") + private Double actual_price; + @ApiModelProperty("产品厂家") + private String product_manufacturer; + @ApiModelProperty("仓库地点") + private String storehouse_name; + @ApiModelProperty("入库车牌号") + private String plate_number; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("时间") + private String time; + +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockMapper.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockMapper.java new file mode 100644 index 0000000..992e501 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockMapper.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.gf.biz.instock; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.supervise.gf.api.instock.InStock; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author feikefei + * @create 2023-07-10-15:57 + */ +@Mapper +public interface InStockMapper extends BaseMapper { +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java new file mode 100644 index 0000000..29910c8 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.gf.biz.instock; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.gf.api.instock.InStock; +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 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-10-15:18 + */ +@Api(value = "货物入库明细表") +@RestController +@RequestMapping("gf/inStock") +public class InStockRest { + + @Autowired + private InStockService inStockService; + + @PostMapping("/save") + public ResultBean save(@RequestBody In_stockGetRecordMaterielList reqParams){ + return inStockService.save(reqParams); + } +} diff --git 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 new file mode 100644 index 0000000..bf8e1e9 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockService.java @@ -0,0 +1,51 @@ +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.extension.service.impl.ServiceImpl; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.gf.api.instock.InStock; +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; + +/** + * @author feikefei + * @create 2023-07-10-15:50 + */ +@Service +public class InStockService extends ServiceImpl { + + public ResultBean save(In_stockGetRecordMaterielList reqParams){ + ResultBean rb = ResultBean.fireFail(); + BaseResponse> api$system$in_stock$get_record_materiel_list = ShRequester.getApi$system$in_stock$get_record_materiel_list(reqParams); + List list = api$system$in_stock$get_record_materiel_list.getData().getList(); + 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); + } + return rb.success().setMsg("新增成功"); + } +} diff --git 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 index 70aeda6..288b198 100644 --- 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 @@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil; import com.yxt.supervise.gf.shanhai.req.*; import com.yxt.supervise.gf.shanhai.resp.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -46,8 +47,17 @@ public class ShRequester { BaseResponse> resp = new BaseResponse<>(); BaseResponseListObj respObj = new BaseResponseListObj<>(); String s = ShHttp.doGet(apply_material$index, param); - BaseResponse> baseResponse = toBean(s, resp, respObj); - return baseResponse; + BaseResponse> baseResponse = toBean(s, resp, respObj); + BeanUtil.copyProperties(baseResponse,resp); + List list = baseResponse.getData().getList(); + List applyMaterials = new ArrayList<>(); + for (JSONObject jsonObject : list) { + ApplyMaterial applyMaterial = JSONUtil.toBean(jsonObject, ApplyMaterial.class); + applyMaterials.add(applyMaterial); + } + respObj.setList(applyMaterials); + resp.setData(respObj); + return resp; } /** @@ -62,8 +72,17 @@ public class ShRequester { Map params = new HashMap<>(); params.put("id", id); String s = ShHttp.doGet(apply_material$get_actual_order_material, params); - BaseResponse> baseResponse = toBean(s, resp, respObj); - return baseResponse; + BaseResponse> baseResponse = toBean(s, resp, respObj); + BeanUtil.copyProperties(baseResponse,resp); + List list = baseResponse.getData().getList(); + List actualOrderMaterials = new ArrayList<>(); + for (JSONObject jsonObject : list) { + ActualOrderMaterial actualOrderMaterial = JSONUtil.toBean(jsonObject, ActualOrderMaterial.class); + actualOrderMaterials.add(actualOrderMaterial); + } + respObj.setList(actualOrderMaterials); + resp.setData(respObj); + return resp; } /** @@ -75,8 +94,22 @@ public class ShRequester { BaseResponse> resp = new BaseResponse<>(); BaseResponseListObj respObj = new BaseResponseListObj<>(); String s = ShHttp.doGet(stock_record$get_material_stat, null); - BaseResponse> baseResponse = toBean(s, resp, respObj); - return baseResponse; + BaseResponse> baseResponse = toBean(s, resp, respObj); + BeanUtil.copyProperties(baseResponse,resp); + List list = baseResponse.getData().getList(); + if (list == null){ + respObj.setList(null); + resp.setData(respObj); + }else { + List materialStats = new ArrayList<>(); + for (JSONObject jsonObject : list) { + MaterialStat materialStat = JSONUtil.toBean(jsonObject, MaterialStat.class); + materialStats.add(materialStat); + } + respObj.setList(materialStats); + resp.setData(respObj); + } + return resp; } /** @@ -111,8 +144,17 @@ public class ShRequester { BaseResponse> resp = new BaseResponse<>(); BaseResponseListObj respObj = new BaseResponseListObj<>(); String s = ShHttp.doGet(inventory$index, param); - BaseResponse> response = toBean(s, resp, respObj); - return response; + BaseResponse> response = toBean(s, resp, respObj); + BeanUtil.copyProperties(response,resp); + List list = response.getData().getList(); + List inventories = new ArrayList<>(); + for (JSONObject jsonObject : list) { + Inventory inventory = JSONUtil.toBean(jsonObject, Inventory.class); + inventories.add(inventory); + } + respObj.setList(inventories); + resp.setData(respObj); + return resp; } /** @@ -306,8 +348,17 @@ public class ShRequester { if (reqParams != null) param = BeanUtil.beanToMap(reqParams); String s = ShHttp.doGet(in_stock$get_record_materiel_list, param); - BaseResponse> baseResponse = toBean(s, req, reqObj); - return baseResponse; + BaseResponse> baseResponse = toBean(s, req, reqObj); + BeanUtil.copyProperties(baseResponse,req); + List list = baseResponse.getData().getList(); + List inStockGetRecordMaterielLists = new ArrayList<>(); + for (JSONObject jsonObject : list) { + InStockGetRecordMaterielList inStockGetRecordMaterielList = JSONUtil.toBean(jsonObject, InStockGetRecordMaterielList.class); + inStockGetRecordMaterielLists.add(inStockGetRecordMaterielList); + } + reqObj.setList(inStockGetRecordMaterielLists); + req.setData(reqObj); + return req; } /**