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

guoyujie

2025-12-10 1750abd11320f8d09ffe1580b7467dba87c86c89

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

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

import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.dto.mm.MaterialLogDTO;
import com.example.erp.entity.mm.*;
import com.example.erp.entity.pp.OptimizeUse;
import com.example.erp.entity.sd.Delivery;
@@ -70,14 +71,18 @@

    Integer getReturningWarehouseCount(@Param("returningId") String returningId);

    List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
    List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);

    List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
    List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode,String producer);

    List<MaterialInventory> getMaterialInventoryCount1(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer,Long id);

    List<MaterialInventory> getMaterialInventoryCountNull1(@Param("materialCode") Long materialCode,String producer,Long id);


    List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
    List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);

    List<MaterialInventory> getMaterialInventoryCountNullId(@Param("materialCode") Long materialCode);
    List<MaterialInventory> getMaterialInventoryCountNullId(@Param("materialCode") Long materialCode,String producer);

    List<MaterialOutboundDetail> getIsNotMaterialOutboundDetail( @Param("materialOutboundId") String materialOutboundId);

@@ -193,9 +198,9 @@
                                    @Param("materialInventory") MaterialInventory materialInventory);

    Boolean updateMaterialInventoryOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,
                                    @Param("dateOfManufacture") String dateOfManufacture);
                                    @Param("dateOfManufacture") String dateOfManufacture,@Param("producer") String producer);

    Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity);
    Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,@Param("producer") String producer);

    Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
                                    @Param("totalArea") Double totalArea,
@@ -244,7 +249,11 @@
                                                                   @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                                   @Param("materialLog") MaterialLog materialLog,String type);

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

    List<MaterialLogDTO> exportMaterialLogReports(List<LocalDate> dates, String type);

    List<MaterialLogDTO> exportMaterialLogOptimizeOutboundReport(List<LocalDate> dates, String type);

    List<MaterialOutbound> getSelectMaterialOutboundProjectNo(@Param("projectNo") String projectNo);

@@ -269,4 +278,12 @@
    List<MaterialLog> getOptimizeOutboundReport(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);

    Map<String,Integer> getOptimizeOutboundReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);

    List<Map<String,Object>> getSelectMaterialInventoryMes();

    Boolean updateMaterialInventoryAll(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);

    Boolean updateMaterialInventoryOne(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);

    List<MaterialInventory> selectGetStockList();
}