Merge branch 'master' of http://111.30.93.211:10101/r/supipe

张晓波

2023-12-11 0d0968ec2d1a39c21e15e447c4f2227f70d6a11b

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java

@@ -1,11 +1,9 @@
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 org.apache.ibatis.annotations.Param;

import java.util.HashMap;
import java.util.List;
@@ -28,9 +26,43 @@

    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);

    List<TSilo> siloList(Integer types);

    TMixing mixingLists(String siloId);

    void mixingConsumeIn(@Idkey("mixingSignboardId") Map<String, Object> values);

    void mixingConsumeInTwo(@Idkey("mixingConsumeId") Map<String,Object> mixingConsume);

    Integer starInt();

    List<TMixingSignboard> mixingSignboardList(Map<String, Object> values);

    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);
}