From 266cb78c22a5644d5e2c15c42243b0b80ca7d233 Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期二, 05 十二月 2023 17:13:16 +0800
Subject: [PATCH] 更改查询方式，添加
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java | 6 ++
hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml | 71 +++++++++++++++++++++--
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java | 4 +
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java | 13 ++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java | 39 +++++++++++-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java | 5 +
6 files changed, 127 insertions(+), 11 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 b577d55..bffdcd8 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
@@ -113,6 +113,18 @@
return materialReleaseService.mixingConsumeIn(values);
}
+ // 拌合站 （2023-12-5） 标识牌， 手动修改 原料消耗 t_mixing_consume -> t_mixing_signboard
+ @PostMapping("/mixingConsumeUp")
+ public BasicResult mixingConsumeUp(@RequestBody Map<String,Object> values){
+ return materialReleaseService.mixingConsumeUp(values);
+ }
+ //搅拌站 删除
+ @PostMapping("/mixingConsumeDel")
+ public BasicResult mixingConsumeDel(@RequestBody HashMap<String,Object> values) {
+ return materialReleaseService.mixingConsumeDel(values);
+ }
+
+
// ！！！列表 ：拌合站 （2023-11-16） 标识牌， 手动添加 原料消耗 t_mixing_consume -> t_mixing_signboard
@PostMapping("/mixingConsumeList")
public BasicResult mixingConsumeList(@RequestBody Map<String,Object> values){
@@ -148,4 +160,5 @@
}
+
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java
index 0a243a9..49b95b8 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java
@@ -1,5 +1,6 @@
package com.thhy.materials.modules.biz.concret.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -64,6 +65,10 @@
private String dictName;
private Integer star;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String createTime;
+ //施工单位
+ private String constructionUnit;
/**
* This field was generated by MyBatis Generator.
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 c575a5b..1896449 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
@@ -59,4 +59,10 @@
void mixingUpdate(Map<String, Object> mixing);
void mixingDel(String mixingId);
+
+ void mixingConsumeUpTwo(Map<String, Object> mixingConsume);
+
+ void mixingConsumeDel(@Param("mixingConsumeId") String mixingConsumeId,@Param("star") Integer star);
+
+ void mixingConsumeDelSign(@Param("mixingSignboardId") String mixingSignboardId,@Param("star") Integer star);
}
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 27393b4..4009295 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
@@ -41,4 +41,8 @@
BasicResult mixingUpdate(HashMap<String, Object> values);
BasicResult mixingDel(HashMap<String, Object> values);
+
+ BasicResult mixingConsumeUp(Map<String, Object> values);
+
+ BasicResult mixingConsumeDel(HashMap<String, Object> values);
}
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 3f9021f..fa524be 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
@@ -1,5 +1,6 @@
package com.thhy.materials.modules.biz.concret.service.impl;
+import com.alibaba.nacos.api.utils.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
@@ -256,15 +257,19 @@
@Override
@Transactional
public BasicResult mixingConsumeIn(Map<String, Object> values) {
- values.put("mixingSignboardId","");
- materialReleaseMappper.mixingConsumeIn(values);
+// values.put("mixingSignboardId","");
+// materialReleaseMappper.mixingConsumeIn(values);
String mixingSignboardId = values.get("mixingSignboardId").toString();
Integer star = materialReleaseMappper.starInt();
List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
for (Map<String,Object> mixingConsume :mixingConsumes){
mixingConsume.put("mixingSignboardId",mixingSignboardId);
- mixingConsume.put("star",star+1);
- mixingConsume.put("mixingConsumeId","");
+ if(star!=null){
+ mixingConsume.put("star",star+1);
+ }else {
+ mixingConsume.put("star",1);
+ }
+ //mixingConsume.put("mixingConsumeId","");
materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
}
return BasicResult.success();
@@ -278,6 +283,7 @@
List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingSignboardList(values);
for (TMixingSignboard mixingSignboard : mixingSignboards){
Integer star = materialReleaseMappper.starIntSig(mixingSignboard.getMixingSignboardId());
+ //values.put("")
List<TMixingConsume> mixingConsumes = materialReleaseMappper.mixingConsumes(mixingSignboard.getMixingSignboardId(),star);
mixingSignboard.setTMixingConsumes(mixingConsumes);
}
@@ -320,4 +326,29 @@
}
return BasicResult.success();
}
+
+ @Override
+ public BasicResult mixingConsumeUp(Map<String, Object> values) {
+ String mixingSignboardId = values.get("mixingSignboardId").toString();
+ Integer star = materialReleaseMappper.starInt();
+ materialReleaseMappper.mixingConsumeDelSign(mixingSignboardId,star);
+ List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
+ for (Map<String,Object> mixingConsume :mixingConsumes){
+ mixingConsume.put("mixingSignboardId",mixingSignboardId);
+ mixingConsume.put("star",star);
+ //mixingConsume.put("mixingConsumeId","");
+ materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
+ }
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult mixingConsumeDel(HashMap<String, Object> values) {
+ Integer star = Integer.valueOf(values.get("star").toString());
+ List<String> mixingConsumeIds = (List<String>) values.get("mixingConsumeIds");
+ for (String mixingConsumeId : mixingConsumeIds){
+ materialReleaseMappper.mixingConsumeDel(mixingConsumeId,star);
+ }
+ return BasicResult.success();
+ }
}
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
index 90f0cd7..552f275 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -330,9 +330,7 @@
<insert id="mixingConsumeInTwo" >
insert into t_mixing_consume
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="mixingConsumeId != null">
mixing_consume_id,
- </if>
<if test="dictId != null">
dict_id,
</if>
@@ -363,11 +361,15 @@
<if test="star != null">
star,
</if>
+ <if test="constructionUnit != null">
+ construction_unit,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="mixingConsumeId != null">
- #{mixingConsumeId,jdbcType=VARCHAR},
- </if>
+<!-- <if test="mixingConsumeId != null">-->
+<!-- #{mixingConsumeId,jdbcType=VARCHAR},-->
+<!-- </if>-->
+ REPLACE(UUID(),'-',''),
<if test="dictId != null">
#{dictId,jdbcType=VARCHAR},
</if>
@@ -398,6 +400,9 @@
<if test="star != null">
#{star},
</if>
+ <if test="constructionUnit != null">
+ #{constructionUnit},
+ </if>
</trim>
</insert>
<select id="starInt" resultType="java.lang.Integer">
@@ -419,12 +424,16 @@
<if test="signboardName!=null and signboardName!='' ">
and tms.signboard_name like concat('%',#{signboardName},'%')
</if>
+ <if test="mixingSignboardId !=null and mixingSignboardId !='' ">
+ and tms.mixing_signboard_id=#{mixingSignboardId}
+ </if>
</select>
<select id="mixingConsumes" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume">
select
mc.mixing_consume_id as mixingConsumeId,
sd.dict_name as dictName,
+ mc.dict_id as dictId,
mc.spec as spec,
mc.manufacturer as manufacturer,
mc.wat_full as watFull,
@@ -433,16 +442,22 @@
mc.save_stamp as saveStamp,
mc.construction as construction,
mc.mixing_signboard_id as mixingSignboardId,
- mc.star as star
+ mc.star as star,
+ mc.create_time as createTime,
+ mc.construction_unit as constructionUnit
from t_mixing_consume mc
left join sys_dict sd on mc.dict_id=sd.dict_id
where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star}
+<!-- <if test="strTime!=null and strTime!='' and endTime !=null and endTime!=''">-->
+<!-- and mc.create_time between #{strTime} and #{endTime}-->
+<!-- </if>-->
</select>
<select id="mixingConsumePull" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard">
select
tms.mixing_signboard_id as mixingSignboardId,
tms.signboard_name as signboardName,
- sp.pro_name as proName
+ sp.pro_name as proName,
+ sp.construction_unit as constructionUnit
from t_mixing_signboard tms left join sys_project sp
on tms.pro_id=sp.pro_id
</select>
@@ -531,4 +546,46 @@
<delete id="mixingDel" parameterType="java.lang.String">
delete from t_mixing where mixing_id=#{mixingId}
</delete>
+ <update id="mixingConsumeUpTwo" >
+ update t_mixing_consume
+ <set>
+ <if test="dictId != null">
+ dict_id = #{dictId,jdbcType=VARCHAR},
+ </if>
+ <if test="spec != null">
+ spec = #{spec,jdbcType=VARCHAR},
+ </if>
+ <if test="manufacturer != null">
+ manufacturer = #{manufacturer,jdbcType=VARCHAR},
+ </if>
+ <if test="watFull != null">
+ wat_full = #{watFull,jdbcType=VARCHAR},
+ </if>
+ <if test="planAmnt != null">
+ plan_amnt = #{planAmnt,jdbcType=VARCHAR},
+ </if>
+ <if test="factAmnt != null">
+ fact_amnt = #{factAmnt,jdbcType=VARCHAR},
+ </if>
+ <if test="saveStamp != null">
+ save_stamp = #{saveStamp,jdbcType=VARCHAR},
+ </if>
+ <if test="construction != null">
+ construction = #{construction,jdbcType=VARCHAR},
+ </if>
+ <if test="mixingSignboardId != null">
+ mixing_signboard_id = #{mixingSignboardId,jdbcType=VARCHAR},
+ </if>
+ <if test="star != null">
+ star = #{star},
+ </if>
+ </set>
+ where mixing_consume_id = #{mixingConsumeId,jdbcType=VARCHAR}
+ </update>
+ <delete id="mixingConsumeDel" >
+ delete from t_mixing_consume where mixing_consume_id=#{mixingConsumeId} and star=#{star}
+ </delete>
+ <delete id="mixingConsumeDelSign" >
+ delete from t_mixing_consume where mixing_signboard_id=#{mixingSignboardId} and star=#{star}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3