ERP_override.git

			@@ -8,6 +8,7 @@
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.example.erp.common.Constants;
			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.*;
			import com.example.erp.entity.sd.Delivery;
			@@ -875,8 +876,15 @@
			return map;
			}

			public List<MaterialLog> exportMaterialLogReport(List<LocalDate> dates, String type) {
			return materialInventoryMapper.exportMaterialLogReport(dates,type);
			public List<MaterialLogDTO> exportMaterialLogReport(List<LocalDate> dates, String type) {
			if(type.equals("物料出库")){
			return materialInventoryMapper.exportMaterialLogReport(dates,type);
			}else if(type.equals("优化出库")){
			return materialInventoryMapper.exportMaterialLogOptimizeOutboundReport(dates,type);
			}else{
			return materialInventoryMapper.exportMaterialLogReports(dates,type);
			}

			}


			@@ -1276,9 +1284,9 @@
			//查询物料是否存在
			List<MaterialInventory> MaterialInventoryCount;
			if (materialInventory.getDateOfManufacture()!=null){
			MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCount(materialInventory.getMaterialCode(),materialInventory.getDateOfManufacture(),materialInventory.getProducer());
			MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCount1(materialInventory.getMaterialCode(),materialInventory.getDateOfManufacture(),materialInventory.getProducer(),materialInventory.getId());
			}else{
			MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCountNull(materialInventory.getMaterialCode(),materialInventory.getProducer());
			MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCountNull1(materialInventory.getMaterialCode(),materialInventory.getProducer(),materialInventory.getId());
			}

			if(MaterialInventoryCount.size()==1){