From 6a9dc2c9553ae13bb3196f325c9905abbd502145 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 04 十二月 2023 16:46:00 +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 |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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..631b48f 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") TMixing mixing);
 
     List<TMixing> mixingList(HashMap<String, Object> values);
 
@@ -47,4 +47,12 @@
     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);
 }

--
Gitblit v1.9.3