From 1b004047f00cc846924209051ee654619c56a249 Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期三, 06 十二月 2023 16:17:42 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java index d00bea6..738edb4 100644 --- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java +++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java @@ -3,9 +3,7 @@ import com.thhy.general.common.BasicResult; import com.thhy.general.config.SysUserInfo; import com.thhy.general.utils.UserInfoUtils; -import com.thhy.mobile.modules.biz.pipeinfo.entity.MaterialInfo; -import com.thhy.mobile.modules.biz.pipeinfo.entity.PipeListVo; -import com.thhy.mobile.modules.biz.pipeinfo.entity.ScreenPipeCompare; +import com.thhy.mobile.modules.biz.pipeinfo.entity.*; import com.thhy.mobile.modules.biz.pipeinfo.service.PipeInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -76,4 +74,15 @@ return BasicResult.success(mapto); } + //thing.js 原料实际消耗数量列表 前10条数据 + @RequestMapping("/materialInfo") + public BasicResult materialInfo(){ + return BasicResult.success(pipeInfoService.materialInfo()); + } + //thing.js 原料消耗总量 + @RequestMapping("/materialNumInfo") + public BasicResult materialNumInfo(){ + List<MaterialThingNumDto> materialInfo = pipeInfoService.materialNumInfo(); + return BasicResult.success(materialInfo); + } } -- Gitblit v1.9.3