From 75f957d38bd6b151ef3dcaeba85b6a5720d28833 Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期三, 15 十一月 2023 16:37:59 +0800
Subject: [PATCH] 拌合站接口H5页面接口
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java | 9 +-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java | 14 ++++
hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml | 51 ++++++++++++++++-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java | 2
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java | 8 ++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TSilo.java | 39 +++++++++++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java | 25 +++++---
7 files changed, 132 insertions(+), 16 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
index 79e9a60..83d45d4 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
@@ -97,4 +97,12 @@
return materialReleaseService.mixingList(values);
}
+ //搅拌站 (2023-11-14) 添加原料 入站 列表 /罐子 类型表
+ @GetMapping("/siloList")
+ public BasicResult siloList(@RequestParam Integer types) {
+ return materialReleaseService.siloList(types);
+ }
+
+
+
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java
index 0203213..92f41ea 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java
@@ -58,6 +58,20 @@
private String reportNumber;
/**
+ * 报告编号
+ */
+ private Integer stata;
+
+ /**
+ * 报告编号
+ */
+ private String siloId;
+ /**
+ * 报告编号
+ */
+ private String percentage;
+
+ /**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table t_mixing
*
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TSilo.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TSilo.java
new file mode 100644
index 0000000..b58c774
--- /dev/null
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TSilo.java
@@ -0,0 +1,39 @@
+package com.thhy.materials.modules.biz.concret.entity;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@Getter
+@Setter
+@ToString
+public class TSilo implements Serializable {
+ /**
+ * 料仓id
+ */
+ private String siloId;
+
+ /**
+ * 料仓管名称
+ */
+ private String siloName;
+
+ /**
+ * 几号仓1-6
+ */
+ private Integer types;
+
+ private TMixing mixing;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table t_silo
+ *
+ * @mbg.generated Wed Nov 15 13:08:15 CST 2023
+ */
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
index 97e56b9..a68861f 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
@@ -1,10 +1,7 @@
package com.thhy.materials.modules.biz.concret.mapper;
import com.thhy.general.annotations.Idkey;
-import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
-import com.thhy.materials.modules.biz.concret.entity.TMixing;
-import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
-import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
+import com.thhy.materials.modules.biz.concret.entity.*;
import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import java.util.HashMap;
@@ -33,4 +30,8 @@
void mixingInsert(@Idkey("mixingId") HashMap<String, Object> values);
List<TMixing> mixingList(HashMap<String, Object> values);
+
+ List<TSilo> siloList(Integer types);
+
+ TMixing mixingLists(String siloId);
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
index cf7fbc8..f07fafc 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
@@ -25,4 +25,6 @@
BasicResult mixingInsert(HashMap<String, Object> values);
BasicResult mixingList(HashMap<String, Object> values);
+
+ BasicResult siloList(Integer types);
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
index c8a1184..dcad2b7 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
@@ -5,10 +5,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
-import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
-import com.thhy.materials.modules.biz.concret.entity.TMixing;
-import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
-import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
+import com.thhy.materials.modules.biz.concret.entity.*;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import com.thhy.materials.modules.biz.concret.mapper.TMaterialReleaseMappper;
@@ -232,11 +229,21 @@
@Override
public BasicResult mixingList(HashMap<String, Object> values) {
- Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
- Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
- PageHelper.startPage(pageNum,pageSize);
+// Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
+// Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
+// PageHelper.startPage(pageNum,pageSize);
List<TMixing> mixings = materialReleaseMappper.mixingList(values);
- PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings);
- return BasicResult.success(tMixingPageInfo);
+ //PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings);
+ return BasicResult.success(mixings);
+ }
+
+ @Override
+ public BasicResult siloList(Integer types) {
+ List<TSilo> tSilos = materialReleaseMappper.siloList(types);
+ for (TSilo silo :tSilos){
+ TMixing mixings = materialReleaseMappper.mixingLists(silo.getSiloId());
+ silo.setMixing(mixings);
+ }
+ return BasicResult.success(tSilos);
}
}
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
index a7351d2..8d33ac6 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -193,6 +193,15 @@
<if test="reportNumber != null">
report_number,
</if>
+ <if test="stata != null">
+ stata,
+ </if>
+ <if test="siloId != null">
+ silo_id,
+ </if>
+ <if test="percentage != null">
+ percentage,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mixingId != null">
@@ -222,6 +231,15 @@
<if test="reportNumber != null">
#{reportNumber,jdbcType=VARCHAR},
</if>
+ <if test="stata != null">
+ #{stata},
+ </if>
+ <if test="siloId != null">
+ #{siloId,jdbcType=VARCHAR},
+ </if>
+ <if test="percentage != null">
+ #{percentage,jdbcType=VARCHAR},
+ </if>
</trim>
</insert>
<select id="mixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
@@ -234,8 +252,35 @@
in_num as inNum,
in_date as inDate,
inspect_state as inspectState,
- report_number as reportNumber
- from t_mixing
- order by in_date desc
+ report_number as reportNumber,
+ stata as stata,
+ silo_id as siloId,
+ percentage as percentage
+ from t_mixing where silo_id=#{siloId}
+ order by in_date desc limit 0,1
+ </select>
+ <select id="mixingLists" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
+ select
+ mixing_id as mixingId,
+ material as material,
+ spec as spec,
+ producer as producer,
+ stove as stove,
+ in_num as inNum,
+ in_date as inDate,
+ inspect_state as inspectState,
+ report_number as reportNumber,
+ stata as stata,
+ silo_id as siloId,
+ percentage as percentage
+ from t_mixing where silo_id=#{siloId}
+ order by in_date desc limit 0,1
+ </select>
+ <select id="siloList" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo">
+ select
+ silo_id as siloId,
+ silo_name as siloName,
+ types as types
+ from t_silo where types=#{types}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3