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

@@ -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") TMixing mixing);
    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();

@@ -55,4 +55,14 @@
    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);
}