From 766effa6e04db9b37b1dc3886d988beaa595c38d Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:55 +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/mapper/PipeInfoMapper.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
index 5f2d947..b658ee2 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
@@ -63,7 +63,7 @@
 
     RingCompleteCheck queryRingComplete(PipeInfo pipeinfo);
 
-    RingCompleteCheck queryRingCompleteByMod(String mouldNum,String proId);
+    List<RingCompleteCheck> queryRingCompleteByMod(@Param("mouldNum") String mouldNum,@Param("proId") String proId);
 
     int queryMaxRingNum(String companyId);
 
@@ -175,4 +175,10 @@
     void updateInRepoTime(RepoRecord repoRecord);
 
     List<Integer> queryAllNumType();
+
+    List<MaterialThingDto> materialInfo();
+
+    List<MaterialThingNumDto> materialNumInfo();
+
+    List<MaterialThingDto> materialInfoTwo();
 }

--
Gitblit v1.9.3