Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2 天以前 a8378db2feef3b08edc0a6594bec187051d3b754

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java

@@ -40,7 +40,10 @@
    FinishedGlassShelfInformation getSelectFinishedGlassShelfInformationById(Long id);


    Map<String, Object> getSelectFinishedGlassShelfInformationInId(@Param("weight") Double weight,
    Map<String, Object> getSelectFinishedGlassShelfInformationInId(@Param("glassShelfName") String glassShelfName,
                                                                   @Param("price") Double price,
                                                                   @Param("unit") String unit,
                                                                   @Param("weight") Double weight,
                                                                         @Param("width") Double width,
                                                                         @Param("height") Double height);

@@ -63,12 +66,15 @@
    boolean insertFinishedGlassShelfEmitDetails(String emitId,Integer emitNumber,
            @Param("finishedGlassShelfEmitDetails") FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails);

    boolean updateInformationAvailableQuantityOut(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity);
    boolean updateInformationAvailableQuantityOut(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity,
                                                  Double price,String unit,String glassShelfName);

    boolean updateInformationAvailableQuantityInt(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity);
    boolean updateInformationAvailableQuantityInt(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity,
                                                  Double price,String unit,String glassShelfName);

    boolean insertFinishedGlassShelfEmitDetailsLog(String emitId,Integer emitNumber,Integer type,Integer quantity,
                                                   Double price,Double money,String unit,String remarks,Double maxWeight,Double maxWidth,Double maxHeight);
                                                   Double price,Double money,String unit,String remarks,
                                                   Double maxWeight,Double maxWidth,Double maxHeight,String glassShelfName,String operator);

    List<FinishedGlassShelfEmit> getSelectFinishedGlassShelfEmit(@Param("offset") Integer offset,
                                          @Param("pageSize") Integer pageSize, String startDate, String endDate,