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/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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..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
@@ -28,7 +28,7 @@
List<TRawMaterial> materialRew(Integer byId);
- 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