Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-11-23 a6f59f0908e5787d55c098c17f4eec365cf6477a

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

@@ -1,5 +1,6 @@
package com.example.erp.mapper.mm;

import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.*;
import com.example.erp.entity.pp.OptimizeUse;
import com.example.erp.entity.sd.Delivery;
@@ -50,10 +51,14 @@
    Boolean insertMaterialStore(@Param("type") String type,
                                         @Param("json") String json);

    Boolean deleteMaterialInventory(@Param("ids") List<Long> ids);

    Boolean updateMaterialStore(@Param("type") String type,
                                @Param("json") String json, @Param("id") Long id);

    Boolean deleteMaterialOutbound(@Param("materialOutboundId") String materialOutboundId);

    Boolean deleteMaterialLog(@Param("materialOutboundId") String materialOutboundId);

    Integer getMaximum(@Param("type") String type);

@@ -118,6 +123,8 @@

    Boolean deleteReturningWarehouseDetail(@Param("returningId") String returningId);

    Boolean deleteReturningWarehouse(@Param("returningId") String returningId);

    List<MaterialOutbound> getSelectMaterialOutboundDate(@Param("offset") Integer offset,
                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                           @Param("materialOutbound") MaterialOutbound materialOutbound);
@@ -171,6 +178,10 @@
                                    @Param("totalArea") Double totalArea,
                                    @Param("materialInventory") MaterialInventory materialInventory);

    Boolean updateMaterialInventoryNull(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
                                    @Param("totalArea") Double totalArea,
                                    @Param("materialInventory") MaterialInventory materialInventory);

    Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
                                    @Param("totalArea") Double totalArea,
                                    @Param("materialInventory") MaterialInventory materialInventory);
@@ -210,4 +221,14 @@

    MaterialInventory getMaterialInventoryById(@Param("id") Long id);

    List<MaterialLog> getMaterialLogReport(@Param("offset") Integer offset,
                                                               @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                               @Param("materialLog") MaterialLog materialLog,String type);

    Map<String,Integer> getMaterialLogReportTotal(@Param("offset") Integer offset,
                                                                   @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                                   @Param("materialLog") MaterialLog materialLog,String type);

    List<MaterialLog> exportMaterialLogReport(List<LocalDate> dates, String type);

}