From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
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 06a02d4..574b207 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
@@ -26,9 +26,9 @@
List<PieceDto> pieceList(HashMap<String, Object> values);
- List<TRawMaterial> materialRew(Integer byId);
+ List<TRawMaterial> materialRew(@Param("byId") Integer byId,@Param("types")Integer types);
- void mixingInsert(@Idkey("mixingId") HashMap<String, Object> values);
+ void mixingInsert(@Idkey("mixingId") Map<String,Object> mixing);
List<TMixing> mixingList(HashMap<String, Object> values);
@@ -38,7 +38,7 @@
void mixingConsumeIn(@Idkey("mixingSignboardId") Map<String, Object> values);
- void mixingConsumeInTwo(@Idkey("mixingConsumeId") TMixingConsume mixingConsume);
+ void mixingConsumeInTwo(@Idkey("mixingConsumeId") Map<String,Object> mixingConsume);
Integer starInt();
@@ -47,4 +47,22 @@
Integer starIntSig(String mixingSignboardId);
List<TMixingConsume> mixingConsumes(@Param("mixingSignboardId") String mixingSignboardId,@Param("star") Integer star);
+
+ List<TMixingSignboard> mixingConsumePull();
+
+ List<TSilo> siloPull();
+
+ void mixingUpdateType(String siloId);
+
+ List<TMixing> siloMixingList(Map<String, Object> values);
+
+ 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);
}
--
Gitblit v1.9.3